Cleanup in table moving/copying and allow to keep constraints over these operations.

2003-11-20 13:48:53 +00:00
parent 79222512c6
commit b702e8a4a7
101 changed files with 151 additions and 33 deletions
--- a/3
+++ b/3
@@ -9,6 +9,9 @@ $Source$
    * read_dump.php: Show message about failing upload in all cases, removed
      some PHP compatibility code.
    * libraries/export/sql.php: More older PHP cleanup.
+    * tbl_move_copy.php, tbl_properties_operations.php, lang/*: Cleanup in
+      table moving/copying and allow to keep constraints over these
+      operations.

 2003-11-20 Garvin Hicking <me@supergarv.de>
    * libraries/auth/*, libraries/dbg/*, libraries/export/*
--- a/lang/afrikaans-iso-8859-1.inc.php
+++ b/lang/afrikaans-iso-8859-1.inc.php
@@ -730,4 +730,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/afrikaans-utf-8.inc.php
+++ b/lang/afrikaans-utf-8.inc.php
@@ -731,4 +731,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/albanian-iso-8859-1.inc.php
+++ b/lang/albanian-iso-8859-1.inc.php
@@ -723,4 +723,5 @@ $strLatexCaption = 'Table caption';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/albanian-utf-8.inc.php
+++ b/lang/albanian-utf-8.inc.php
@@ -724,4 +724,5 @@ $strLatexCaption = 'Table caption';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/arabic-utf-8.inc.php
+++ b/lang/arabic-utf-8.inc.php
@@ -731,4 +731,5 @@ $strUpgrade = 'You should upgrade to %s %s or later.';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/arabic-windows-1256.inc.php
+++ b/lang/arabic-windows-1256.inc.php
@@ -730,4 +730,5 @@ $strUpgrade = 'You should upgrade to %s %s or later.';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/azerbaijani-iso-8859-9.inc.php
+++ b/lang/azerbaijani-iso-8859-9.inc.php
@@ -719,4 +719,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/azerbaijani-utf-8.inc.php
+++ b/lang/azerbaijani-utf-8.inc.php
@@ -720,4 +720,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/bosnian-utf-8.inc.php
+++ b/lang/bosnian-utf-8.inc.php
@@ -729,4 +729,5 @@ $strUpgrade = 'You should upgrade to %s %s or later.';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/bosnian-windows-1250.inc.php
+++ b/lang/bosnian-windows-1250.inc.php
@@ -728,4 +728,5 @@ $strUpgrade = 'You should upgrade to %s %s or later.';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/brazilian_portuguese-iso-8859-1.inc.php
+++ b/lang/brazilian_portuguese-iso-8859-1.inc.php
@@ -744,4 +744,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/brazilian_portuguese-utf-8.inc.php
+++ b/lang/brazilian_portuguese-utf-8.inc.php
@@ -745,4 +745,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/bulgarian-koi8-r.inc.php
+++ b/lang/bulgarian-koi8-r.inc.php
@@ -725,4 +725,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/bulgarian-utf-8.inc.php
+++ b/lang/bulgarian-utf-8.inc.php
@@ -726,4 +726,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/bulgarian-windows-1251.inc.php
+++ b/lang/bulgarian-windows-1251.inc.php
@@ -725,4 +725,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/catalan-iso-8859-1.inc.php
+++ b/lang/catalan-iso-8859-1.inc.php
@@ -716,4 +716,5 @@ $strZeroRemovesTheLimit = 'Nota: Establint aquestes opcions a 0 (zero) treu el l
 $strZip = '"comprimit amb zip"';
 // To translate

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/catalan-utf-8.inc.php
+++ b/lang/catalan-utf-8.inc.php
@@ -717,4 +717,5 @@ $strZeroRemovesTheLimit = 'Nota: Establint aquestes opcions a 0 (zero) treu el l
 $strZip = '"comprimit amb zip"';
 // To translate

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/chinese_big5-utf-8.inc.php
+++ b/lang/chinese_big5-utf-8.inc.php
@@ -723,4 +723,5 @@ $strYes = ' 是 ';
 $strZeroRemovesTheLimit = '註: 設定這些選項為 0 (零) 可解除限制.';
 $strZip = '"zipped"';

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/chinese_big5.inc.php
+++ b/lang/chinese_big5.inc.php
@@ -721,4 +721,5 @@ $strYes = '
 $strZeroRemovesTheLimit = '<27><>: <20>]<5D>w<EFBFBD>o<EFBFBD>ǿﶵ<C7BF><EFB6B5> 0 (<28>s) <20>i<EFBFBD>Ѱ<EFBFBD><D1B0><EFBFBD><EFBFBD><EFBFBD>.';
 $strZip = '"zipped"';

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/chinese_gb-utf-8.inc.php
+++ b/lang/chinese_gb-utf-8.inc.php
@@ -722,4 +722,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/chinese_gb.inc.php
+++ b/lang/chinese_gb.inc.php
@@ -721,4 +721,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/croatian-iso-8859-2.inc.php
+++ b/lang/croatian-iso-8859-2.inc.php
@@ -743,4 +743,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/croatian-utf-8.inc.php
+++ b/lang/croatian-utf-8.inc.php
@@ -744,4 +744,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/croatian-windows-1250.inc.php
+++ b/lang/croatian-windows-1250.inc.php
@@ -743,4 +743,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/czech-iso-8859-2.inc.php
+++ b/lang/czech-iso-8859-2.inc.php
@@ -30,6 +30,7 @@ $strAccessDenied = 'P
 $strAccessDeniedExplanation = 'phpMyAdmin se pokusil p<>ipojit k&nbsp;MySQL serveru, a ten odm<64>tl p<>ipojen<65>. Zkontrolujte jm<6A>no serveru, u<>ivatelsk<73> jm<6A>no a heslo v&nbsp;souboru config.inc.php a ujist<73>te se, <20>e jsou toto<74>n<EFBFBD> s&nbsp;t<>mi co m<>te od administr<74>tora MySQL serveru.';
 $strAction = 'Akce';
 $strAddAutoIncrement = 'P<>idat hodnotu AUTO_INCREMENT';
+$strAddConstraints = 'P<>idat omezen<65>';
 $strAddDeleteColumn = 'P<>idat/Smazat sloupec';
 $strAddDeleteRow = 'P<>idat/Smazat <20><>dek s&nbsp;podm<64>nkou';
 $strAddDropDatabase = 'P<>idat DROP DATABASE';
--- a/lang/czech-utf-8.inc.php
+++ b/lang/czech-utf-8.inc.php
@@ -31,6 +31,7 @@ $strAccessDenied = 'Přístup odepřen';
 $strAccessDeniedExplanation = 'phpMyAdmin se pokusil připojit k&nbsp;MySQL serveru, a ten odmítl připojení. Zkontrolujte jméno serveru, uživatelské jméno a heslo v&nbsp;souboru config.inc.php a ujistěte se, že jsou totožné s&nbsp;těmi co máte od administrátora MySQL serveru.';
 $strAction = 'Akce';
 $strAddAutoIncrement = 'Přidat hodnotu AUTO_INCREMENT';
+$strAddConstraints = 'Přidat omezení';
 $strAddDeleteColumn = 'Přidat/Smazat sloupec';
 $strAddDeleteRow = 'Přidat/Smazat řádek s&nbsp;podmínkou';
 $strAddDropDatabase = 'Přidat DROP DATABASE';
--- a/lang/czech-windows-1250.inc.php
+++ b/lang/czech-windows-1250.inc.php
@@ -30,6 +30,7 @@ $strAccessDenied = 'P
 $strAccessDeniedExplanation = 'phpMyAdmin se pokusil p<>ipojit k&nbsp;MySQL serveru, a ten odm<64>tl p<>ipojen<65>. Zkontrolujte jm<6A>no serveru, u<>ivatelsk<73> jm<6A>no a heslo v&nbsp;souboru config.inc.php a ujist<73>te se, <20>e jsou toto<74>n<EFBFBD> s&nbsp;t<>mi co m<>te od administr<74>tora MySQL serveru.';
 $strAction = 'Akce';
 $strAddAutoIncrement = 'P<>idat hodnotu AUTO_INCREMENT';
+$strAddConstraints = 'P<>idat omezen<65>';
 $strAddDeleteColumn = 'P<>idat/Smazat sloupec';
 $strAddDeleteRow = 'P<>idat/Smazat <20><>dek s&nbsp;podm<64>nkou';
 $strAddDropDatabase = 'P<>idat DROP DATABASE';
--- a/lang/danish-iso-8859-1.inc.php
+++ b/lang/danish-iso-8859-1.inc.php
@@ -738,4 +738,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/danish-utf-8.inc.php
+++ b/lang/danish-utf-8.inc.php
@@ -739,4 +739,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/dutch-iso-8859-1.inc.php
+++ b/lang/dutch-iso-8859-1.inc.php
@@ -723,4 +723,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/dutch-utf-8.inc.php
+++ b/lang/dutch-utf-8.inc.php
@@ -724,4 +724,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/english-iso-8859-1.inc.php
+++ b/lang/english-iso-8859-1.inc.php
@@ -715,4 +715,5 @@ $strYes = 'Yes';
 $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.';
 $strZip = '"zipped"';

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/english-utf-8.inc.php
+++ b/lang/english-utf-8.inc.php
@@ -716,4 +716,5 @@ $strYes = 'Yes';
 $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.';
 $strZip = '"zipped"';

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/estonian-iso-8859-1.inc.php
+++ b/lang/estonian-iso-8859-1.inc.php
@@ -716,4 +716,5 @@ $strZip = '"zipitud"';

 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/estonian-utf-8.inc.php
+++ b/lang/estonian-utf-8.inc.php
@@ -717,4 +717,5 @@ $strZip = '"zipitud"';

 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/finnish-iso-8859-1.inc.php
+++ b/lang/finnish-iso-8859-1.inc.php
@@ -740,4 +740,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/finnish-utf-8.inc.php
+++ b/lang/finnish-utf-8.inc.php
@@ -741,4 +741,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/french-iso-8859-1.inc.php
+++ b/lang/french-iso-8859-1.inc.php
@@ -717,4 +717,5 @@ $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enl
 $strZip = '"zipp<70>"';
 // To translate

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/french-utf-8.inc.php
+++ b/lang/french-utf-8.inc.php
@@ -718,4 +718,5 @@ $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.';
 $strZip = '"zippé"';
 // To translate

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/galician-iso-8859-1.inc.php
+++ b/lang/galician-iso-8859-1.inc.php
@@ -722,4 +722,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/galician-utf-8.inc.php
+++ b/lang/galician-utf-8.inc.php
@@ -723,4 +723,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/georgian-utf-8.inc.php
+++ b/lang/georgian-utf-8.inc.php
@@ -744,4 +744,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/german-iso-8859-1.inc.php
+++ b/lang/german-iso-8859-1.inc.php
@@ -724,4 +724,5 @@ $strCreationDates = 'Creation/Update/Check dates';  //to translate
 $strCheckOverhead = 'Check overheaded';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/german-utf-8.inc.php
+++ b/lang/german-utf-8.inc.php
@@ -725,4 +725,5 @@ $strCreationDates = 'Creation/Update/Check dates';  //to translate
 $strCheckOverhead = 'Check overheaded';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/greek-iso-8859-7.inc.php
+++ b/lang/greek-iso-8859-7.inc.php
@@ -724,4 +724,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/greek-utf-8.inc.php
+++ b/lang/greek-utf-8.inc.php
@@ -725,4 +725,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/hebrew-iso-8859-8-i.inc.php
+++ b/lang/hebrew-iso-8859-8-i.inc.php
@@ -740,4 +740,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/hindi-utf-8.inc.php
+++ b/lang/hindi-utf-8.inc.php
@@ -754,4 +754,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/hungarian-iso-8859-2.inc.php
+++ b/lang/hungarian-iso-8859-2.inc.php
@@ -728,4 +728,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/hungarian-utf-8.inc.php
+++ b/lang/hungarian-utf-8.inc.php
@@ -729,4 +729,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/indonesian-iso-8859-1.inc.php
+++ b/lang/indonesian-iso-8859-1.inc.php
@@ -716,4 +716,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/indonesian-utf-8.inc.php
+++ b/lang/indonesian-utf-8.inc.php
@@ -717,4 +717,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/italian-iso-8859-1.inc.php
+++ b/lang/italian-iso-8859-1.inc.php
@@ -723,4 +723,5 @@ $strDelayedInserts = 'Use delayed inserts';  //to translate

 $strSQLExportType = 'Export type';  //to translate

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/italian-utf-8.inc.php
+++ b/lang/italian-utf-8.inc.php
@@ -724,4 +724,5 @@ $strDelayedInserts = 'Use delayed inserts';  //to translate

 $strSQLExportType = 'Export type';  //to translate

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/japanese-euc.inc.php
+++ b/lang/japanese-euc.inc.php
@@ -728,4 +728,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/japanese-sjis.inc.php
+++ b/lang/japanese-sjis.inc.php
@@ -728,4 +728,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/japanese-utf-8.inc.php
+++ b/lang/japanese-utf-8.inc.php
@@ -729,4 +729,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/korean-ks_c_5601-1987.inc.php
+++ b/lang/korean-ks_c_5601-1987.inc.php
@@ -738,4 +738,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/latvian-utf-8.inc.php
+++ b/lang/latvian-utf-8.inc.php
@@ -722,4 +722,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/latvian-windows-1257.inc.php
+++ b/lang/latvian-windows-1257.inc.php
@@ -721,4 +721,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/lithuanian-utf-8.inc.php
+++ b/lang/lithuanian-utf-8.inc.php
@@ -718,4 +718,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/lithuanian-windows-1257.inc.php
+++ b/lang/lithuanian-windows-1257.inc.php
@@ -717,4 +717,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/malay-iso-8859-1.inc.php
+++ b/lang/malay-iso-8859-1.inc.php
@@ -741,4 +741,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/malay-utf-8.inc.php
+++ b/lang/malay-utf-8.inc.php
@@ -742,4 +742,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/norwegian-iso-8859-1.inc.php
+++ b/lang/norwegian-iso-8859-1.inc.php
@@ -720,4 +720,5 @@ $strZeroRemovesTheLimit = 'Merk: Ved
 $strZip = 'Komprimert (zip)';
 // To translate

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/norwegian-utf-8.inc.php
+++ b/lang/norwegian-utf-8.inc.php
@@ -721,4 +721,5 @@ $strZeroRemovesTheLimit = 'Merk: Ved å sette disse til 0 (null) fjerner begrens
 $strZip = 'Komprimert (zip)';
 // To translate

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/persian-utf-8.inc.php
+++ b/lang/persian-utf-8.inc.php
@@ -746,4 +746,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/persian-windows-1256.inc.php
+++ b/lang/persian-windows-1256.inc.php
@@ -745,4 +745,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/polish-iso-8859-2.inc.php
+++ b/lang/polish-iso-8859-2.inc.php
@@ -716,4 +716,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/polish-utf-8.inc.php
+++ b/lang/polish-utf-8.inc.php
@@ -717,4 +717,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/portuguese-iso-8859-1.inc.php
+++ b/lang/portuguese-iso-8859-1.inc.php
@@ -743,4 +743,5 @@ $strWritingRelationNotPossible = 'Writing of relation not possible';  //to trans
 $strXML = 'XML';//to translate

 $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/portuguese-utf-8.inc.php
+++ b/lang/portuguese-utf-8.inc.php
@@ -744,4 +744,5 @@ $strWritingRelationNotPossible = 'Writing of relation not possible';  //to trans
 $strXML = 'XML';//to translate

 $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/romanian-iso-8859-1.inc.php
+++ b/lang/romanian-iso-8859-1.inc.php
@@ -717,4 +717,5 @@ $strZip = '"arhivat"';
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/romanian-utf-8.inc.php
+++ b/lang/romanian-utf-8.inc.php
@@ -718,4 +718,5 @@ $strZip = '"arhivat"';
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/russian-dos-866.inc.php
+++ b/lang/russian-dos-866.inc.php
@@ -723,4 +723,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/russian-koi8-r.inc.php
+++ b/lang/russian-koi8-r.inc.php
@@ -723,4 +723,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/russian-utf-8.inc.php
+++ b/lang/russian-utf-8.inc.php
@@ -724,4 +724,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/russian-windows-1251.inc.php
+++ b/lang/russian-windows-1251.inc.php
@@ -723,4 +723,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/serbian_cyrillic-utf-8.inc.php
+++ b/lang/serbian_cyrillic-utf-8.inc.php
@@ -723,4 +723,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/serbian_cyrillic-windows-1251.inc.php
+++ b/lang/serbian_cyrillic-windows-1251.inc.php
@@ -722,4 +722,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/serbian_latin-utf-8.inc.php
+++ b/lang/serbian_latin-utf-8.inc.php
@@ -723,4 +723,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/serbian_latin-windows-1250.inc.php
+++ b/lang/serbian_latin-windows-1250.inc.php
@@ -722,4 +722,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/slovak-iso-8859-2.inc.php
+++ b/lang/slovak-iso-8859-2.inc.php
@@ -717,4 +717,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/slovak-utf-8.inc.php
+++ b/lang/slovak-utf-8.inc.php
@@ -718,4 +718,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/slovak-windows-1250.inc.php
+++ b/lang/slovak-windows-1250.inc.php
@@ -717,4 +717,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/slovenian-iso-8859-2.inc.php
+++ b/lang/slovenian-iso-8859-2.inc.php
@@ -718,4 +718,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/slovenian-utf-8.inc.php
+++ b/lang/slovenian-utf-8.inc.php
@@ -719,4 +719,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/slovenian-windows-1250.inc.php
+++ b/lang/slovenian-windows-1250.inc.php
@@ -718,4 +718,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/spanish-iso-8859-1.inc.php
+++ b/lang/spanish-iso-8859-1.inc.php
@@ -715,4 +715,5 @@ $strYes = 'S
 $strZeroRemovesTheLimit = 'Nota: si cambia los par<61>metros de estas opciones a 0 (cero), remueve el l<>mite.';
 $strZip = '"comprimido con zip"';

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/spanish-utf-8.inc.php
+++ b/lang/spanish-utf-8.inc.php
@@ -716,4 +716,5 @@ $strYes = 'Sí';
 $strZeroRemovesTheLimit = 'Nota: si cambia los parámetros de estas opciones a 0 (cero), remueve el límite.';
 $strZip = '"comprimido con zip"';

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/swedish-iso-8859-1.inc.php
+++ b/lang/swedish-iso-8859-1.inc.php
@@ -716,4 +716,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/swedish-utf-8.inc.php
+++ b/lang/swedish-utf-8.inc.php
@@ -717,4 +717,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/thai-tis-620.inc.php
+++ b/lang/thai-tis-620.inc.php
@@ -728,4 +728,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/thai-utf-8.inc.php
+++ b/lang/thai-utf-8.inc.php
@@ -729,4 +729,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/turkish-iso-8859-9.inc.php
+++ b/lang/turkish-iso-8859-9.inc.php
@@ -728,4 +728,5 @@ $strYes = 'Evet';
 $strZeroRemovesTheLimit = 'Not: Bu se<73>eneklerin 0\'a ayarlanmas<61> s<>n<EFBFBD>r<EFBFBD> kald<6C>r<EFBFBD>r..';
 $strZip = '"ziplenmi<6D>"';

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/turkish-utf-8.inc.php
+++ b/lang/turkish-utf-8.inc.php
@@ -729,4 +729,5 @@ $strYes = 'Evet';
 $strZeroRemovesTheLimit = 'Not: Bu seçeneklerin 0\'a ayarlanması sınırı kaldırır..';
 $strZip = '"ziplenmiş"';

+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/ukrainian-utf-8.inc.php
+++ b/lang/ukrainian-utf-8.inc.php
@@ -721,4 +721,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/lang/ukrainian-windows-1251.inc.php
+++ b/lang/ukrainian-windows-1251.inc.php
@@ -720,4 +720,5 @@ $strCheckOverhead = 'Check overheaded';  //to translate
 $strExcelEdition = 'Excel edition';  //to translate
 $strDelayedInserts = 'Use delayed inserts';  //to translate
 $strSQLExportType = 'Export type';  //to translate
+$strAddConstraints = 'Add constraints';  //to translate
 ?>
--- a/tbl_move_copy.php
+++ b/tbl_move_copy.php
@@ -138,10 +138,6 @@ if (isset($new_name) && trim($new_name) != '') {
        (PMA_isInto($db, $dblist) == -1 || PMA_isInto($target_db, $dblist) == -1)) {
        exit();
    }
-    if (PMA_MYSQL_INT_VERSION < 32306) {
-        PMA_checkReservedWords($target_db, $err_url);
-        PMA_checkReservedWords($new_name, $err_url);
-    }

    if ($db == $target_db && $new_name == $table) {
        $message   = (isset($submit_move) ? $strMoveTableSameNames : $strCopyTableSameNames);
@@ -155,23 +151,26 @@ if (isset($new_name) && trim($new_name) != '') {
        
        $target = PMA_backquote($target_db) . '.' . PMA_backquote($new_name);

-        include('./libraries/export/sql.php');
-
-        $sql_structure = PMA_getTableDef($db, $table, "\n", $err_url);
-        $parsed_sql =  PMA_SQP_parse($sql_structure);
-
-        /* nijel: Find table name in query and replace it */
-        $i = 0;
-        while ($parsed_sql[$i]['type'] != 'quote_backtick') $i++;
-        
-        /* no need to PMA_backquote() */
-        $parsed_sql[$i]['data'] = $target;
-
-        /* Generate query back */
-        $sql_structure = PMA_SQP_formatHtml($parsed_sql, 'query_only');
-
        // do not create the table if dataonly
        if ($what != 'dataonly') {
+            include('./libraries/export/sql.php');
+
+            $no_constraints_comments = true;
+            $sql_structure = PMA_getTableDef($db, $table, "\n", $err_url);
+            unset($no_constraints_comments);
+
+            $parsed_sql =  PMA_SQP_parse($sql_structure);
+
+            /* nijel: Find table name in query and replace it */
+            $i = 0;
+            while ($parsed_sql[$i]['type'] != 'quote_backtick') $i++;
+            
+            /* no need to PMA_backquote() */
+            $parsed_sql[$i]['data'] = $target;
+
+            /* Generate query back */
+            $sql_structure = PMA_SQP_formatHtml($parsed_sql, 'query_only');
+        
            // If table exists, and 'add drop table' is selected: Drop it!
            $drop_query = '';
            if (isset($drop_if_exists) && $drop_if_exists == 'true') {
@@ -202,26 +201,42 @@ if (isset($new_name) && trim($new_name) != '') {
            } else {
                $sql_query = $sql_structure . ';';
            }
+            
+            if ((isset($submit_move) || isset($constraints)) && isset($sql_constraints)) {
+                $parsed_sql =  PMA_SQP_parse($sql_constraints);
+               
+                $i = 0;
+                while ($parsed_sql[$i]['type'] != 'quote_backtick') $i++;
+                
+                /* no need to PMA_backquote() */
+                $parsed_sql[$i]['data'] = $target;
+
+                /* Generate query back */
+                $sql_constraints = PMA_SQP_formatHtml($parsed_sql, 'query_only');
+                $result        = @PMA_mysql_query($sql_constraints);
+                if (PMA_mysql_error()) {
+                    include('./header.inc.php');
+                    PMA_mysqlDie('', $sql_structure, '', $err_url);
+                } else if (isset($sql_query)) {
+                    $sql_query .= "\n" . $sql_constraints;
+                } else {
+                    $sql_query = $sql_constrtaints;
+                }
+            }
+
        } else {
            $sql_query='';
        }

        // Copy the data
        if ($result != FALSE && ($what == 'data' || $what == 'dataonly')) {
-            // speedup copy table - staybyte - 22. Juni 2001
-            if (PMA_MYSQL_INT_VERSION >= 32300) {
-                $sql_insert_data = 'INSERT INTO ' . $target . ' SELECT * FROM ' . $source;
-                $result          = @PMA_mysql_query($sql_insert_data);
-                if (PMA_mysql_error()) {
-                    include('./header.inc.php');
-                    PMA_mysqlDie('', $sql_insert_data, '', $err_url);
-                }
-            } // end MySQL >= 3.23
-            else {
-                $sql_insert_data = '';
-                PMA_getTableContent($db, $table, 0, 0, 'PMA_myHandler', $err_url,'');
-            } // end MySQL < 3.23
-            $sql_query .= "\n\n" . $sql_insert_data;
+            $sql_insert_data = 'INSERT INTO ' . $target . ' SELECT * FROM ' . $source;
+            $result          = @PMA_mysql_query($sql_insert_data);
+            if (PMA_mysql_error()) {
+                include('./header.inc.php');
+                PMA_mysqlDie('', $sql_insert_data, '', $err_url);
+            }
+            $sql_query .= "\n\n" . $sql_insert_data . ';';
        }

        include('./libraries/relation.lib.php');
--- a/Show More
+++ b/Show More