Post-merge fixes

5 files changed, 12 insertions, 9 deletions

diff --git a/mysql-test/r/partition_not_windows.result b/mysql-test/r/partition_not_windows.result
index 501d3a469a1..e16cd5e8845 100644
--- 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` (
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
index e95466271fd..de3a19ea102 100644
--- a/mysql-test/r/symlink.result
+++ b/mysql-test/r/symlink.result
@@ -140,16 +140,16 @@ DROP TABLE t1;
 End of 5.0 tests
 CREATE TABLE t1(a INT)
 INDEX DIRECTORY='TEST_DIR/master-data/mysql';
-ERROR HY000: Incorrect arguments to INDEX DIRECORY
+ERROR HY000: Incorrect arguments to INDEX DIRECTORY
 CREATE TABLE t1(a INT)
 DATA DIRECTORY='TEST_DIR/master-data/test';
-ERROR HY000: Incorrect arguments to DATA DIRECORY
+ERROR HY000: Incorrect arguments to DATA DIRECTORY
 CREATE TABLE t1(a INT)
 DATA DIRECTORY='TEST_DIR/master-data/';
-ERROR HY000: Incorrect arguments to DATA DIRECORY
+ERROR HY000: Incorrect arguments to DATA DIRECTORY
 CREATE TABLE t1(a INT)
 INDEX DIRECTORY='TEST_DIR/master-data';
-ERROR HY000: Incorrect arguments to INDEX DIRECORY
+ERROR HY000: Incorrect arguments to INDEX DIRECTORY
 CREATE TABLE t1(a INT)
 INDEX DIRECTORY='TEST_DIR/master-data_var';
 ERROR HY000: Can't create/write to file 'TEST_DIR/master-data_var/t1.MYI' (Errcode: 2)
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test
index 3c7c15926a4..5700e0fa422 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test
@@ -52,13 +52,13 @@ ROLLBACK;
 BEGIN;
 INSERT INTO tmyisam VALUES (5);
 INSERT INTO tmyisam VALUES (6);
---warning 1196
+#--warning 1196
 ROLLBACK;
 
 BEGIN;
 INSERT INTO tndb VALUES (7);
 INSERT INTO tmyisam VALUES (7);
---warning 1196
+#--warning 1196
 ROLLBACK;
 
 SELECT * FROM tndb ORDER BY a;
diff --git a/mysql-test/t/partition_symlink.test b/mysql-test/t/partition_symlink.test
index cf8ba2d2a5f..ea6d4f214bd 100644
--- a/mysql-test/t/partition_symlink.test
+++ b/mysql-test/t/partition_symlink.test
@@ -134,8 +134,8 @@ 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;
 
diff --git a/mysql-test/t/type_set.test b/mysql-test/t/type_set.test
index c7f8c59de28..9586c87571d 100644
--- a/mysql-test/t/type_set.test
+++ b/mysql-test/t/type_set.test
@@ -75,4 +75,4 @@ INSERT INTO t1 VALUES(9223372036854775808);
 SELECT * FROM t1;
 DROP TABLE t1;
 
---# echo End of 5.0 tests
+-- echo End of 5.0 tests