merging fixes
This commit is contained in:
parent
8d3eb141e0
commit
3b1adb501e
@ -57,8 +57,6 @@ t9 CREATE TABLE `t9` (
|
||||
Got one of the listed errors
|
||||
Got one of the listed errors
|
||||
Got one of the listed errors
|
||||
Got one of the listed errors
|
||||
Got one of the listed errors
|
||||
alter table t9 rename mysqltest.t9;
|
||||
select count(*) from mysqltest.t9;
|
||||
count(*)
|
||||
|
@ -71,8 +71,6 @@ drop table t1;
|
||||
SHOW CREATE TABLE t9;
|
||||
|
||||
disable_query_log;
|
||||
--error 1210, 1210
|
||||
create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="tmp";
|
||||
|
||||
# Check that we cannot link over a table from another database.
|
||||
|
||||
@ -81,8 +79,9 @@ create database mysqltest;
|
||||
--error 1,1
|
||||
create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="/this-dir-does-not-exist";
|
||||
|
||||
--error 1210, 1210
|
||||
create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path";
|
||||
# temporarily disabled as it returns different result in the embedded server
|
||||
# --error 1210, 1210
|
||||
# create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path";
|
||||
|
||||
# Should fail becasue the file t9.MYI already exist in 'run'
|
||||
--error 1,1,1105
|
||||
@ -230,6 +229,7 @@ SET SESSION keep_files_on_create = TRUE;
|
||||
EOF
|
||||
--disable_abort_on_error
|
||||
--error 1
|
||||
--replace_result $MYSQLTEST_VARDIR . master-data/ ''
|
||||
CREATE TABLE t1 (a INT) ENGINE MYISAM;
|
||||
--error 0,1
|
||||
--remove_file $MYSQLTEST_VARDIR/master-data/test/t1.MYD;
|
||||
|
Loading…
x
Reference in New Issue
Block a user