1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#47741 rpl_ndb_extraCol fails in next-mr (mysql-5.1-rep+2) in RBR

Browse Source 
- fix the fix to properly detect when engine is NDB and
   also don't drop the table t9 if it hasn't been created
This commit is contained in:
Magnus Blåudd 2011-04-27 11:02:34 +02:00
parent 197bef3876
commit f73eb618ca
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/extra/rpl_tests/rpl_extra_col_slave.test
View File

@ -396,7 +396,7 @@ sync_slave_with_master;
# Error reaction is up to sql_mode of the slave sql (bug#38173) # Error reaction is up to sql_mode of the slave sql (bug#38173)
#--echo *** Create t9 on slave *** #--echo *** Create t9 on slave ***
# Please, check BUG#47741 to see why you are not testing NDB. # 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; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
@ -440,12 +440,13 @@ if ($engine_type != NDB)
#--let $slave_skip_counter= 2 #--let $slave_skip_counter= 2
#--let $show_slave_sql_error= 1 #--let $show_slave_sql_error= 1
#--source include/wait_for_slave_sql_error_and_skip.inc #--source include/wait_for_slave_sql_error_and_skip.inc
}
#--echo *** Drop t9 *** #--echo *** Drop t9 ***
connection master; connection master;
DROP TABLE t9; DROP TABLE t9;
sync_slave_with_master; sync_slave_with_master;
}
############################################ ############################################
# More columns in slave at middle of table # # More columns in slave at middle of table #