bzr push into mysql-6.0-backup branch (hezx:2692 to 2693)

[He Zhenxing]

 2693 He Zhenxing	2008-08-05
      Update test result after merge
modified:
  mysql-test/r/myisamlog.result
  mysql-test/r/rpl_sync_binlog_basic_64.result

 2692 He Zhenxing	2008-08-04 [merge]
      Merge from mysql-5.1-rpl
removed:
  mysql-test/include/wait_show_pattern.inc
  mysql-test/include/wait_slave_status.inc
  mysql-test/suite/rpl/data/
  mysql-test/suite/rpl/t/rpl000018-master.opt
  mysql-test/suite/rpl/t/rpl000018-slave.opt
  mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt
added:
  mysql-test/include/multi_range_count_basic.inc
  mysql-test/include/start_slave.inc
  mysql-test/include/stop_slave.inc
  mysql-test/include/sync_slave_io_with_master.inc
  mysql-test/include/wait_for_slave_io_error.inc
  mysql-test/include/wait_for_slave_io_to_start.inc
  mysql-test/lib/My/SysInfo.pm
  mysql-test/lib/My/Test.pm
  mysql-test/r/multi_range_count_basic_32.result
  mysql-test/r/multi_range_count_basic_64.result
  mysql-test/suite/rpl/r/rpl_bug26395.result
  mysql-test/suite/rpl/t/rpl_bug26395-master.opt
  mysql-test/suite/rpl/t/rpl_bug26395-slave.opt
  mysql-test/suite/rpl/t/rpl_bug26395.test
  mysql-test/t/multi_range_count_basic_32.test
  mysql-test/t/multi_range_count_basic_64.test
renamed:
  mysql-test/suite/rpl/data/rpl_bug28618.dat => mysql-test/std_data/rpl_bug28618.dat
  mysql-test/suite/rpl/data/rpl_mixed.dat => mysql-test/std_data/rpl_mixed.dat
  mysql-test/suite/rpl_ndb_big/r/rpl_ndb_transaction.result =>
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_mixed_engines_transactions.result
  mysql-test/suite/rpl_ndb_big/t/rpl_ndb_transaction-master.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_mixed_engines_transactions-master.opt
  mysql-test/suite/rpl_ndb_big/t/rpl_ndb_transaction-slave.opt =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_mixed_engines_transactions-slave.opt
  mysql-test/suite/rpl_ndb_big/t/rpl_ndb_transaction.test =>
mysql-test/suite/rpl_ndb_big/t/rpl_ndb_mixed_engines_transactions.test
modified:
  .bzrignore
  client/mysqltest.c
  mysql-test/Makefile.am
  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
  mysql-test/extra/rpl_tests/rpl_log.test
  mysql-test/extra/rpl_tests/rpl_reset_slave.test
  mysql-test/include/have_log_bin.inc
  mysql-test/include/master-slave-reset.inc
  mysql-test/include/reset_master_and_slave.inc
  mysql-test/include/wait_for_slave_io_to_stop.inc
  mysql-test/include/wait_for_slave_param.inc
  mysql-test/include/wait_for_slave_sql_error.inc
  mysql-test/include/wait_for_slave_sql_to_start.inc
  mysql-test/include/wait_for_slave_sql_to_stop.inc
  mysql-test/include/wait_for_slave_to_start.inc
  mysql-test/include/wait_for_slave_to_stop.inc
  mysql-test/lib/My/ConfigFactory.pm
  mysql-test/lib/My/Options.pm
  mysql-test/lib/My/SafeProcess.pm
  mysql-test/lib/mtr_cases.pm
  mysql-test/lib/mtr_report.pm
  mysql-test/mysql-test-run.pl
  mysql-test/r/character_set_database_func.result
  mysql-test/r/func_time.result
  mysql-test/r/grant.result
  mysql-test/r/grant2.result
  mysql-test/r/innodb_max_dirty_pages_pct_func.result
  mysql-test/r/innodb_notembedded.result
  mysql-test/r/loaddata.result
  mysql-test/r/log_bin_trust_function_creators_func.result
  mysql-test/r/mysqlbinlog_base64.result
  mysql-test/r/query_cache.result
  mysql-test/r/query_cache_notembedded.result
  mysql-test/r/rpl_max_binlog_size_func.result
  mysql-test/r/subselect.result
  mysql-test/r/subselect_no_mat.result
  mysql-test/r/subselect_no_opts.result
  mysql-test/r/subselect_no_semijoin.result
  mysql-test/r/timezone2.result
  mysql-test/r/wait_timeout_func.result
  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
  mysql-test/suite/federated/federated_bug_25714.test
  mysql-test/suite/parts/inc/partition_layout_check1.inc
  mysql-test/suite/parts/inc/partition_layout_check2.inc
  mysql-test/suite/rpl/include/rpl_mixed_dml.inc
  mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
  mysql-test/suite/rpl/r/rpl_flushlog_loop.result
  mysql-test/suite/rpl/r/rpl_found_rows.result
  mysql-test/suite/rpl/r/rpl_init_slave.result
  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
  mysql-test/suite/rpl/r/rpl_log_pos.result
  mysql-test/suite/rpl/r/rpl_packet.result
  mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
  mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result
  mysql-test/suite/rpl/r/rpl_row_log.result
  mysql-test/suite/rpl/r/rpl_row_log_innodb.result
  mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result
  mysql-test/suite/rpl/r/rpl_row_until.result
  mysql-test/suite/rpl/r/rpl_slave_grp_exec.result
  mysql-test/suite/rpl/r/rpl_slave_skip.result
  mysql-test/suite/rpl/r/rpl_slave_status.result
  mysql-test/suite/rpl/r/rpl_sp.result
  mysql-test/suite/rpl/r/rpl_sp_effects.result
  mysql-test/suite/rpl/r/rpl_stm_log.result
  mysql-test/suite/rpl/r/rpl_stm_until.result
  mysql-test/suite/rpl/r/rpl_variables.result
  mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
  mysql-test/suite/rpl/t/rpl_dual_pos_advance.test
  mysql-test/suite/rpl/t/rpl_flushlog_loop.test
  mysql-test/suite/rpl/t/rpl_idempotency.test
  mysql-test/suite/rpl/t/rpl_incident.test
  mysql-test/suite/rpl/t/rpl_init_slave.test
  mysql-test/suite/rpl/t/rpl_insert.test
  mysql-test/suite/rpl/t/rpl_log_pos.test
  mysql-test/suite/rpl/t/rpl_packet.test
  mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
  mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test
  mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test
  mysql-test/suite/rpl/t/rpl_row_until.test
  mysql-test/suite/rpl/t/rpl_server_id1.test
  mysql-test/suite/rpl/t/rpl_slave_grp_exec.test
  mysql-test/suite/rpl/t/rpl_slave_skip.test
  mysql-test/suite/rpl/t/rpl_slave_status.test
  mysql-test/suite/rpl/t/rpl_sp.test
  mysql-test/suite/rpl/t/rpl_sp_effects.test
  mysql-test/suite/rpl/t/rpl_stm_until.test
  mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
  mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
  mysql-test/suite/rpl_ndb_big/r/rpl_ndb_log.result
  mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result
  mysql-test/t/backup_myisam1.test
  mysql-test/t/backup_security.test
  mysql-test/t/character_set_database_func.test
  mysql-test/t/disabled.def
  mysql-test/t/error_simulation.test
  mysql-test/t/func_time.test
  mysql-test/t/grant.test
  mysql-test/t/grant2.test
  mysql-test/t/innodb_max_dirty_pages_pct_func.test
  mysql-test/t/innodb_notembedded.test
  mysql-test/t/loaddata.test
  mysql-test/t/log_bin_trust_function_creators_func.test
  mysql-test/t/mysqlbinlog_base64.test
  mysql-test/t/query_cache.test
  mysql-test/t/query_cache_notembedded.test
  mysql-test/t/rpl_init_slave_func.test
  mysql-test/t/rpl_max_binlog_size_func.test
  mysql-test/t/subselect.test
  mysql-test/t/timezone2.test
  mysql-test/t/wait_timeout_func.test
  sql/set_var.cc
  mysql-test/suite/rpl_ndb_big/r/rpl_ndb_mixed_engines_transactions.result
  mysql-test/suite/rpl_ndb_big/t/rpl_ndb_mixed_engines_transactions-master.opt
  mysql-test/suite/rpl_ndb_big/t/rpl_ndb_mixed_engines_transactions.test

=== modified file 'mysql-test/r/myisamlog.result'
--- a/mysql-test/r/myisamlog.result	2008-07-22 18:08:06 +0000
+++ b/mysql-test/r/myisamlog.result	2008-08-05 09:44:02 +0000
@@ -14,13 +14,13 @@ a	b
 truncate table t1;
 flush table t1;
 Commands                         Used count    Errors Recover errors
-open                       16         0              0
+open                       26         0              0
 write                       4         0              0
 update                      1         0              0
 delete                      1         0              0
 close                       8         0              0
 extra                       #         0              0
-lock                       48         0              0
+lock                       82         0              0
 Total               #         0                0
 select * from t1;
 a	b
@@ -29,13 +29,13 @@ Trying to update MyISAM files according 
 Tables updated successfully
 
 Commands                         Used count    Errors Recover errors
-open                       17         0              0
+open                       27         0              0
 write                       4         0              0
 update                      1         0              0
 delete                      1         0              0
 close                       9         0              0
 extra                       #         0              0
-lock                       50         0              0
+lock                       84         0              0
 Total               #         0                0
 select * from t1;
 a	b

=== modified file 'mysql-test/r/rpl_sync_binlog_basic_64.result'
--- a/mysql-test/r/rpl_sync_binlog_basic_64.result	2008-05-16 02:44:49 +0000
+++ b/mysql-test/r/rpl_sync_binlog_basic_64.result	2008-08-05 09:44:02 +0000
@@ -42,16 +42,16 @@ SELECT @@global.sync_binlog;
 SET @@global.sync_binlog = 4294967296;
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-4294967296
+0
 SET @@global.sync_binlog = 10240022115;
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-10240022115
[phone]
 SET @@global.sync_binlog = 10000.01;
 ERROR 42000: Incorrect argument type to variable 'sync_binlog'
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-10240022115
[phone]
 SET @@global.sync_binlog = -1024;
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
@@ -59,24 +59,24 @@ SELECT @@global.sync_binlog;
 SET @@global.sync_binlog = 42949672950;
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-42949672950
[phone]
 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
 SET @@global.sync_binlog = ON;
 ERROR 42000: Incorrect argument type to variable 'sync_binlog'
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-42949672950
[phone]
 SET @@global.sync_binlog = 'test';
 ERROR 42000: Incorrect argument type to variable 'sync_binlog'
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-42949672950
[phone]
 '#-------------------FN_DYNVARS_168_05----------------------------#'
 SET @@session.sync_binlog = 0;
 ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET
GLOBAL
 SELECT @@sync_binlog;
 @@sync_binlog
-42949672950
[phone]
 '#----------------------FN_DYNVARS_168_06------------------------#'
 SELECT @@global.sync_binlog = VARIABLE_VALUE
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -88,7 +88,7 @@ SET sync_binlog = 1;
 ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET
GLOBAL
 SELECT @@sync_binlog;
 @@sync_binlog
-42949672950
[phone]
 SET local.sync_binlog = 1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'sync_binlog = 1' at line 1
 SELECT local.sync_binlog;