diff options
| author | unknown <monty@mysql.com> | 2003-11-22 03:21:40 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-11-22 03:21:40 +0200 |
| commit | bab6d9f74ba495e333a334e03f3ae509361dada5 (patch) | |
| tree | f843dfed18127f94f90e6cffa6456e545f7b6b57 /mysql-test/t/rpl_change_master.test | |
| parent | 52521cc8c76f99d2046a72a09440e616797e672a (diff) | |
| download | mariadb-git-bab6d9f74ba495e333a334e03f3ae509361dada5.tar.gz | |
Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
Updated project files for windows
Made rpl_change_master.test portable
Ensure that mutex are not freed if not initilized
VC++Files/client/mysql.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/comp_err/comp_err.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/innobase/innobase.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/libmysqld/libmysqld.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/myisamchk/myisamchk.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/myisamlog/myisamlog.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/myisampack/myisampack.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/mysqlmanager/MySqlManager.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/mysys/mysys.dsp:
Updated project files for windows according to suggestions from Intel
libmysql/libmysql.c:
Removed not used include files (which caused problems on Win64)
mysql-test/r/rpl_change_master.result:
Made test portable
mysql-test/t/rpl_change_master.test:
Made test portable
sql-common/client.c:
Removed not used include files (which caused problems on Win64)
sql/ha_innodb.cc:
Ensure that mutex is not freed if not initilized
sql/hostname.cc:
Ensure that mutex is not freed if not initilized
sql/slave.cc:
Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
Diffstat (limited to 'mysql-test/t/rpl_change_master.test')
| -rw-r--r-- | mysql-test/t/rpl_change_master.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/rpl_change_master.test b/mysql-test/t/rpl_change_master.test index 33fc2d75dd3..94f044d5413 100644 --- a/mysql-test/t/rpl_change_master.test +++ b/mysql-test/t/rpl_change_master.test @@ -11,9 +11,11 @@ connection slave; sleep 3; # can't sync_with_master as we should be blocked stop slave; select * from t1; +--replace_result $MASTER_MYPORT MASTER_MYPORT --replace_column 1 # 33 # show slave status; change master to master_user='root'; +--replace_result $MASTER_MYPORT MASTER_MYPORT --replace_column 1 # 33 # show slave status; # Will restart from after the values(2), which is bug |