Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 84c12c2fddc52374a6358cbe4a8140675b553b7f https://github.com/phpmyadmin/phpmyadmin/commit/84c12c2fddc52374a6358cbe4a81... Author: Michal Čihař michal@cihar.com Date: 2016-02-17 (Wed, 17 Feb 2016)
Changed paths: M libraries/plugins/import/ImportSql.php
Log Message: ----------- Remove sql data parameter
This just makes the SQL import different from others leading to subtle breakages.
Issue #11850
Signed-off-by: Michal Čihař michal@cihar.com
Commit: ee8f9b0dba8afd6fd736a0bf8601c3e5cd3b9e49 https://github.com/phpmyadmin/phpmyadmin/commit/ee8f9b0dba8afd6fd736a0bf8601... Author: Michal Čihař michal@cihar.com Date: 2016-02-17 (Wed, 17 Feb 2016)
Changed paths: M libraries/import.lib.php
Log Message: ----------- Always use local static storage of executed queries
Issue #11850
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 6895a1fc6e835c845635069bcc0d9c5e2f1c4668 https://github.com/phpmyadmin/phpmyadmin/commit/6895a1fc6e835c845635069bcc0d... Author: Michal Čihař michal@cihar.com Date: 2016-02-17 (Wed, 17 Feb 2016)
Changed paths: M libraries/sql.lib.php
Log Message: ----------- Revert "fix_11907"
This reverts commit bfe30d1261e33ee2446f4205070e326ccba07cca.
It removes the message in many cases where it should be shown.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 18f9231d742caf2fa99f7f8400323873de773673 https://github.com/phpmyadmin/phpmyadmin/commit/18f9231d742caf2fa99f7f840032... Author: Michal Čihař michal@cihar.com Date: 2016-02-17 (Wed, 17 Feb 2016)
Changed paths: M ChangeLog M libraries/import.lib.php
Log Message: ----------- Fixed CSV import
Fixes #11850
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 2670a1499fca88ce9c2095b26221299dd935a766 https://github.com/phpmyadmin/phpmyadmin/commit/2670a1499fca88ce9c2095b26221... Author: Michal Čihař michal@cihar.com Date: 2016-02-17 (Wed, 17 Feb 2016)
Changed paths: M ChangeLog M libraries/import.lib.php M libraries/plugins/import/ImportSql.php M libraries/sql.lib.php
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c81bed28254d...2670a1499fca
-
Michal Čihař