diff --git a/ChangeLog b/ChangeLog index 960ae97b50..4c32ead1e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog - issue #12302 Improved usage of number_format - issue #12656 Server selection not working - issue #12543 NULL results in dataset are colored grey +- issue #12664 Create Bookmark broken 4.6.5 (not yet released) - issue Remove potentionally license problematic sRGB profile @@ -106,6 +107,13 @@ phpMyAdmin - ChangeLog - issue #12637 Fixed editing some timestamp values - issue #12622 Fixed javascript error in designer - issue #12334 Missing page indicator or VIEWs +- issue #12610 Export of tables with Timestamp/Datetime/Time columns defined with ON UPDATE clause with precision fails +- issue #12661 Error inserting into pma__history after timeout +- issue #12195 Row_format = fixed not visible +- issue #12665 Cannot add a foreign key - non-indexed fields not listed in InnoDB tables +- issue #12674 Allow for proper MySQL-allowed strings as identifiers +- issue #12651 Allow for partial dates on table insert page +- issue #12681 Fixed designer with tables using special chars 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29 diff --git a/doc/faq.rst b/doc/faq.rst index b1ac02c888..90114bc666 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -1465,6 +1465,9 @@ re–written, if possible it is suggested that you upgrade to take advantage of the new features. For additional help on this subject, look for the word "upload" in this document. +Note: For errors while importing of dumps exported from older MySQL versions to newer MySQL versions, +please check :ref:`faq6_41`. + .. _faq6_6: 6.6 How can I use the relation table in Query-by-example? @@ -2130,6 +2133,31 @@ Parameters should be prefixed with a colon(:) and when the "Bind parameters" che these parameters will be identified and input fields for these parameters will be presented. Values entered in these field will be substituted in the query before being executed. +.. _faq6_41: + +6.41 I get import errors while importing the dumps exported from older MySQL versions (pre-5.7.6) into newer MySQL versions (5.7.7+), but they work fine when imported back on same older versions ? +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + +If you get errors like *#1031 - Table storage engine for 'table_name' doesn't have this option* +while importing the dumps exported from pre-5.7.7 MySQL servers into new MySQL server versions 5.7.7+, +it might be because ROW_FORMAT=FIXED is not supported with InnoDB tables. Moreover, the value of +`innodb_strict_mode `_ would define if this would be reported as a warning or as an error. + +Since MySQL version 5.7.9, the default value for `innodb_strict_mode` is `ON` and thus would generate +an error when such a CREATE TABLE or ALTER TABLE statement is encountered. + +There are two ways of preventing such errors while importing: + +* Change the value of `innodb_strict_mode` to `OFF` before starting the import and turn it `ON` after + the import is successfully completed. +* This can be achieved in two ways: + + * Go to 'Variables' page and edit the value of `innodb_strict_mode` + * Run the query : `SET GLOBAL `innodb_strict_mode` = '[value]'` + +After the import is done, it is suggested that the value of `innodb_strict_mode` should be reset to the +original value. + .. _faqproject: phpMyAdmin project diff --git a/import.php b/import.php index 6d31c5a2a4..93778bc60f 100644 --- a/import.php +++ b/import.php @@ -738,7 +738,7 @@ if ($go_sql) { // since only one bookmark has to be added for all the queries submitted through // the SQL tab if (! empty($_POST['bkm_label']) && ! empty($import_text)) { - $cfgBookmark = PMA_Bookmark_getParams(); + $cfgBookmark = Bookmark::getParams(); PMA_storeTheQueryAsBookmark( $db, $cfgBookmark['user'], $_REQUEST['sql_query'], $_POST['bkm_label'], diff --git a/index.php b/index.php index c4af9fee29..baafdd9373 100644 --- a/index.php +++ b/index.php @@ -10,6 +10,7 @@ use PMA\libraries\URL; use PMA\libraries\Sanitize; use PMA\libraries\Charsets; use PMA\libraries\ThemeManager; +use PMA\libraries\LanguageManager; /** * Gets some core libraries and displays a top message if required @@ -236,9 +237,9 @@ echo '