Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 43f6e8b22a11fa21484483bc6cfc7031c0a5e765
https://github.com/phpmyadmin/phpmyadmin/commit/43f6e8b22a11fa21484483bc6cf…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/controllers/DatabaseStructureController.class.php
Log Message:
-----------
In fact this including replication.inc.php here is not required since it was include earlier
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 20102085caea029379eea99ee420c7bf4c6ab00b
https://github.com/phpmyadmin/phpmyadmin/commit/20102085caea029379eea99ee42…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/controllers/DatabaseStructureController.class.php
Log Message:
-----------
Include replication.inc.php only if the database is in a slave replication process
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ea701dfcc1236ce15a48058a09f5717b292520d4
https://github.com/phpmyadmin/phpmyadmin/commit/ea701dfcc1236ce15a48058a09f…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message:
-----------
Do not repeat the same conditions
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 618706685183431675671eb62d5e0c94bf841a4a
https://github.com/phpmyadmin/phpmyadmin/commit/618706685183431675671eb62d5…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M .travis.yml
M ChangeLog
M composer.json
M libraries/Config.class.php
M libraries/controllers/DatabaseStructureController.class.php
M libraries/db_common.inc.php
M libraries/db_info.inc.php
M libraries/plugins/import/ImportSql.class.php
M libraries/rte/rte_routines.lib.php
M libraries/sql-parser/src/Components/ExpressionArray.php
M libraries/sql-parser/src/Components/JoinKeyword.php
M libraries/sql-parser/src/Components/OptionsArray.php
M libraries/sql-parser/src/Context.php
M libraries/sql-parser/src/Lexer.php
M libraries/sql-parser/src/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Token.php
A libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Query.php
M libraries/sql-parser/src/Utils/Table.php
M libraries/sql.lib.php
M test/classes/plugin/import/ImportSql_test.php
M test/install-runkit
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c0b6e18f5ccf...618706685183
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 762d67dc363037be2c5eb5f4925a9968dc4dec18
https://github.com/phpmyadmin/phpmyadmin/commit/762d67dc363037be2c5eb5f4925…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2015-08-11 (Tue, 11 Aug 2015)
Changed paths:
M libraries/plugins/import/ImportSql.class.php
M libraries/sql-parser/src/Components/JoinKeyword.php
M libraries/sql-parser/src/Components/OptionsArray.php
M libraries/sql-parser/src/Lexer.php
M libraries/sql-parser/src/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Token.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Query.php
M test/classes/plugin/import/ImportSql_test.php
Log Message:
-----------
Rewrote a part of the import mechanism.
Updated sql-parser library to udan11/sql-parser@e713c9fa1d79fd7bc90c63016f9f3bff8f983794.
Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com>
Commit: b619077beda8e2f3b6aa5fa5f86896063d0d5256
https://github.com/phpmyadmin/phpmyadmin/commit/b619077beda8e2f3b6aa5fa5f86…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-08-11 (Tue, 11 Aug 2015)
Changed paths:
M libraries/plugins/import/ImportSql.class.php
M libraries/sql-parser/src/Components/JoinKeyword.php
M libraries/sql-parser/src/Components/OptionsArray.php
M libraries/sql-parser/src/Lexer.php
M libraries/sql-parser/src/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Token.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Query.php
M test/classes/plugin/import/ImportSql_test.php
Log Message:
-----------
Merge pull request #11375 from udan11/import_rewrite
Rewrote a part of the import mechanism.
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d7c9b2fc947a...b619077beda8