Commit 1db55868 authored by unknown's avatar unknown
Browse files

Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498 

into  kpdesk.mysql.com:/home/thek/dev/bug17489/my51-bug17498


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
parents ac603979 e9133433

mysql-test/r/myisam.result

+0 −13
Original line number Diff line number Diff line
@@ -1590,19 +1590,6 @@ show keys from t1; 
Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	1	a	1	a	A	8	NULL	NULL	YES	BTREE	

drop table t1;

show create table t1;

show create table t1;

create table t1 (a int) engine=myisam select 42 a;

select * from t1;

a

9

select * from t1;

a

99

select * from t1;

a

42

drop table t1;

End of 4.1 tests

create table t1 (c1 int) engine=myisam pack_keys=0;

create table t2 (c1 int) engine=myisam pack_keys=1;

mysql-test/r/symlink.result

+21 −0
Original line number Diff line number Diff line
@@ -111,3 +111,24 @@ t1 CREATE TABLE `t1` ( 
  `i` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

create table t1 (a int) engine=myisam select 42 a;

select * from t1;

a

9

select * from t1;

a

99

select * from t1;

a

42

drop table t1;

mysql-test/t/myisam.test

+0 −34
Original line number Diff line number Diff line
@@ -941,40 +941,6 @@ alter table t1 disable keys; 
alter table t1 enable keys;

show keys from t1;



drop table t1;

#

# Bug#8706 - temporary table with data directory option fails

#

connect (session1,localhost,root,,);

connect (session2,localhost,root,,);



connection session1;

disable_query_log;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQLTEST_VARDIR/tmp" select 9 a;

enable_query_log;

disable_result_log;

show create table t1;

enable_result_log;



connection session2;

disable_query_log;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQLTEST_VARDIR/tmp" select 99 a;

enable_query_log;

disable_result_log;

show create table t1;

enable_result_log;



connection default;

create table t1 (a int) engine=myisam select 42 a;



connection session1;

select * from t1;

disconnect session1;

connection session2;

select * from t1;

disconnect session2;

connection default;

select * from t1;

drop table t1;



--echo End of 4.1 tests

mysql-test/t/symlink.test

+37 −0
Original line number Diff line number Diff line
@@ -139,4 +139,41 @@ enable_query_log; 
show create table t1;

drop table t1;



#

# Bug#8706 - temporary table with data directory option fails

#

connect (session1,localhost,root,,);

connect (session2,localhost,root,,);



connection session1;

disable_query_log;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/log" select 9 a;

enable_query_log;

# If running test suite with a non standard tmp dir, the "show create table"

# will print "DATA_DIRECTORY=". Use replace_result to mask it out

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

show create table t1;



connection session2;

disable_query_log;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/log" select 99 a;

enable_query_log;

# If running test suite with a non standard tmp dir, the "show create table"

# will print "DATA_DIRECTORY=". Use replace_result to mask it out

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

show create table t1;



connection default;

create table t1 (a int) engine=myisam select 42 a;



connection session1;

select * from t1;

disconnect session1;

connection session2;

select * from t1;

disconnect session2;

connection default;

select * from t1;

drop table t1;



# End of 4.1 tests