fix results after merge

532dc9a2 · antony@pcg5ppc.xiphis.org · e6b027f6 · 532dc9a2 · 532dc9a2
Commit 532dc9a2 authored Mar 14, 2008 by antony@pcg5ppc.xiphis.org
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

mysql-test/r/partition_not_windows.result mysql-test/r/partition_not_windows.result +3 -0

mysql-test/t/disabled.def mysql-test/t/disabled.def +1 -0

No files found.
--- a/mysql-test/r/partition_not_windows.result
+++ b/mysql-test/r/partition_not_windows.result
@@ -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` (

--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -21,3 +21,4 @@ ctype_create         : Bug#32965 main.ctype_create fails
 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