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
..
ndb_dd_backuprestore.result	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
part_blocked_sql_func_innodb.result	Fixes for the following bugs:	2007-08-27 14:08:32 -06:00
part_blocked_sql_func_myisam.result	Fixes for the following bugs:	2007-08-27 14:08:32 -06:00
part_supported_sql_func_innodb.result	- Add autodetection of which my.cnfs to use for each testcase if suite does	2008-01-10 16:50:37 +01:00
part_supported_sql_func_myisam.result	- Add autodetection of which my.cnfs to use for each testcase if suite does	2008-01-10 16:50:37 +01:00
part_supported_sql_func_ndb.result	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_alter1_1_2_innodb.result	Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam	2008-05-16 19:03:50 +03:00
partition_alter1_1_2_myisam.result	Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'	2008-07-09 13:19:04 +02:00
partition_alter1_1_2_ndb.result	Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam	2008-05-16 19:03:50 +03:00
partition_alter1_1_innodb.result	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_alter1_1_myisam.result	merge	2008-07-09 15:15:11 +02:00
partition_alter1_1_ndb.result	Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam	2008-05-16 19:03:50 +03:00
partition_alter1_2_innodb.result	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_alter1_2_myisam.result	merge	2008-07-09 15:15:11 +02:00
partition_alter1_2_ndb.result	Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam	2008-05-16 19:03:50 +03:00
partition_alter2_innodb.result	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_alter2_myisam.result	merge	2008-07-09 15:15:11 +02:00
partition_alter3_innodb.result	merge	2008-07-09 15:15:11 +02:00
partition_alter3_myisam.result	merge	2008-07-09 15:15:11 +02:00
partition_alter4_innodb.result	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_alter4_myisam.result	- Add autodetection of which my.cnfs to use for each testcase if suite does	2008-01-10 16:50:37 +01:00
partition_basic_innodb.result	Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'	2008-07-09 13:19:04 +02:00
partition_basic_myisam.result	Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'	2008-07-09 13:19:04 +02:00
partition_basic_symlink_innodb.result	Bug#35306: partition_basic_symlink test failures	2008-03-17 16:18:02 +01:00
partition_basic_symlink_myisam.result	Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'	2008-07-09 13:19:04 +02:00
partition_bit_innodb.result	Bug#34225: suite/parts test failure	2008-02-07 16:26:22 +01:00
partition_bit_myisam.result	Bug#34225: suite/parts test failure	2008-02-07 16:26:22 +01:00
partition_bit_ndb.result	shorten filenames	2007-04-30 16:24:13 +02:00
partition_char_innodb.result	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_char_myisam.result	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_datetime_innodb.result	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_datetime_myisam.result	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_decimal_innodb.result	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_decimal_myisam.result	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_engine_innodb.result	Post push fix	2008-02-25 21:18:50 +01:00
partition_engine_myisam.result	Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'	2008-07-09 13:19:04 +02:00
partition_engine_ndb.result	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_float_innodb.result	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_float_myisam.result	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_int_innodb.result	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_int_myisam.result	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_int_ndb.result	Bug#36732: many disabled ndb tests in test suite parts	2008-07-01 20:38:15 +02:00
partition_special_innodb.result	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_special_myisam.result	Bug#34225: test suit parts uses /tmp-dir	2008-02-06 15:13:56 +01:00
partition_syntax_innodb.result	Fixes for the bugs	2007-11-20 16:04:07 +01:00
partition_syntax_myisam.result	Bug#35736 Test 'parts.partition_basic_symlink_myisam' depends on output of 'ls'	2008-07-09 13:19:04 +02:00
partition_syntax_ndb.result	shorten filenames	2007-04-30 16:24:13 +02:00
partition_t55.out	- Add autodetection of which my.cnfs to use for each testcase if suite does	2008-01-10 16:50:37 +01:00
partition_value_innodb.result	shorten filenames	2007-04-30 16:24:13 +02:00
partition_value_myisam.result	shorten filenames	2007-04-30 16:24:13 +02:00
partition_value_ndb.result	shorten filenames	2007-04-30 16:24:13 +02:00
rpl_partition.result	additional after merge fix	2007-12-13 21:34:05 +04:00