nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Marc Delisle
2010-04-08 10:32:51 -04:00
parent 5c032d4110 b3c041bb99
commit 1fc253e19e
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -65,6 +65,8 @@ $Id$
3.3.3.0 (not yet released) 3.3.3.0 (not yet released)
- patch #2982480 [navi] Do not group if there would be one table in group, - patch #2982480 [navi] Do not group if there would be one table in group,
thanks to Lorikeet Lee. thanks to Lorikeet Lee.
- patch #2983492 [sync] When asking to synchronize Structure and Data,
only Structure is done, thanks to Ankit Gupta - ankitgupta3
3.3.2.0 (not yet released) 3.3.2.0 (not yet released)
- patch #2969449 [core] Name for MERGE engine varies depending on the - patch #2969449 [core] Name for MERGE engine varies depending on the

10
libraries/server_synchronize.lib.php
View File

@@ -671,11 +671,11 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm
function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display) function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display)
{ {
$display = false; // todo: maybe display some of the queries if they are not too numerous $display = false; // todo: maybe display some of the queries if they are not too numerous
$unbuffered_result = PMA_DBI_try_query('SELECT * FROM ' . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), $src_link, PMA_DBI_QUERY_UNBUFFERED); $unbuffered_result = PMA_DBI_try_query('SELECT * FROM ' . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), $src_link, PMA_DBI_QUERY_UNBUFFERED);
if (false !== $unbuffered_result) { if (false !== $unbuffered_result) {
$insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES';
while ($one_row = PMA_DBI_fetch_row($unbuffered_result)) { while ($one_row = PMA_DBI_fetch_row($unbuffered_result)) {
$insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES('; $insert_query .= '(';
$key_of_last_value = count($one_row) - 1; $key_of_last_value = count($one_row) - 1;
foreach($one_row as $key => $value) { foreach($one_row as $key => $value) {
$insert_query .= "'" . PMA_sqlAddslashes($value) . "'"; $insert_query .= "'" . PMA_sqlAddslashes($value) . "'";
@@ -683,14 +683,16 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom
$insert_query .= ","; $insert_query .= ",";
} }
} }
$insert_query .= ');'; $insert_query .= '),';
}
$insert_query = substr($insert_query, 0, -1);
$insert_query .= ';';
if ($display == true) { if ($display == true) {
PMA_displayQuery($insert_query); PMA_displayQuery($insert_query);
} }
PMA_DBI_try_query($insert_query, $trg_link, 0); PMA_DBI_try_query($insert_query, $trg_link, 0);
} }
} }
}
/** /**
* PMA_deleteFromTargetTable() delete rows from target table * PMA_deleteFromTargetTable() delete rows from target table
* @uses sizeof() * @uses sizeof()