diff options
| author | Marc Delisle <marc@infomarc.info> | 2010-06-01 20:43:46 +0400 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2010-06-01 20:43:46 +0400 |
| commit | 39c73a94ee45790fd39190e412d7a007fcca1c2a (patch) | |
| tree | cdbf5ca6417a7b823e4f106397ffe133a94eb6ad /server_synchronize.php | |
| parent | 1e155e3a32e976c0294d522a255ad2a9bea7ea65 (diff) | |
| parent | 432379c87d6cb06a330c1928b3ec676da886a5f4 (diff) | |
bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option
Diffstat (limited to 'server_synchronize.php')
| -rw-r--r-- | server_synchronize.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server_synchronize.php b/server_synchronize.php index b609d3452e..c5d8077283 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -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); |