From fc7234cb4a08bd471f103624287b579a257bfd8e Mon Sep 17 00:00:00 2001
From: "gbichot@production.mysql.com" <>
Date: Tue, 22 Mar 2005 11:38:51 +0100
Subject: [PATCH] disabling rpl_timezone.test if --ps-protocol, as binlogging
 of CONVERT_TZ(,,@@time_zone) fails there; until we find reason (me and
 possibly Konstantin).

---
 mysql-test/t/rpl_timezone.test | 11 +++++++++++
 sql/slave.cc                   |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/mysql-test/t/rpl_timezone.test b/mysql-test/t/rpl_timezone.test
index a49cdd0acd2..cc8dcb6ce26 100644
--- a/mysql-test/t/rpl_timezone.test
+++ b/mysql-test/t/rpl_timezone.test
@@ -1,4 +1,15 @@
 # Test of replication of time zones.
+
+# There is currently some bug possibly in prepared statements (this
+# test fails with --ps-protocol): sys_var_thd_time_zone::value_ptr()
+# is called only at prepare time, not at execution time. So,
+# thd->time_zone_used is not equal to 1 (it is back to 0, because of
+# reset_thd_for_next_command called at execution time), so the
+# timezone used in CONVERT_TZ is not binlogged. To debug (by Guilhem
+# and possibly Konstantin).
+
+--disable_ps_protocol
+
 source include/master-slave.inc;
 
 # Some preparations
diff --git a/sql/slave.cc b/sql/slave.cc
index 9e42206d4a3..c92350f4a2f 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1421,7 +1421,7 @@ not always make sense; please check the manual before using it).";
     We don't test equality of global collation_database either as it's is
     going to be deprecated (made read-only) in 4.1 very soon.
     The test is only relevant if master < 5.0.3 (we'll test only if it's older
-    than the 5 branch; < 5.0.4 were alpha...), as >= 5.0.4 master stores
+    than the 5 branch; < 5.0.3 was alpha...), as >= 5.0.3 master stores
     charset info in each binlog event.
     We don't do it for 3.23 because masters <3.23.50 hang on
     SELECT @@unknown_var (BUG#7965 - see changelog of 3.23.50). So finally we