Commit 8b405d4f authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines 

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
parents 6216e794 5e0fd916

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;

CREATE TABLE t1(a VARCHAR(16));

INSERT INTO t1 VALUES('aaaaaaaa'),(NULL);

UPDATE t1 AS ta1, t1 AS ta2 SET ta1.a='aaaaaaaaaaaaaaaa';

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;



#