The branch, master has been updated via d5dede3530258c661f398282677f8733e7ab80eb (commit) via 8697ec3d488b03d2fdcee13c03492bc9a7fe219d (commit) from e07929af7aeeb4b943170aedb2f295fe713b63bd (commit)
- Log ----------------------------------------------------------------- commit d5dede3530258c661f398282677f8733e7ab80eb Merge: e07929a 8697ec3 Author: Marc Delisle marc@infomarc.info Date: Thu Dec 29 09:41:55 2011 -0500
Fix merge conflicts
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/Table.class.php | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 7713f7b..ba7c9fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ phpMyAdmin - ChangeLog - patch #3375984 [export] PHP Array export might generate invalid php code - bug #3049209 [import] Import from ODS ignores cell that is the same as cell before - bug #3463933 [display] SELECT DISTINCT displays wrong total records found +- patch #3458944 [operations] copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'
3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/libraries/Table.class.php b/libraries/Table.class.php index a2db8b2..7793347 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -871,6 +871,10 @@ class PMA_Table if (($what == 'data' || $what == 'dataonly') && ! PMA_Table::isView($target_db, $target_table) ) { + $sql_set_mode = "SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'"; + PMA_DBI_query($sql_set_mode); + $GLOBALS['sql_query'] .= "\n\n" . $sql_set_mode . ';'; + $sql_insert_data = 'INSERT INTO ' . $target . ' SELECT * FROM ' . $source; PMA_DBI_query($sql_insert_data); $GLOBALS['sql_query'] .= "\n\n" . $sql_insert_data . ';';
hooks/post-receive
-
Marc Delisle