diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2010-11-22 14:47:28 +0300 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2010-11-22 14:47:28 +0300 |
| commit | bd557f04f644bda3b493c37225b169167eb6e11e (patch) | |
| tree | 318334755d94aef3ee64545c0a4a566380f9162f /mysql-test/include/rpl_diff_tables.inc | |
| parent | 3bae49d64ce0df04a85583b5dc680cda54760dbc (diff) | |
| parent | 9d9699209d9ca66648db8aff46f6b66a4c1c18de (diff) | |
| download | mariadb-git-bd557f04f644bda3b493c37225b169167eb6e11e.tar.gz | |
Manual merge from mysql-5.5-bugteam.
Diffstat (limited to 'mysql-test/include/rpl_diff_tables.inc')
| -rw-r--r-- | mysql-test/include/rpl_diff_tables.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/include/rpl_diff_tables.inc b/mysql-test/include/rpl_diff_tables.inc index c3a45578a79..a82e094a209 100644 --- a/mysql-test/include/rpl_diff_tables.inc +++ b/mysql-test/include/rpl_diff_tables.inc @@ -8,13 +8,13 @@ # --source include/rpl_diff_tables.inc # ############################################################################# -if (`SELECT "XX$diff_table" = "XX"`) +if (!$diff_table) { --die diff_table is null. } --let $_servers= master, slave -if (`SELECT "XX$diff_server_list" <> "XX"`) +if ($diff_server_list) { --let $_servers= $diff_server_list } @@ -22,7 +22,7 @@ if (`SELECT "XX$diff_server_list" <> "XX"`) --let $_master= `SELECT SUBSTRING_INDEX('$_servers', ',', 1)` --let $_servers= `SELECT LTRIM(SUBSTRING('$_servers', LENGTH('$_master') + 2))` connection $_master; -while (`SELECT "XX$_servers" <> "XX"`) +while ($_servers) { --let $_slave= `SELECT SUBSTRING_INDEX('$_servers', ',', 1)` --let $_servers= `SELECT LTRIM(SUBSTRING('$_servers', LENGTH('$_slave') + 2))` |