diff options
| author | ninadsp <ninadsp16289@gmail.com> | 2010-06-03 21:04:52 +0400 |
|---|---|---|
| committer | ninadsp <ninadsp16289@gmail.com> | 2010-06-03 21:04:52 +0400 |
| commit | 160f4314eb518afcc1eba80da9575657584b2e34 (patch) | |
| tree | 6678e9fb54d748f31ce8d5bbdd87286e693b16e5 /server_synchronize.php | |
| parent | 3bb4dbd0acc962969000cd2d0dab230d858dc28c (diff) | |
| parent | 5dfe98a3786c7aaf55c9dd677da81bfe509c8612 (diff) | |
Merge remote branch 'origin/master'
Diffstat (limited to 'server_synchronize.php')
| -rwxr-xr-x | server_synchronize.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server_synchronize.php b/server_synchronize.php index b609d3452e..c5d8077283 100755 --- 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); |