bk commit into 5.1 tree (antony:1.2562)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony.  When antony does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-14 18:45:50-07:00, antony@stripped +2 -0
  fix results after merge

  mysql-test/r/partition_not_windows.result@stripped, 2008-03-14 18:45:45-07:00, antony@stripped +3 -0
    fix results from merge

  mysql-test/t/disabled.def@stripped, 2008-03-14 18:45:45-07:00, antony@stripped +1 -0
    disable test partition_symlink

diff -Nrup a/mysql-test/r/partition_not_windows.result b/mysql-test/r/partition_not_windows.result
--- a/mysql-test/r/partition_not_windows.result	2008-03-03 08:29:57 -08:00
+++ b/mysql-test/r/partition_not_windows.result	2008-03-14 18:45:45 -07:00
@@ -23,6 +23,9 @@ partition p01 values less than (1000)
 data directory='/not/existing'
   index directory='/not/existing'
 );
+Warnings:
+Warning	0	DATA DIRECTORY option ignored
+Warning	0	INDEX DIRECTORY option ignored
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2008-03-12 01:13:19 -07:00
+++ b/mysql-test/t/disabled.def	2008-03-14 18:45:45 -07:00
@@ -21,3 +21,4 @@ ctype_create         : Bug#32965 main.ct
 status               : Bug#32966 main.status fails
 ps_ddl               : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
 csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
+partition_symlink    : Make pushbuild green