mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

mysql-test fixes

Browse source
This commit is contained in:
Sergei Golubchik 2013-04-09 16:19:22 +02:00
parent ee92b2114d
commit 3a8e1a2205
7 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/lowercase_table2.result
View file

@ -272,7 +272,7 @@ Database Table In_use Name_locked
test t_bug44738_uppercase 0 0 test t_bug44738_uppercase 0 0
# So attempt to create table with the same name should fail. # So attempt to create table with the same name should fail.
create table t_bug44738_UPPERCASE (i int); 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. # And should succeed after FLUSH TABLES.
flush tables; flush tables;
create table t_bug44738_UPPERCASE (i int); create table t_bug44738_UPPERCASE (i int);

2
mysql-test/r/partition_disabled.result
View file

@ -3,7 +3,7 @@ FLUSH TABLES;
SELECT * FROM t1; SELECT * FROM t1;
ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement ERROR HY000: The MariaDB server is running with the --skip-partition option so it cannot execute this statement
TRUNCATE TABLE t1; 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; ANALYZE TABLE t1;
Table Op Msg_type Msg_text 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 test.t1 analyze Error The MariaDB server is running with the --skip-partition option so it cannot execute this statement

8
mysql-test/t/mysqld--help.test
View file

@ -24,10 +24,10 @@ perl;
# Plugins which may or may not be there: # Plugins which may or may not be there:
@plugins=qw/innodb ndb archive blackhole federated partition ndbcluster @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster
feedback debug temp-pool ssl des-key-file feedback debug temp-pool ssl des-key-file xtradb sequence
xtradb thread-concurrency super-large-pages thread-concurrency super-large-pages mutex-deadlock-detector
mutex-deadlock-detector null-audit maria aria pbxt oqgraph null-audit aria pbxt oqgraph sphinx thread-handling
sphinx thread-handling query-cache-info/; test-sql-discovery query-cache-info/;
# And substitute the content some environment variables with their # And substitute the content some environment variables with their
# names: # names:

3
mysql-test/t/sp-destruct.test
View file

@ -7,9 +7,6 @@
# In the case of trouble you might want to skip this. # 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 -- source include/not_embedded.inc
# Supress warnings written to the log file # Supress warnings written to the log file

1
storage/sequence/mysql-test/sequence/inc.opt
View file

@ -1 +1,2 @@
--plugin-load=$HA_SEQUENCE_SO --plugin-load=$HA_SEQUENCE_SO
--loose-sequence

11
storage/test_sql_discovery/mysql-test/main/r/partition_disabled.rdiff
View file

@ -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

1
storage/test_sql_discovery/mysql-test/sql_discovery/inc.opt
View file

@ -1 +1,2 @@
--plugin-load=$HA_TEST_SQL_DISCOVERY_SO --plugin-load=$HA_TEST_SQL_DISCOVERY_SO
--loose-test-sql-discovery