1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/space/my/mysql-4.0

Browse Source 
into mysql.com:/space/my/mysql-4.0-build
This commit is contained in:
unknown 2003-11-24 16:02:18 +01:00
commit cbf2558b30
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/rpl_change_master.result
View File

@ -8,7 +8,7 @@ select get_lock("a",5);
get_lock("a",5) get_lock("a",5)
1 1
create table t1(n int); create table t1(n int);
insert into t1 values(1+get_lock("a",10)*0); insert into t1 values(1+get_lock("a",15)*0);
insert into t1 values(2); insert into t1 values(2);
stop slave; stop slave;
select * from t1; select * from t1;
@ -16,11 +16,11 @@ n
1 1
show slave status; show slave status;
Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root 9306 1 master-bin.001 273 slave-relay-bin.002 255 master-bin.001 No No 0 0 214 314 127.0.0.1 root MASTER_MYPORT 1 master-bin.001 273 slave-relay-bin.002 255 master-bin.001 No No 0 0 214 314
change master to master_user='root'; change master to master_user='root';
show slave status; show slave status;
Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root 9306 1 master-bin.001 214 slave-relay-bin.001 4 master-bin.001 No No 0 0 214 4 127.0.0.1 root MASTER_MYPORT 1 master-bin.001 214 slave-relay-bin.001 4 master-bin.001 No No 0 0 214 4
select release_lock("a"); select release_lock("a");
release_lock("a") release_lock("a")
1 1

6
mysql-test/t/rpl_change_master.test
View File

@ -4,15 +4,17 @@ connection slave;
select get_lock("a",5); select get_lock("a",5);
connection master; connection master;
create table t1(n int); create table t1(n int);
insert into t1 values(1+get_lock("a",10)*0); insert into t1 values(1+get_lock("a",15)*0);
insert into t1 values(2); insert into t1 values(2);
save_master_pos; save_master_pos;
connection slave; connection slave;
sleep 3; # can't sync_with_master as we should be blocked --real_sleep 3; # can't sync_with_master as we should be blocked
stop slave; stop slave;
select * from t1; select * from t1;
--replace_result $MASTER_MYPORT MASTER_MYPORT
show slave status; show slave status;
change master to master_user='root'; change master to master_user='root';
--replace_result $MASTER_MYPORT MASTER_MYPORT
show slave status; show slave status;
# Will restart from after the values(2), which is bug # Will restart from after the values(2), which is bug
select release_lock("a"); select release_lock("a");

2
mysys/my_getopt.c
View File

@ -316,8 +316,6 @@ int handle_options(int *argc, char ***argv,
else /* If argument differs from 0, enable option, else disable */ else /* If argument differs from 0, enable option, else disable */
*((my_bool*) optp->value)= (my_bool) atoi(optend) != 0; *((my_bool*) optp->value)= (my_bool) atoi(optend) != 0;
} }
(*argc)--;
continue;
} }
else if (optp->arg_type == REQUIRED_ARG && !optend) else if (optp->arg_type == REQUIRED_ARG && !optend)
{ {