summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <bar@mysql.com/bar.intranet.mysql.r18.ru>2006-11-01 12:30:01 +0400
committerunknown <bar@mysql.com/bar.intranet.mysql.r18.ru>2006-11-01 12:30:01 +0400
commitc755a7a1c48b236c57f996fbc3c07ccbc952424c (patch)
treeaa489bbdd9cce5eb5155a6dc2ed15ad60d4fd069 /BitKeeper
parent00a34b626379d26507c3f4877e11edbe3722321f (diff)
downloadmariadb-git-c755a7a1c48b236c57f996fbc3c07ccbc952424c.tar.gz
Bug#22877 replication character sets get out of
sync using replicate-wild-ignore-table Problem: changes in character set variables before an action on an replication-ignored table makes slave to forget new variable values. Fix: initialize one_shot variables only when 4.1 -> 5.x replication is running. mysql-test/r/rpl_ignore_table.result: Adding test case mysql-test/t/rpl_ignore_table-slave.opt: Don't replicate tables with names starting with "tmptbl" mysql-test/t/rpl_ignore_table.test: Adding test case sql/sql_parse.cc: Reset one_shot variables only if we do 4.1->5.x replication. In other cases we cannot do that: resetting thd->variables out of sync with st_relay_log_info::cached_charset, which makes st_relay_log_info::cached_charset_compare() not to notice character set related variables changes afterwards.
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index fd33e4fc902..e9b9c6d81e0 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -3,3 +3,4 @@
44edb86b1iE5knJ97MbliK_3lCiAXA
44f33f3aj5KW5qweQeekY1LU0E9ZCg
4513d8e4Af4dQWuk13sArwofRgFDQw
+4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg