Commit 0550fead authored by unknown's avatar unknown
Browse files

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:
  disabling test if --ps-protocol, until we find reason
sql/slave.cc:
  fixing comment
parent 2daffc87

mysql-test/t/rpl_timezone.test

+11 −0
Original line number Diff line number Diff line 
# 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

sql/slave.cc

+1 −1
Original line number Diff line number Diff line
@@ -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