Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0

Conflicts:
	ChangeLog
This commit is contained in:
Madhura Jayaratne 2013-09-15 13:18:05 +05:30
commit 988b1142ac
2 changed files with 5 additions and 0 deletions

View File

@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog
- bug #4091 Insert ignore option does not work
- bug #4090 Downloading BLOB downloads page template
- bug #4092 Clicking on table name in view of information_schema redirects to wrong page
- bug #4079 Copy Table Add AUTO_INCREMENT value checkbox not working
- bug #4088 MySQL server version at index.php incorrect w/ controlhost
4.0.6.0 (2013-09-05)

View File

@ -836,6 +836,10 @@ class PMA_Table
$no_constraints_comments = true;
$GLOBALS['sql_constraints_query'] = '';
// set the value of global sql_auto_increment variable
if( isset($_POST['sql_auto_increment']) ) {
$GLOBALS['sql_auto_increment'] = $_POST['sql_auto_increment'];
}
$sql_structure = $export_sql_plugin->getTableDef(
$source_db, $source_table, "\n", $err_url, false, false