4 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	58cb8cbeb4	Bug #34647 rpl_temporary discovers more than one dump thread and fails to select ... Many dump threads can exist due to a way the new version of mtr governs suites. For this immediate problem the test is refined not to use I_S but rather to reconnect explicitly with preserving logics of a an old target bug fixes verification.	2008-07-18 11:20:55 +03:00
msvensson@pilot.mysql.com	6f2e5dbf5a	Add supression for expected warning(s) in slaves error log	2008-04-27 16:13:08 +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_temporary.result (Browse further)