5 commits

Author	SHA1	Message	Date
Sven Sandberg	73e253370b	merged 5.1 main to 5.1-rpl ... manually resolved conflicts: Text conflict in client/mysqltest.c Contents conflict in mysql-test/include/have_bug25714.inc Text conflict in mysql-test/include/have_ndbapi_examples.inc Text conflict in mysql-test/mysql-test-run.pl Text conflict in mysql-test/suite/parts/inc/partition_check_drop.inc Text conflict in mysql-test/suite/parts/inc/partition_layout.inc Text conflict in mysql-test/suite/parts/inc/partition_layout_check1.inc Text conflict in mysql-test/suite/parts/inc/partition_layout_check2.inc Text conflict in mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter1_1_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter1_2_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter2_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter3_innodb.result Text conflict in mysql-test/suite/parts/r/partition_alter3_myisam.result Text conflict in mysql-test/suite/parts/r/partition_basic_innodb.result Text conflict in mysql-test/suite/parts/r/partition_basic_myisam.result Text conflict in mysql-test/suite/parts/r/partition_basic_symlink_myisam.result Text conflict in mysql-test/suite/parts/r/partition_engine_myisam.result Text conflict in mysql-test/suite/parts/r/partition_syntax_myisam.result Text conflict in mysql-test/suite/rpl_ndb/t/disabled.def Text conflict in mysql-test/t/disabled.def	2008-08-04 07:04:47 +02:00
Andrei Elkin	a5d1e6101e	Bug #36818 rpl_server_id1 fails expecting slave has stopped ... the reason for the failure is that io thread passes through a sequence of state changes before it eventually got stuck at the expect running state as NO. It's unreasonble to wait for the running status while the whole idea of the test is to get to the IO thread error. Fixed with changing the waiting condition.	2008-07-18 14:53:16 +03:00
aelkin/andrei@mysql1000.(none)	7e93d94ce5	Bug #31316 Report server id clashes in SHOW SLAVE STATUS ... "Server_IO_State" field Critical error messages from get_master_version_and_clock() were written only to the slave errorlog while Show slave status did not display any incident happened. Although the artifact was reported for a particular --replicate-same-server-id related issue the fix refines all critical error reporting with deploying rli->report(). The test for the bug covers only --replicate-same-server-id error reporting.	2008-02-20 23:18:01 +02:00
msvensson@pilot.(none)	2238ef2b62	Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 ... into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint	2007-06-27 14:29:10 +02:00
msvensson@pilot.(none)	8661497e9b	WL#3933 Split main test suite to rpl, rpl_ndb and ndb ... - Update mysql-test-run.pl to collect tests from several suites - Group test into suites - Add suite.opt file	2007-06-27 14:28:02 +02:00

Renamed from mysql-test/r/rpl_server_id1.result (Browse further)