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

bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option

Browse Source
This commit is contained in:
Marc Delisle
2010-06-01 12:43:46 -04:00
parent 1e155e3a32 432379c87d
commit 39c73a94ee
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -91,6 +91,8 @@ $Id$
+ [lang] Updated lot of translation based on work done in master branch.
- bug #3008411 [databases] Last dropped database remains active in navi
- bug #2986383 [parser] Not all data being shown / counted
- bug [synchronize] Rows were deleted in target table regardless of the
"Would you like to delete..." option
3.3.3.0 (2010-05-10)
- patch #2982480 [navi] Do not group if there would be one table in group,

6
server_synchronize.php
View File

@@ -1023,9 +1023,9 @@ if (isset($_REQUEST['synchronize_db'])) {
if (isset($alter_str_array[$p])) {
PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields,
$criteria, $matching_tables_keys, $target_tables_keys, $p, true);
unset($alter_str_array[$p]);
}
if (isset($add_column_array[$p])) {
unset($alter_str_array[$p]);
}
if (! empty($add_column_array[$p])) {
PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, $target_tables_keys, $matching_tables_keys,
$trg_db, $trg_link, $src_db, $src_link);