mysql-test fixes

7 files changed, 8 insertions, 20 deletions

diff --git a/mysql-test/r/lowercase_table2.result b/mysql-test/r/lowercase_table2.result
index c478d792e52..ac368a06bc9 100644
--- a/mysql-test/r/lowercase_table2.result
+++ b/mysql-test/r/lowercase_table2.result
@@ -272,7 +272,7 @@ Database	Table	In_use	Name_locked
 test	t_bug44738_uppercase	0	0
 # So attempt to create table with the same name should fail.
 create table t_bug44738_UPPERCASE (i int);
-ERROR HY000: Can't find file: 't_bug44738_uppercase' (errno: 2 "No such file or directory")
+ERROR HY000: Can't find file: './test/t_bug44738_uppercase.MYI' (errno: 2 "No such file or directory")
 # And should succeed after FLUSH TABLES.
 flush tables;
 create table t_bug44738_UPPERCASE (i int);
diff --git a/mysql-test/r/partition_disabled.result b/mysql-test/r/partition_disabled.result
index 2978a3b6d2e..505bec79610 100644
--- a/mysql-test/r/partition_disabled.result
+++ b/mysql-test/r/partition_disabled.result
@@ -3,7 +3,7 @@ FLUSH TABLES;
 SELECT * FROM t1;
 ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement
 TRUNCATE TABLE t1;
-ERROR 42S02: Table 'test.t1' doesn't exist
+ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement
 ANALYZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	Error	The MariaDB server is running with the --skip-partition option so it cannot execute this statement
diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/t/mysqld--help.test
index 84d1fe85ec8..33bb50537ca 100644
--- a/mysql-test/t/mysqld--help.test
+++ b/mysql-test/t/mysqld--help.test
@@ -24,10 +24,10 @@ perl;
 
   # Plugins which may or may not be there:
   @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster
-              feedback debug temp-pool ssl des-key-file
-              xtradb thread-concurrency super-large-pages
-              mutex-deadlock-detector null-audit maria aria pbxt oqgraph
-              sphinx thread-handling query-cache-info/;
+              feedback debug temp-pool ssl des-key-file xtradb sequence
+              thread-concurrency super-large-pages mutex-deadlock-detector
+              null-audit aria pbxt oqgraph sphinx thread-handling
+              test-sql-discovery query-cache-info/;
 
   # And substitute the content some environment variables with their
   # names:
diff --git a/mysql-test/t/sp-destruct.test b/mysql-test/t/sp-destruct.test
index 75eeda8e289..f5d1dd57dfb 100644
--- a/mysql-test/t/sp-destruct.test
+++ b/mysql-test/t/sp-destruct.test
@@ -7,9 +7,6 @@
 # In the case of trouble you might want to skip this.
 #
 
-# embedded server returns different paths in error messages
-# in lines like 'call bug14233();'
-# mysqltest should be fixed to allow REPLACE_RESULT in error message
 -- source include/not_embedded.inc
 
 # Supress warnings written to the log file
diff --git a/storage/sequence/mysql-test/sequence/inc.opt b/storage/sequence/mysql-test/sequence/inc.opt
index ad178af67c2..5b96925ff59 100644
--- a/storage/sequence/mysql-test/sequence/inc.opt
+++ b/storage/sequence/mysql-test/sequence/inc.opt
@@ -1 +1,2 @@
 --plugin-load=$HA_SEQUENCE_SO
+--loose-sequence
diff --git a/storage/test_sql_discovery/mysql-test/main/r/partition_disabled.rdiff b/storage/test_sql_discovery/mysql-test/main/r/partition_disabled.rdiff
deleted file mode 100644
index 3bb52b39d29..00000000000
--- a/storage/test_sql_discovery/mysql-test/main/r/partition_disabled.rdiff
+++ /dev/null
@@ -1,11 +0,0 @@
---- r/partition_disabled.result	2013-04-07 12:36:57.000000000 +0200
-+++ /usr/home/serg/Abk/mysql/10.0-serg/storage/test_sql_discovery/mysql-test/main/r/partition_disabled.reject	2013-04-07 23:19:14.000000000 +0200
-@@ -3,7 +3,7 @@
- SELECT * FROM t1;
- ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement
- TRUNCATE TABLE t1;
--ERROR 42S02: Table 'test.t1' doesn't exist
-+ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement
- ANALYZE TABLE t1;
- Table	Op	Msg_type	Msg_text
- test.t1	analyze	Error	The MariaDB server is running with the --skip-partition option so it cannot execute this statement
diff --git a/storage/test_sql_discovery/mysql-test/sql_discovery/inc.opt b/storage/test_sql_discovery/mysql-test/sql_discovery/inc.opt
index 32a5e3a294e..7d5c2404a50 100644
--- a/storage/test_sql_discovery/mysql-test/sql_discovery/inc.opt
+++ b/storage/test_sql_discovery/mysql-test/sql_discovery/inc.opt
@@ -1 +1,2 @@
 --plugin-load=$HA_TEST_SQL_DISCOVERY_SO
+--loose-test-sql-discovery