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
He Zhenxing	b1252a7ccf	Rmove RESET MASTER from have_log_bin.inc because it can cause some ... test to stall for slave_net_timeout and cause some test case fail	2008-07-28 15:15:20 +08:00
Sven Sandberg	e14d0f10c2	BUG#38127: main.mysqlbinlog_base64 fails sporadically on pushbuild ... Problem: mysqlbinlog_base64 fails because the binlog contains traces from previous test cases. Fix: Make have_log_bin reset the master's binlog.	2008-07-16 11:50:11 +02:00
Chad MILLER	43ba41548e	Bug#30563: Is not possible to create rpl_ or innodb test if needed \ ... to use ANSI_QUOTES Make all have_* tests universally safe by using ANSI quotes.	2008-07-04 12:41:27 -04:00
tomas@whalegate.ndb.mysql.com	391265636d	files to check if log bin is turned on	2007-05-14 14:38:50 +02:00