diff options
Diffstat (limited to 'mysql-test/t/rpl_charset.test')
| -rw-r--r-- | mysql-test/t/rpl_charset.test | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/mysql-test/t/rpl_charset.test b/mysql-test/t/rpl_charset.test index 1bd72d059ab..52ace9a6aa5 100644 --- a/mysql-test/t/rpl_charset.test +++ b/mysql-test/t/rpl_charset.test @@ -129,7 +129,7 @@ select @@character_set_server; select @@character_set_server; # ONE_SHOT on not charset/collation stuff is not allowed -error 1382; +-- error 1382 set one_shot max_join_size=10; # Test of wrong character set numbers; @@ -155,14 +155,22 @@ select hex(c1), hex(c2) from t1; stop slave; delete from t1; +# Slave is now supposed to have stopped _after_ the INSERT # Note that the following positions may change between MySQL versions! -# This position should be position for the SET -change master to master_log_pos=6763; +# This position should be position for the SET ONE SHOT CHARACTER_SET_CLIENT +# command just before the INSERT. +# You can find it by doing: +# ../client/mysqlbinlog var/log/master-bin.000001 | grep -3 CHARACTER_SET | tail -7 +change master to master_log_pos=6809; -# This position should be position of the INSERT command -start slave until master_log_file='master-bin.000001', master_log_pos=6921; +# This position should be position of the INSERT command. +# You can find it by doing: +# +# ../client/mysqlbinlog var/log/master-bin.000001 | grep -3 INSERT | tail -4 + +start slave until master_log_file='master-bin.000001', master_log_pos=6967; # Slave is supposed to stop _after_ the INSERT, even though 'master_log_pos' is # the position of the beginning of the INSERT; after SET slave is not |