From a1fba2daccee3c7c5d46cded39fda7ee7f0d6eae Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 6 Dec 2004 17:15:54 +0200 Subject: After merge fixes Fixed compiler warnings Fix core dump when sending SIGHUP to mysqld mysql-test/r/drop_temp_table.result: After merge fixes mysql-test/r/grant.result: After merge fixes mysql-test/r/group_min_max.result: After merge fixes mysql-test/r/innodb.result: After merge fixes mysql-test/r/insert_select.result: After merge fixes mysql-test/r/rpl_charset.result: After merge fixes mysql-test/r/rpl_create_database.result: After merge fixes mysql-test/r/rpl_loaddata_rule_m.result: After merge fixes mysql-test/t/rpl_charset.test: After merge fixes mysql-test/t/rpl_create_database.test: After merge fixes sql-common/client.c: After merge fixes sql/item.cc: After merge fixes sql/mysqld.cc: Fix core dump when sending SIGHUP to mysqld sql/sql_acl.cc: Better comment sql/sql_derived.cc: Fixed comment Added missing DBUG_RETURN sql/sql_insert.cc: Fixed compiler warnings After merge fixes sql/sql_lex.cc: After merge fixes Removed compiler warnings sql/sql_parse.cc: After merge fixes sql/sql_select.cc: More debugging sql/sql_table.cc: Added missing DBUG_VOID_RETURN sql/sql_update.cc: Fixed compiler warning sql/sql_view.cc: Added missing DBUG_RETURN Fixed compiler warnings Added flag to signal that the view is a derived table --- mysql-test/t/rpl_charset.test | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'mysql-test/t/rpl_charset.test') diff --git a/mysql-test/t/rpl_charset.test b/mysql-test/t/rpl_charset.test index a6a3cbe9f1b..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,17 +155,22 @@ select hex(c1), hex(c2) from t1; stop slave; delete from t1; -change master to master_log_pos=5847; -start slave until master_log_file='master-bin.000001', master_log_pos=5983; -# Slave is supposed to stop _after_ the INSERT, even though 5983 is +# 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 -- cgit v1.2.1