diff options
author | unknown <guilhem@mysql.com> | 2004-09-23 12:16:56 +0200 |
---|---|---|
committer | unknown <guilhem@mysql.com> | 2004-09-23 12:16:56 +0200 |
commit | b76d3b4f70541e404f0dd4499ba241ece4cdce41 (patch) | |
tree | 2f0092ce28cd67173fe36192649ff6bd1c319820 /mysql-test/r/rpl_charset.result | |
parent | ccf52b4fd5bd7ae0a418d22f2758cef345b6afa6 (diff) | |
download | mariadb-git-b76d3b4f70541e404f0dd4499ba241ece4cdce41.tar.gz |
Fix for BUG#5705: "SET CHARATER_SET_SERVERetc will be lost if STOP SLAVE before following query":
we do not increment rli->group_master_log_pos if we are just after a SET ONE_SHOT (it's not a standalone event)
mysql-test/r/rpl_charset.result:
testing interruption of slave SQL thread between SET CHARACTER_SET_SERVER... and the companion INSERT.
mysql-test/t/rpl_charset.test:
testing interruption of slave SQL thread between SET CHARACTER_SET_SERVER... and the companion INSERT.
sql/log_event.cc:
we do not increment rli->group_master_log_pos if we are just after a SET
ONE_SHOT, because SET ONE_SHOT should not be separated from its following
updating query.
Diffstat (limited to 'mysql-test/r/rpl_charset.result')
-rw-r--r-- | mysql-test/r/rpl_charset.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_charset.result b/mysql-test/r/rpl_charset.result index a60c9269625..54cce23b301 100644 --- a/mysql-test/r/rpl_charset.result +++ b/mysql-test/r/rpl_charset.result @@ -198,4 +198,12 @@ CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3 select hex(c1), hex(c2) from t1; hex(c1) hex(c2) CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3 +stop slave; +delete from t1; +change master to master_log_pos=5801; +start slave until master_log_file='master-bin.000001', master_log_pos=5937; +start slave; +select hex(c1), hex(c2) from t1; +hex(c1) hex(c2) +CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3 drop table t1; |