Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6e6e40a77560443ea9a2ef2ebe5704b4718d4a49 https://github.com/phpmyadmin/phpmyadmin/commit/6e6e40a77560443ea9a2ef2ebe57... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths: M ChangeLog M libraries/Util.class.php
Log Message: ----------- Fix #11964 Undefined index: TABLE_COMMENT in database structure page
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: a80124d6fd65b69aed1eb28434d3107aaa3d82a0 https://github.com/phpmyadmin/phpmyadmin/commit/a80124d6fd65b69aed1eb28434d3... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths: M ChangeLog M changelog.php M doc/setup.rst M import.php M index.php M js/config.js M js/functions.js M libraries/Config.class.php M libraries/Error.class.php M libraries/File.class.php M libraries/Header.class.php M libraries/Util.class.php M libraries/common.inc.php M libraries/error_report.lib.php M libraries/export.lib.php M libraries/file_listing.lib.php M libraries/php-gettext/gettext.inc M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/AuthenticationHttp.class.php M libraries/plugins/auth/swekey/swekey.auth.lib.php M libraries/plugins/export/ExportPdf.class.php M libraries/plugins/import/ImportShp.class.php M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php M libraries/select_lang.lib.php M libraries/sql-parser/src/Components/AlterOperation.php M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/IntoKeyword.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/PartitionDefinition.php M libraries/sql-parser/src/Components/Reference.php M libraries/sql-parser/src/Components/RenameOperation.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statements/AlterStatement.php M libraries/sql-parser/src/Statements/CreateStatement.php M license.php M prefs_manage.php M setup/lib/index.lib.php M tbl_replace.php M test/classes/PMA_Error_test.php M test/libraries/PMA_ConfigGenerator_test.php
Log Message: ----------- Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5
Conflicts: ChangeLog
Commit: 39559ddca5f8a9ada8b86d26719e43815d8a362e https://github.com/phpmyadmin/phpmyadmin/commit/39559ddca5f8a9ada8b86d26719e... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths: M ChangeLog M libraries/Util.php
Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/729abb0f3c8f...39559ddca5f8