diff options
| author | Magnus Blåudd <magnus.blaudd@oracle.com> | 2011-04-27 11:02:34 +0200 |
|---|---|---|
| committer | Magnus Blåudd <magnus.blaudd@oracle.com> | 2011-04-27 11:02:34 +0200 |
| commit | f73eb618ca874489a5805baec6b5ab9a8642a007 (patch) | |
| tree | 143cc6222f9c2c1b6f82d2678119ddca1edcf17d /mysql-test/extra | |
| parent | 197bef38761cf26274a4304c3958fb355b9edd3e (diff) | |
| download | mariadb-git-f73eb618ca874489a5805baec6b5ab9a8642a007.tar.gz | |
BUG#47741 rpl_ndb_extraCol fails in next-mr (mysql-5.1-rep+2) in RBR
- fix the fix to properly detect when engine is NDB and
also don't drop the table t9 if it hasn't been created
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_extra_col_slave.test | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test b/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test index 482c7e44922..119e081878c 100644 --- a/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test +++ b/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test @@ -396,7 +396,7 @@ sync_slave_with_master; # Error reaction is up to sql_mode of the slave sql (bug#38173) #--echo *** Create t9 on slave *** # Please, check BUG#47741 to see why you are not testing NDB. -if ($engine_type != NDB) +if (`SELECT UPPER(LEFT($engine_type, 3)) != 'NDB'`) { STOP SLAVE; RESET SLAVE; @@ -440,12 +440,13 @@ if ($engine_type != NDB) #--let $slave_skip_counter= 2 #--let $show_slave_sql_error= 1 #--source include/wait_for_slave_sql_error_and_skip.inc -} -#--echo *** Drop t9 *** -connection master; -DROP TABLE t9; -sync_slave_with_master; + #--echo *** Drop t9 *** + connection master; + DROP TABLE t9; + sync_slave_with_master; + +} ############################################ # More columns in slave at middle of table # |