From: sasha Date: October 8 2001 7:07pm Subject: bk commit into 4.0 tree List-Archive: http://lists.mysql.com/internals/1979 Message-Id: <200110081907.f98J7qP26935@mysql.sashanet.com> Below is the list of changes that have just been committed into a 4.0 repository of sasha. When sasha does a push, they will be propogated to the main repository and within 24 hours after the push to the public repository. For information on how to access the public repository see http://www.mysql.com/doc/I/n/Installing_source_tree.html ChangeSet@stripped, 2001-10-08 13:07:50-06:00, sasha@stripped groundbreaking on fail-safe replication - added a token feature to have an excuse to have a test case. Mental trick to get things moving faster... mysql-test/r/rpl_failsafe.result 1.1 01/10/08 13:07:42 sasha@stripped +11 -0 mysql-test/t/rpl_failsafe.test 1.1 01/10/08 13:07:42 sasha@stripped +5 -0 mysql-test/r/rpl_failsafe.result 1.0 01/10/08 13:07:42 sasha@stripped +0 -0 BitKeeper file /home/sasha/src/bk/mysql-4.0/mysql-test/r/rpl_failsafe.result mysql-test/t/rpl_failsafe.test 1.0 01/10/08 13:07:42 sasha@stripped +0 -0 BitKeeper file /home/sasha/src/bk/mysql-4.0/mysql-test/t/rpl_failsafe.test mysql-test/mysql-test-run.sh 1.106 01/10/08 13:07:41 sasha@stripped +3 -3 recovery rank sql/mysqld.cc 1.230 01/10/08 13:07:41 sasha@stripped +9 -1 recovery rank # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: sasha # Host: mysql.sashanet.com # Root: /home/sasha/src/bk/mysql-4.0 --- 1.105/mysql-test/mysql-test-run.sh Thu Oct 4 15:45:18 2001 +++ 1.106/mysql-test/mysql-test-run.sh Mon Oct 8 13:07:41 2001 @@ -591,7 +591,7 @@ if [ -z "$DO_BENCH" ] then master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \ - --server-id=1 \ + --server-id=1 --rpl-recovery-rank=1 \ --basedir=$MY_BASEDIR \ --port=$MASTER_MYPORT \ --exit-info=256 \ @@ -608,7 +608,7 @@ $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT" else master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \ - --server-id=1 \ + --server-id=1 --rpl-recovery-rank=1 \ --basedir=$MY_BASEDIR \ --port=$MASTER_MYPORT \ --datadir=$MASTER_MYDDIR \ @@ -663,7 +663,7 @@ --master-host=127.0.0.1 \ --master-password= \ --master-port=$MASTER_MYPORT \ - --server-id=2" + --server-id=2 --rpl-recovery-rank=2" else master_info=$SLAVE_MASTER_INFO fi --- 1.229/sql/mysqld.cc Thu Oct 4 16:45:34 2001 +++ 1.230/sql/mysqld.cc Mon Oct 8 13:07:41 2001 @@ -330,6 +330,8 @@ const char *default_tx_isolation_name; enum_tx_isolation default_tx_isolation=ISO_READ_COMMITTED; +uint rpl_recovery_rank=0; + #ifdef HAVE_GEMINI_DB const char *gemini_recovery_options_str="FULL"; #endif @@ -2606,7 +2608,8 @@ OPT_DO_PSTACK, OPT_REPORT_HOST, OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT, OPT_SHOW_SLAVE_AUTH_INFO, OPT_OLD_RPL_COMPAT, - OPT_SLAVE_LOAD_TMPDIR, OPT_NO_MIX_TYPE + OPT_SLAVE_LOAD_TMPDIR, OPT_NO_MIX_TYPE, + OPT_RPL_RECOVERY_RANK }; static struct option long_options[] = { @@ -2731,6 +2734,7 @@ {"report-user", required_argument, 0, (int) OPT_REPORT_USER}, {"report-password", required_argument, 0, (int) OPT_REPORT_PASSWORD}, {"report-port", required_argument, 0, (int) OPT_REPORT_PORT}, + {"rpl-recovery-rank", required_argument, 0, (int) OPT_RPL_RECOVERY_RANK}, {"safe-mode", no_argument, 0, (int) OPT_SAFE}, {"safe-show-database", no_argument, 0, (int) OPT_SAFE_SHOW_DB}, {"safe-user-create", no_argument, 0, (int) OPT_SAFE_USER_CREATE}, @@ -3030,6 +3034,7 @@ {"protocol_version", (char*) &protocol_version, SHOW_INT}, {"record_buffer", (char*) &my_default_record_cache_size,SHOW_LONG}, {"record_rnd_buffer", (char*) &record_rnd_cache_size, SHOW_LONG}, + {"rpl_recovery_rank", (char*) &rpl_recovery_rank, SHOW_LONG}, {"query_buffer_size", (char*) &query_buff_size, SHOW_LONG}, {"safe_show_database", (char*) &opt_safe_show_db, SHOW_BOOL}, {"server_id", (char*) &server_id, SHOW_LONG}, @@ -3449,6 +3454,9 @@ #if !defined(DBUG_OFF) && defined(SAFEMALLOC) safemalloc_mem_limit = atoi(optarg); #endif + break; + case OPT_RPL_RECOVERY_RANK: + rpl_recovery_rank=atoi(optarg); break; case OPT_SLAVE_LOAD_TMPDIR: slave_load_tmpdir = my_strdup(optarg, MYF(MY_FAE)); --- New file --- +++ mysql-test/r/rpl_failsafe.result 01/10/08 13:07:42 slave stop; reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; slave start; show variables like 'rpl_recovery_rank'; Variable_name Value rpl_recovery_rank 1 show variables like 'rpl_recovery_rank'; Variable_name Value rpl_recovery_rank 2 --- New file --- +++ mysql-test/t/rpl_failsafe.test 01/10/08 13:07:42 source include/master-slave.inc; connection master; show variables like 'rpl_recovery_rank'; connection slave; show variables like 'rpl_recovery_rank';