merging fix

  `d` int(11) NOT NULL,

  PRIMARY KEY (`a`)

) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/tmp/' INDEX DIRECTORY='MYSQLTEST_VARDIR/run/'

create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="tmp";

Got one of the listed errors

create database mysqltest;

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

Got one of the listed errors

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

Got one of the listed errors

create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="MYSQLTEST_VARDIR/run";

Got one of the listed errors

create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="MYSQLTEST_VARDIR/tmp";

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

SHOW CREATE TABLE t9;

--error 1103, 1103

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

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'

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

int test_if_data_home_dir(const char *dir)

{

  char path[FN_REFLEN];

  uint dir_len;

  int dir_len;

  DBUG_ENTER("test_if_data_home_dir");

  if (!dir)