1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merging fixes

Browse Source
This commit is contained in:
Alexey Botchkov 2008-08-26 14:21:07 +05:00
parent 8d3eb141e0
commit 3b1adb501e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/symlink.result
View File

@ -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 Got one of the listed errors
Got one of the listed errors
Got one of the listed errors
alter table t9 rename mysqltest.t9; alter table t9 rename mysqltest.t9;
select count(*) from mysqltest.t9; select count(*) from mysqltest.t9;
count(*) count(*)

8
mysql-test/t/symlink.test
View File

@ -71,8 +71,6 @@ drop table t1;
SHOW CREATE TABLE t9; SHOW CREATE TABLE t9;
disable_query_log; 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. # Check that we cannot link over a table from another database.
@ -81,8 +79,9 @@ create database mysqltest;
--error 1,1 --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"; 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 # temporarily disabled as it returns different result in the embedded server
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"; # --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' # Should fail becasue the file t9.MYI already exist in 'run'
--error 1,1,1105 --error 1,1,1105
@ -230,6 +229,7 @@ SET SESSION keep_files_on_create = TRUE;
EOF EOF
--disable_abort_on_error --disable_abort_on_error
--error 1 --error 1
--replace_result $MYSQLTEST_VARDIR . master-data/ ''
CREATE TABLE t1 (a INT) ENGINE MYISAM; CREATE TABLE t1 (a INT) ENGINE MYISAM;
--error 0,1 --error 0,1
--remove_file $MYSQLTEST_VARDIR/master-data/test/t1.MYD; --remove_file $MYSQLTEST_VARDIR/master-data/test/t1.MYD;