merging fixes

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(*)

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.

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

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;