From 166357b552fe777bc509ffcaeafeeeb5f0e3deed Mon Sep 17 00:00:00 2001
From: unknown <mattiasj@witty.>
Date: Mon, 17 Mar 2008 16:11:26 +0100
Subject: Bug#35305: partition_symlink test failures

Updated the test due to bug 32167

Corrected spelling of error message


mysql-test/r/partition_not_windows.result:
  Updated test result due to test case changes and corrected spelling error
mysql-test/r/partition_symlink.result:
  Bug#35305: partition_symlink test failure

  Updated test result due to test case changes
mysql-test/r/symlink.result:
  Updated test result due to test case changes and corrected spelling error
mysql-test/t/disabled.def:
  Bug#35305: partition_symlink test failure

  Enable the test after it has been fixed
mysql-test/t/partition_not_windows.test:
  Removed disable/enable_query_log for better result files
mysql-test/t/partition_symlink.test:
  Bug#35305: partition_symlink test failure

  Changes due to bug 32167
mysql-test/t/symlink.test:
  using replace_result instead of disable_query_log
sql/partition_info.cc:
  corrected spelling
sql/sql_parse.cc:
  corrected spelling
---
 mysql-test/t/partition_symlink.test | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'mysql-test/t/partition_symlink.test')

diff --git a/mysql-test/t/partition_symlink.test b/mysql-test/t/partition_symlink.test
index dcb725b1cb6..e36e335c0dd 100644
--- a/mysql-test/t/partition_symlink.test
+++ b/mysql-test/t/partition_symlink.test
@@ -27,9 +27,6 @@ DROP DATABASE IF EXISTS mysqltest2;
 # directory or file that the mysqld-process can use, via DATA/INDEX DIR)
 # this is the security flaw that was used in bug#32091 and bug#32111
 
-#--exec mkdir $MYSQLTEST_VARDIR/tmp/test || true
-#--exec mkdir $MYSQLTEST_VARDIR/tmp/mysqltest2 || true
-
 -- echo # Creating two non colliding tables mysqltest2.t1 and test.t1
 -- echo # test.t1 have partitions in mysqltest2-directory!
 -- echo # user root:
@@ -125,22 +122,18 @@ connection default;
   DROP USER mysqltest_1@localhost;
   disconnect con1;
 
-#--exec rmdir $MYSQLTEST_VARDIR/tmp/test || true
-#--exec rmdir $MYSQLTEST_VARDIR/tmp/mysqltest2 || true
-
 #
 # Bug #24633 SQL MODE "NO_DIR_IN_CREATE" does not work with partitioned tables 
 #
 
-disable_query_log;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR 
 eval create table t2 (i int )
 partition by range (i)
 (
     partition p01 values less than (1000)
-    data directory="$MYSQLTEST_VARDIR/master-data/test/"
-    index directory="$MYSQLTEST_VARDIR/master-data/test/"
+    data directory="$MYSQLTEST_VARDIR/tmp"
+    index directory="$MYSQLTEST_VARDIR/tmp"
 );
-enable_query_log;
 
 set @org_mode=@@sql_mode;
 set @@sql_mode='NO_DIR_IN_CREATE';
@@ -153,6 +146,7 @@ partition by range (i)
     index directory='/not/existing'
 );
 
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR 
 show create table t2;
 DROP TABLE t1, t2;
 set @@sql_mode=@org_mode;
-- 
cgit v1.2.1