merging fix
This commit is contained in:
commit
5b68e3dc30
@ -55,13 +55,9 @@ t9 CREATE TABLE `t9` (
|
|||||||
`d` int(11) NOT NULL,
|
`d` int(11) NOT NULL,
|
||||||
PRIMARY KEY (`a`)
|
PRIMARY KEY (`a`)
|
||||||
) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/tmp/' INDEX DIRECTORY='MYSQLTEST_VARDIR/run/'
|
) 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 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";
|
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
|
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";
|
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
|
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";
|
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";
|
||||||
|
@ -65,8 +65,6 @@ drop table t1;
|
|||||||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
SHOW CREATE TABLE t9;
|
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.
|
# Check that we cannot link over a table from another database.
|
||||||
|
|
||||||
@ -75,8 +73,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 1103, 1103
|
# 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'
|
||||||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||||
|
@ -7418,7 +7418,7 @@ C_MODE_START
|
|||||||
int test_if_data_home_dir(const char *dir)
|
int test_if_data_home_dir(const char *dir)
|
||||||
{
|
{
|
||||||
char path[FN_REFLEN];
|
char path[FN_REFLEN];
|
||||||
uint dir_len;
|
int dir_len;
|
||||||
DBUG_ENTER("test_if_data_home_dir");
|
DBUG_ENTER("test_if_data_home_dir");
|
||||||
|
|
||||||
if (!dir)
|
if (!dir)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user