6 commits

Author	SHA1	Message	Date
guilhem@mysql.com	9620715679	a code fix (don't specify default value of argument twice), updating a line of SHOW SLAVE STATUS ... in tests after the last 4.1->5.0 merge, and: *** The same as ChangeSet@1.1822.1.1, 2004-05-14 23:08:03+02:00, guilhem@mysql.com of MySQL 4.0 *** Replication testsuite: making the master-slave synchronization less likely to fail, by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL in sync_with_master and sync_slave_with_master. The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test, but may affect 4.x as well, so I fixed 4.x too. Note that I am also fixing 5.0, with the same exact patch, because I don't want to leave 5.0 broken until the next 4.0->4.1->5.0 merge.	2004-05-14 23:19:42 +02:00
monty@mysql.com	28673669a4	Merge with 4.0 to get security patch for check_grant_colum	2004-05-06 13:42:26 +03:00
guilhem@mysql.com	cd18476e34	Replication: ... as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).	2004-05-05 22:01:41 +02:00
guilhem@mysql.com	d20230bcbe	very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err, ... and a comment update	2004-05-05 21:50:51 +02:00
guilhem@mysql.com	eff7b259e3	Very small fixes for testsuite (a real_sleep instead of sleep, plus TCP port independency of the result file).	2004-04-28 23:43:46 +02:00
guilhem@mysql.com	3fc39188ec	A new option --replicate-same-server-id to force a slave to execute queries originating from itself ... (WL#794). This can be of interest in some recovery-from-backup scenarios, and also when you have two databases in one mysqld, having a certain similarity and you want one db to be updated when the other is (some sort of trigger). Plus small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT"	2004-04-28 18:24:46 +02:00