From 2e8bff71ea11c242a5f48753c2c83de444ce0887 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 8 Apr 2009 11:47:25 +0000 Subject: [PATCH] bug #2650776 [import] SQL_MODE not saved during Partial Import --- ChangeLog | 1 + lang/afrikaans-utf-8.inc.php | 1 + lang/albanian-utf-8.inc.php | 1 + lang/arabic-utf-8.inc.php | 1 + lang/azerbaijani-utf-8.inc.php | 1 + lang/bangla-utf-8.inc.php | 1 + lang/basque-utf-8.inc.php | 1 + lang/belarusian_cyrillic-utf-8.inc.php | 1 + lang/belarusian_latin-utf-8.inc.php | 1 + lang/bosnian-utf-8.inc.php | 1 + lang/brazilian_portuguese-utf-8.inc.php | 1 + lang/bulgarian-utf-8.inc.php | 1 + lang/catalan-utf-8.inc.php | 1 + lang/chinese_simplified-utf-8.inc.php | 1 + lang/chinese_traditional-utf-8.inc.php | 1 + lang/croatian-utf-8.inc.php | 1 + lang/czech-utf-8.inc.php | 1 + lang/danish-utf-8.inc.php | 1 + lang/dutch-utf-8.inc.php | 1 + lang/english-utf-8.inc.php | 1 + lang/estonian-utf-8.inc.php | 1 + lang/finnish-utf-8.inc.php | 1 + lang/french-utf-8.inc.php | 1 + lang/galician-utf-8.inc.php | 1 + lang/georgian-utf-8.inc.php | 1 + lang/german-utf-8.inc.php | 1 + lang/greek-utf-8.inc.php | 1 + lang/hebrew-utf-8.inc.php | 1 + lang/hindi-utf-8.inc.php | 1 + lang/hungarian-utf-8.inc.php | 1 + lang/indonesian-utf-8.inc.php | 1 + lang/italian-utf-8.inc.php | 1 + lang/japanese-utf-8.inc.php | 1 + lang/korean-utf-8.inc.php | 1 + lang/latvian-utf-8.inc.php | 1 + lang/lithuanian-utf-8.inc.php | 1 + lang/macedonian_cyrillic-utf-8.inc.php | 1 + lang/malay-utf-8.inc.php | 1 + lang/mongolian-utf-8.inc.php | 1 + lang/norwegian-utf-8.inc.php | 1 + lang/persian-utf-8.inc.php | 1 + lang/polish-utf-8.inc.php | 1 + lang/portuguese-utf-8.inc.php | 1 + lang/romanian-utf-8.inc.php | 1 + lang/russian-utf-8.inc.php | 1 + lang/serbian_cyrillic-utf-8.inc.php | 1 + lang/serbian_latin-utf-8.inc.php | 1 + lang/sinhala-utf-8.inc.php | 1 + lang/slovak-utf-8.inc.php | 1 + lang/slovenian-utf-8.inc.php | 1 + lang/spanish-utf-8.inc.php | 1 + lang/swedish-utf-8.inc.php | 1 + lang/tatarish-utf-8.inc.php | 1 + lang/thai-utf-8.inc.php | 1 + lang/turkish-utf-8.inc.php | 1 + lang/ukrainian-utf-8.inc.php | 1 + libraries/config.default.php | 7 +++++++ libraries/import/sql.php | 25 ++++++++++++++++++++++--- 58 files changed, 85 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16ec08ae3..5fd0423a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Derek Schaefer - drummingds1 - patch #2727250 Optimizations for PHP loops thanks to Haeber +- bug #2650776 [import] SQL_MODE not saved during Partial Import 3.1.4.0 (not yet released) + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ, diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 4a26a47ad..54d1b5aa6 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1479,4 +1479,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index de91db17d..dd4046969 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1478,4 +1478,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index bf15ee6af..6489bb64c 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1480,4 +1480,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 4db536787..d213b3348 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1475,4 +1475,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index 3da217028..ed2c284d7 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1454,4 +1454,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 36b7dd5c5..043c8b3af 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1472,4 +1472,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 2b40956d4..855bce3d1 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1454,4 +1454,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 36f7a1c22..2debd1d6c 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1462,4 +1462,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 807ae331a..4580372f8 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1478,4 +1478,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 357101c92..57232e74f 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1452,4 +1452,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index c3fe3a66f..5909799e7 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1475,4 +1475,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 96e187072..71d022203 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1452,4 +1452,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index f3e770140..3364d4d53 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1461,4 +1461,5 @@ $strZip = 'zip 压缩'; $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 7c698f41f..04de87096 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1459,4 +1459,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 152cc68a0..ceb38dc79 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1456,4 +1456,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 66ccb9be8..015ada9f6 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1460,4 +1460,5 @@ $strStatic = 'static'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 7e0d066a2..90bf12228 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1454,4 +1454,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index c3f728a9d..5d28d7ce6 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1461,4 +1461,5 @@ $strGetMoreThemes = 'Bekijk meer thema\'s!'; $strNoneDefault = 'Geen'; $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index c9995d618..073a76f9d 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -255,6 +255,7 @@ $strDisplayPDF = 'Display PDF schema'; $strDoAQuery = 'Do a "query by example" (wildcard: "%")'; $strDocSQL = 'DocSQL'; $strDocu = 'Documentation'; +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; $strDownloadFile = 'Download file'; $strDoYouReally = 'Do you really want to '; $strDropDatabaseStrongWarning = 'You are about to DESTROY a complete database!'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index c4d5caf8c..6b2c89e19 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1460,4 +1460,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 59495bb99..5c128ca34 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1455,4 +1455,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 8d7129bdc..921c281b2 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1451,4 +1451,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index da5923f92..ee62e064e 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1453,4 +1453,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index 27beb5c90..b8d5d9d4f 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1459,4 +1459,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index ec73811f1..09bdeb1b0 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1473,4 +1473,5 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 5011c45c4..c5f8c348f 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1477,4 +1477,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 4297ac2d3..41b0edfea 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1472,4 +1472,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index ef30b8aba..1dc850a26 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1480,4 +1480,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 72453d635..00e9c16c9 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1457,4 +1457,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index f03c47f06..edb3388dd 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1470,4 +1470,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 4dd2d3b59..1dabf2012 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1459,4 +1459,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index e41659350..d58ad9beb 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1460,4 +1460,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index cfe4ba994..554f4042d 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1475,4 +1475,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 75f2d0088..976c51879 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1477,4 +1477,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 607574f62..aea110f6f 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1469,4 +1469,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index d6cc79e4b..ae11e3d17 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1455,4 +1455,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 05f2c8534..517bc40f1 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1492,4 +1492,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index be54a3c20..415350337 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1475,4 +1475,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index 6b7afe590..67c5e7152 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1452,4 +1452,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 1e3c10cfc..0faae5138 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1506,4 +1506,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 8c3a419b4..0d031318e 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1448,4 +1448,5 @@ $strGetMoreThemes = 'Pobierz więcej motywów!'; $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 6266ff132..f42fbd9fc 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1481,4 +1481,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index b45445d3a..dc502c5ce 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1461,4 +1461,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 076b3cb40..663a37855 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1465,4 +1465,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 70d2951df..6bd8f8911 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1454,4 +1454,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index 9d22a3135..d6bd29650 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1454,4 +1454,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index aa721dd4c..155315f7b 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1457,4 +1457,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 1d81ec8ac..4a92b6d1b 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1455,4 +1455,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 167d61418..609de5576 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1474,4 +1474,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index ec90cde45..0136c29f9 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1452,4 +1452,5 @@ $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by th $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 7e0eac8c6..643b2f8d1 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1452,4 +1452,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 97ead2d5e..420c5a764 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1465,4 +1465,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 9679997f1..977fd1d89 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1476,4 +1476,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index d24322eee..9361c5fe8 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1458,4 +1458,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 9a440a8ce..dd0adc7c5 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1474,4 +1474,5 @@ $strGetMoreThemes = 'Get more themes!'; //to translate $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate ?> diff --git a/libraries/config.default.php b/libraries/config.default.php index ac7395a37..6954a166f 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1609,6 +1609,13 @@ $cfg['Import']['skip_queries'] = '0'; */ $cfg['Import']['sql_compatibility'] = 'NONE'; +/** + * + * + * @global string $cfg['Import']['sql_no_auto_value_on_zero'] + */ +$cfg['Import']['sql_no_auto_value_on_zero'] = true; + /** * * diff --git a/libraries/import/sql.php b/libraries/import/sql.php index 2619a9025..596d47ce5 100644 --- a/libraries/import/sql.php +++ b/libraries/import/sql.php @@ -36,6 +36,17 @@ if (isset($plugin_list)) { 'Server_SQL_mode', ), ), + array( + 'type' => 'bool', + 'name' => 'no_auto_value_on_zero', + 'text' => 'strDoNotAutoIncrementZeroValues', + 'doc' => array( + 'manual_MySQL_Database_Administration', + 'Server_SQL_mode', + 'sqlmode_no_auto_value_on_zero' + ), + + ), ); } @@ -57,10 +68,18 @@ if (isset($_POST['sql_delimiter'])) { $sql_delimiter = ';'; } -// Handle compatibility option -if (isset($_REQUEST['sql_compatibility'])) { - PMA_DBI_try_query('SET SQL_MODE="' . $_REQUEST['sql_compatibility'] . '"'); +// Handle compatibility options +$sql_modes = array(); +if (isset($_REQUEST['sql_compatibility']) && 'NONE' != $_REQUEST['sql_compatibility']) { + $sql_modes[] = $_REQUEST['sql_compatibility']; } +if (isset($_REQUEST['sql_no_auto_value_on_zero'])) { + $sql_modes[] = 'NO_AUTO_VALUE_ON_ZERO'; +} +if (count($sql_modes) > 0) { + PMA_DBI_try_query('SET SQL_MODE="' . implode(',', $sql_modes) . '"'); +} +unset($sql_modes); /** * will be set in PMA_importGetNextChunk()