From: Tor Didriksen Date: April 18 2012 1:07pm Subject: bzr push into mysql-trunk branch (tor.didriksen:3875) List-Archive: http://lists.mysql.com/commits/143526 Message-Id: <201204181307.q3ID7S9w022391@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3875 Tor Didriksen 2012-04-18 [merge] local merge added: mysql-test/r/mysql_embedded_client_test.result mysql-test/suite/innodb/r/innodb-alter-discard.result mysql-test/suite/innodb/t/innodb-alter-discard.test mysql-test/suite/sys_vars/r/transaction_allow_batching_basic.result mysql-test/suite/sys_vars/t/transaction_allow_batching_basic.test mysql-test/t/mysql_embedded_client_test.test modified: include/mysql_com.h libmysqld/lib_sql.cc mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc mysql-test/extra/rpl_tests/rpl_row_basic.test mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test mysql-test/include/function_defaults.inc mysql-test/r/alter_table.result mysql-test/r/derived.result mysql-test/r/explain.result mysql-test/r/function_defaults.result mysql-test/r/get_diagnostics.result mysql-test/r/help.result mysql-test/r/innodb_explain_json_non_select_all.result mysql-test/r/innodb_explain_json_non_select_none.result mysql-test/r/innodb_explain_non_select_all.result mysql-test/r/innodb_explain_non_select_none.result mysql-test/r/myisam_explain_json_non_select_all.result mysql-test/r/myisam_explain_json_non_select_none.result mysql-test/r/myisam_explain_non_select_all.result mysql-test/r/myisam_explain_non_select_none.result mysql-test/r/partition_error.result mysql-test/r/partition_exchange.result mysql-test/r/read_only_innodb.result mysql-test/r/show_check.result mysql-test/r/sp-destruct.result mysql-test/r/sp-threads.result mysql-test/r/tablespace.result mysql-test/r/type_time.result mysql-test/r/variables.result mysql-test/suite/binlog/r/binlog_grant.result mysql-test/suite/binlog/r/binlog_rewrite.result mysql-test/suite/binlog/t/binlog_grant.test mysql-test/suite/engines/funcs/t/crash_manytables_number.test mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test mysql-test/suite/engines/funcs/t/se_join_cross.test mysql-test/suite/engines/funcs/t/se_join_default.test mysql-test/suite/engines/funcs/t/se_join_inner.test mysql-test/suite/engines/funcs/t/se_join_left.test mysql-test/suite/engines/funcs/t/se_join_natural_left.test mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test mysql-test/suite/engines/funcs/t/se_join_natural_right.test mysql-test/suite/engines/funcs/t/se_join_natural_right_outer.test mysql-test/suite/engines/funcs/t/se_join_right.test mysql-test/suite/engines/funcs/t/se_join_right_outer.test mysql-test/suite/engines/funcs/t/se_join_straight.test mysql-test/suite/engines/funcs/t/se_string_limit.test mysql-test/suite/engines/iuds/t/update_delete_number.test mysql-test/suite/funcs_1/datadict/processlist_priv.inc mysql-test/suite/funcs_1/datadict/processlist_val.inc mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result mysql-test/suite/funcs_1/r/processlist_priv_ps.result mysql-test/suite/funcs_1/r/processlist_val_no_prot.result mysql-test/suite/funcs_1/r/processlist_val_ps.result mysql-test/suite/innodb/r/innodb-index-online.result mysql-test/suite/innodb/t/innodb-index-online.test mysql-test/suite/innodb/t/innodb_bug30423.test mysql-test/suite/innodb/t/innodb_bug53290.test mysql-test/suite/innodb_fts/r/innodb_fts_misc.result mysql-test/suite/innodb_fts/t/innodb_fts_misc.test mysql-test/suite/parts/r/partition_exch_qa_12.result mysql-test/suite/parts/t/partition_exch_qa_12.test mysql-test/suite/parts/t/partition_float_myisam.test mysql-test/suite/perfschema/r/digest_table_full.result mysql-test/suite/perfschema/r/statement_digest.result mysql-test/suite/perfschema/r/statement_digest_consumers.result mysql-test/suite/perfschema/r/statement_digest_long_query.result mysql-test/suite/rpl/r/rpl_alter_repository.result mysql-test/suite/rpl/r/rpl_binlog_index.result mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result mysql-test/suite/rpl/r/rpl_mts_debug.result mysql-test/suite/rpl/r/rpl_parallel_start_stop.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_basic_allow_batching.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_EE_err2.result mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result mysql-test/suite/rpl/t/rpl_alter_repository.test mysql-test/suite/rpl/t/rpl_binlog_index.test mysql-test/suite/rpl/t/rpl_innodb_bug28430.test mysql-test/suite/rpl/t/rpl_mts_debug.test mysql-test/suite/rpl/t/rpl_parallel_innodb.test mysql-test/suite/rpl/t/rpl_parallel_start_stop.test mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test mysql-test/suite/rpl/t/rpl_row_crash_safe.test mysql-test/suite/rpl/t/rpl_row_img_blobs.test mysql-test/suite/rpl/t/rpl_row_img_eng_full.test mysql-test/suite/rpl/t/rpl_row_img_idx_full.test mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test mysql-test/suite/rpl/t/rpl_stm_until.test mysql-test/suite/rpl/t/rpl_stop_slave.test mysql-test/suite/rpl/t/rpl_typeconv.test mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result mysql-test/t/alter_table.test mysql-test/t/derived.test mysql-test/t/disabled.def mysql-test/t/help.test mysql-test/t/index_merge_innodb.test mysql-test/t/innodb_explain_json_non_select_all.test mysql-test/t/innodb_explain_non_select_all.test mysql-test/t/innodb_explain_non_select_none.test mysql-test/t/mysql_client_test_embedded.test mysql-test/t/partition_exchange.test mysql-test/t/show_check.test mysql-test/t/sp-threads.test mysql-test/t/tablespace.test sql/binlog.cc sql/event_scheduler.cc sql/field.cc sql/field.h sql/field_conv.cc sql/global_threads.h sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_create.cc sql/item_func.cc sql/item_func.h sql/item_strfunc.cc sql/item_strfunc.h sql/item_subselect.cc sql/item_timefunc.h sql/item_xmlfunc.cc sql/lex.h sql/log.h sql/log_event.cc sql/mysqld.cc sql/mysqld.h sql/rpl_info_dummy.cc sql/rpl_info_dummy.h sql/rpl_info_factory.cc sql/rpl_info_factory.h sql/rpl_info_file.cc sql/rpl_info_file.h sql/rpl_info_handler.h sql/rpl_info_table.cc sql/rpl_info_table.h sql/rpl_master.cc sql/rpl_mi.cc sql/rpl_rli.cc sql/rpl_rli.h sql/rpl_rli_pdb.cc sql/rpl_rli_pdb.h sql/rpl_slave.cc sql/rpl_slave.h sql/scheduler.cc sql/share/errmsg-utf8.txt sql/signal_handler.cc sql/sp_head.cc sql/sql_analyse.cc sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_derived.cc sql/sql_executor.cc sql/sql_insert.cc sql/sql_lex.h sql/sql_optimizer.cc sql/sql_optimizer.h sql/sql_parse.cc sql/sql_partition_admin.cc sql/sql_plugin.cc sql/sql_reload.cc sql/sql_select.cc sql/sql_show.cc sql/sql_show.h sql/sql_string.h sql/sql_table.cc sql/sql_test.cc sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/unireg.cc storage/example/ha_example.cc storage/innobase/buf/buf0flu.cc storage/innobase/fts/fts0blex.cc storage/innobase/fts/fts0blex.l storage/innobase/fts/fts0que.cc storage/innobase/fts/fts0tlex.cc storage/innobase/fts/fts0tlex.l storage/innobase/handler/handler0alter.cc storage/innobase/log/log0recv.cc storage/myisam/ha_myisam.cc storage/ndb/compile-cluster storage/perfschema/pfs_check.cc unittest/gunit/alignment-t.cc unittest/gunit/fake_table.h unittest/gunit/field-t.cc unittest/gunit/field_timestamp-t.cc === modified file 'README' --- a/README 2012-03-21 06:42:54 +0000 +++ b/README 2012-04-11 11:45:07 +0000 @@ -5,7 +5,7 @@ For the avoidance of doubt, this particu is released under the version 2 of the GNU General Public License. MySQL is brought to you by Oracle. -Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. License information can be found in the COPYING file. === modified file 'client/mysql.cc' --- a/client/mysql.cc 2012-03-06 14:29:42 +0000 +++ b/client/mysql.cc 2012-04-16 09:14:37 +0000 @@ -1297,7 +1297,7 @@ int main(int argc,char *argv[]) mysql_thread_id(&mysql), server_version_string(&mysql)); put_info((char*) glob_buffer.ptr(),INFO_INFO); - put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"), INFO_INFO); + put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"), INFO_INFO); #ifdef HAVE_READLINE initialize_readline((char*) my_progname); @@ -1727,7 +1727,7 @@ static void usage(int version) if (version) return; - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012")); printf("Usage: %s [OPTIONS] [database]\n", my_progname); my_print_help(my_long_options); print_defaults("my", load_default_groups); === modified file 'client/mysql_upgrade.c' --- a/client/mysql_upgrade.c 2012-03-06 14:29:42 +0000 +++ b/client/mysql_upgrade.c 2012-04-16 09:14:37 +0000 @@ -246,7 +246,7 @@ get_one_option(int optid, const struct m case '?': printf("%s Ver %s Distrib %s, for %s (%s)\n", my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2010")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012")); puts("MySQL utility for upgrading databases to new MySQL versions.\n"); my_print_help(my_long_options); exit(0); === modified file 'client/mysqladmin.cc' --- a/client/mysqladmin.cc 2012-03-06 14:29:42 +0000 +++ b/client/mysqladmin.cc 2012-04-16 09:14:37 +0000 @@ -703,7 +703,7 @@ static int execute_commands(MYSQL *mysql case ADMIN_VER: new_line=1; print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012")); printf("Server version\t\t%s\n", mysql_get_server_info(mysql)); printf("Protocol version\t%d\n", mysql_get_proto_info(mysql)); printf("Connection\t\t%s\n",mysql_get_host_info(mysql)); @@ -1101,7 +1101,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012")); puts("Administration program for the mysqld daemon."); printf("Usage: %s [OPTIONS] command command....\n", my_progname); my_print_help(my_long_options); === modified file 'client/mysqlbinlog.cc' --- a/client/mysqlbinlog.cc 2012-03-06 14:29:42 +0000 +++ b/client/mysqlbinlog.cc 2012-04-16 09:14:37 +0000 @@ -1475,7 +1475,7 @@ static void print_version() static void usage() { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012")); printf("\ Dumps a MySQL binary log in a format usable for viewing or for piping to\n\ the mysql command line client.\n\n"); === modified file 'client/mysqlcheck.c' --- a/client/mysqlcheck.c 2012-03-06 14:29:42 +0000 +++ b/client/mysqlcheck.c 2012-04-16 09:14:37 +0000 @@ -228,7 +228,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012")); puts("This program can be used to CHECK (-c, -m, -C), REPAIR (-r), ANALYZE (-a),"); puts("or OPTIMIZE (-o) tables. Some of the options (like -e or -q) can be"); puts("used at the same time. Not all options are supported by all storage engines."); === modified file 'client/mysqldump.c' --- a/client/mysqldump.c 2012-03-21 06:42:54 +0000 +++ b/client/mysqldump.c 2012-04-16 09:14:37 +0000 @@ -612,7 +612,7 @@ static void short_usage_sub(void) static void usage(void) { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012")); puts("Dumping structure and contents of MySQL databases and tables."); short_usage_sub(); print_defaults("my",load_default_groups); === modified file 'client/mysqlimport.c' --- a/client/mysqlimport.c 2012-03-06 14:29:42 +0000 +++ b/client/mysqlimport.c 2012-04-16 09:14:37 +0000 @@ -203,7 +203,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012")); printf("\ Loads tables from text files in various formats. The base name of the\n\ text file must be the name of the table that should be used.\n\ === modified file 'client/mysqlshow.c' --- a/client/mysqlshow.c 2012-03-06 14:29:42 +0000 +++ b/client/mysqlshow.c 2012-04-16 09:14:37 +0000 @@ -277,7 +277,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011)")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012)")); puts("Shows the structure of a MySQL database (databases, tables, and columns).\n"); printf("Usage: %s [OPTIONS] [database [table [column]]]\n",my_progname); puts("\n\ === modified file 'client/mysqlslap.c' --- a/client/mysqlslap.c 2012-04-17 10:33:31 +0000 +++ b/client/mysqlslap.c 2012-04-18 13:06:39 +0000 @@ -708,7 +708,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2005, 2010")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2005, 2012")); puts("Run a query multiple times against the server.\n"); printf("Usage: %s [OPTIONS]\n",my_progname); print_defaults("my",load_default_groups); === modified file 'client/mysqltest.cc' --- a/client/mysqltest.cc 2012-03-06 14:29:42 +0000 +++ b/client/mysqltest.cc 2012-04-16 09:14:37 +0000 @@ -6564,7 +6564,7 @@ void print_version(void) void usage() { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012")); printf("Runs a test against the mysql server and compares output with a results file.\n\n"); printf("Usage: %s [OPTIONS] [database] < test_file\n", my_progname); my_print_help(my_long_options); === modified file 'extra/innochecksum.cc' --- a/extra/innochecksum.cc 2012-03-14 01:50:20 +0000 +++ b/extra/innochecksum.cc 2012-04-16 09:14:37 +0000 @@ -152,7 +152,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012")); printf("InnoDB offline file checksum utility.\n"); printf("Usage: %s [-c] [-s ] [-e ] [-p ] [-v] [-d] \n", my_progname); my_print_help(innochecksum_options); === modified file 'extra/perror.c' --- a/extra/perror.c 2011-09-27 13:38:39 +0000 +++ b/extra/perror.c 2012-04-16 09:14:37 +0000 @@ -84,7 +84,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012")); printf("Print a description for a system error code or a MySQL error code.\n"); printf("If you want to get the error for a negative error code, you should use\n-- before the first error code to tell perror that there was no more options.\n\n"); printf("Usage: %s [OPTIONS] [ERRORCODE [ERRORCODE...]]\n",my_progname); === modified file 'include/welcome_copyright_notice.h' --- a/include/welcome_copyright_notice.h 2012-02-16 09:51:14 +0000 +++ b/include/welcome_copyright_notice.h 2012-03-27 10:53:19 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by === modified file 'mysql-test/include/assert_command_output.inc' --- a/mysql-test/include/assert_command_output.inc 2012-01-16 22:21:16 +0000 +++ b/mysql-test/include/assert_command_output.inc 2012-03-12 12:09:40 +0000 @@ -20,6 +20,7 @@ if ($rpl_debug) --let _ASSERT_STATUS= $assert_status --let $_assert_suffix= `SELECT UUID()` --let _ASSERT_ERROR_FILE= $MYSQLTEST_VARDIR/tmp/_assert_$_assert_suffix.inc +--let _ASSERT_DEBUG= $rpl_debug if ($rpl_debug) { @@ -31,6 +32,7 @@ perl; my $positive= $ENV{'_ASSERT_NEGATED'} ? 0 : 1; my $regex= $ENV{'_ASSERT_REGEX'}; my $status= $ENV{'_ASSERT_STATUS'}; + my $debug= $ENV{'_ASSERT_DEBUG'}; my $output= `$cmd`; my $error= 0; $status= 0 if $status eq ''; @@ -46,8 +48,6 @@ perl; print "ERROR: Command: '$cmd'\n"; print "ERROR: Output expected to " . ($positive?'':'not '). "match " . "perl regex: '$regex'\n"; - print "======== BEGIN output ========\n$output\n" . - "======== END OUTPUT ========\n"; $error= 1; } if (!$error) @@ -57,6 +57,11 @@ perl; print FILE "X" or die "Error writing to $file: $!"; close FILE or die "Error closing $file: $!"; } + if ($error || $debug) + { + print "======== BEGIN output ========\n$output\n" . + "======== END OUTPUT ========\n"; + } EOF --file_exists $_ASSERT_ERROR_FILE === modified file 'mysql-test/suite/rpl/r/rpl_gtid_mode.result' --- a/mysql-test/suite/rpl/r/rpl_gtid_mode.result 2012-03-23 20:11:19 +0000 +++ b/mysql-test/suite/rpl/r/rpl_gtid_mode.result 2012-04-18 11:57:55 +0000 @@ -3,6 +3,9 @@ include/master-slave.inc call mtr.add_suppression("Slave I/O: The slave IO thread stops because the master has GTID_MODE"); call mtr.add_suppression("Error reading packet from server: Lost connection to MySQL"); call mtr.add_suppression("Aborting"); +call mtr.add_suppression(".* CHANGE MASTER TO MASTER_AUTO_POSITION = 1 can only be executed when GTID_MODE = ON."); +call mtr.add_suppression(".* Found a Gtid_log_event or Previous_gtids_log_event when GTID_MODE = OFF."); +call mtr.add_suppression(".* Failed to initialize the master info structure"); include/stop_slave.inc ==== Master and slave have GTID_MODE = OFF ==== ---- Default value for GTID_MODE ---- @@ -93,9 +96,11 @@ INSERT INTO t1 VALUES (3); include/stop_slave.inc ==== Checks performed at server start when GTID_MODE = OFF ==== include/rpl_stop_server.inc [server_number=2] ----- Fail to start with GTID_MODE = OFF and GTIDs in binlog/relay log ---- -include/assert_command_output.inc -include/rpl_start_server.inc [server_number=2 gtids=on] +---- Fail to start replication with GTID_MODE = OFF and GTIDs in binlog/relay log ---- +include/rpl_start_server.inc [server_number=2] +START SLAVE; +ERROR HY000: CHANGE MASTER TO MASTER_AUTO_POSITION = 1 can only be executed when GTID_MODE = ON. +include/rpl_restart_server.inc [server_number=2 gtids=on] RESET SLAVE; RESET MASTER; ==== Master has GTID_MODE = ON, slave has GTID_MODE = OFF ==== === modified file 'mysql-test/suite/rpl/t/rpl_gtid_mode.test' --- a/mysql-test/suite/rpl/t/rpl_gtid_mode.test 2012-03-23 20:11:19 +0000 +++ b/mysql-test/suite/rpl/t/rpl_gtid_mode.test 2012-04-18 11:57:55 +0000 @@ -55,6 +55,9 @@ call mtr.add_suppression("Slave I/O: The slave IO thread stops because the master has GTID_MODE"); call mtr.add_suppression("Error reading packet from server: Lost connection to MySQL"); call mtr.add_suppression("Aborting"); +call mtr.add_suppression(".* CHANGE MASTER TO MASTER_AUTO_POSITION = 1 can only be executed when GTID_MODE = ON."); +call mtr.add_suppression(".* Found a Gtid_log_event or Previous_gtids_log_event when GTID_MODE = OFF."); +call mtr.add_suppression(".* Failed to initialize the master info structure"); --sync_slave_with_master --source include/stop_slave.inc @@ -268,23 +271,18 @@ INSERT INTO t1 VALUES (3); --echo ==== Checks performed at server start when GTID_MODE = OFF ==== ---connection master --let $rpl_server_number= 2 --source include/rpl_stop_server.inc - ---echo ---- Fail to start with GTID_MODE = OFF and GTIDs in binlog/relay log ---- - ---let $assert_regex= Found a Gtid_log_event or Previous_gtids_log_event when GTID_MODE = OFF. ---let $assert_command= $server2_cmd 2>&1 ---source include/assert_command_output.inc ---error 0,1 ---remove_file $datadir/master.info ---error 0,1 ---remove_file $datadir/relay.info - +--echo ---- Fail to start replication with GTID_MODE = OFF and GTIDs in binlog/relay log ---- --let $rpl_server_number= 2 ---let $rpl_skip_start_slave= 1 +--let $rpl_start_with_gtids= 0 --source include/rpl_start_server.inc +--error ER_AUTO_POSITION_REQUIRES_GTID_MODE_ON +START SLAVE; +--let $rpl_server_number= 2 +--let $rpl_skip_start_slave= 1 +--let $rpl_start_with_gtids= 1 +--source include/rpl_restart_server.inc --connection slave RESET SLAVE; RESET MASTER; === modified file 'packaging/WiX/custom_ui.wxs' --- a/packaging/WiX/custom_ui.wxs 2012-03-21 06:42:54 +0000 +++ b/packaging/WiX/custom_ui.wxs 2012-04-16 09:14:37 +0000 @@ -2,7 +2,7 @@ xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">