Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d90ebfe96b820271649011b10b020c67d7f096af https://github.com/phpmyadmin/phpmyadmin/commit/d90ebfe96b820271649011b10b02... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-07-14 (Tue, 14 Jul 2015) Changed paths: M libraries/sql-parser/src/Component.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/FieldDefinition.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Utils/Table.php Log Message: ----------- Get the latest version of sql-parser (8d2f7b5234fc6836c292051519d087f8a82cd48b) Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: ae3fba2683b1b2771bf4ee4b3ebaf0130177f1ca https://github.com/phpmyadmin/phpmyadmin/commit/ae3fba2683b1b2771bf4ee4b3eba... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-07-14 (Tue, 14 Jul 2015) Changed paths: M libraries/Table.class.php M libraries/Util.class.php Log Message: ----------- rfe #1517 Support for virtual/persistent columns in MariaDB Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: ee1b179fcbf9622b266030fd726ce7e544f6820b https://github.com/phpmyadmin/phpmyadmin/commit/ee1b179fcbf9622b266030fd726c... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-07-14 (Tue, 14 Jul 2015) Changed paths: M libraries/Table.class.php M libraries/Util.class.php M libraries/sql-parser/src/Component.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/FieldDefinition.php M libraries/sql-parser/src/Components/OptionsArray.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Utils/Table.php Log Message: ----------- Merge branch 'rfe1517' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/25f5cd774b63...ee1b179fcbf9