Commit 4121c1ca authored by unknown's avatar unknown
Browse files

Merge xiphis.org:/anubis/bk/mysql-5.0 

into  xiphis.org:/home/antony/work2/p4-bug12096.1
parents 74183117 4f8407b6

heap/hp_create.c

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
          if (!my_binary_compare(keyinfo->seg[j].charset))

            keyinfo->flag|= HA_END_SPACE_KEY;

          keyinfo->flag|= HA_VAR_LENGTH_KEY;

          length+= 2;

          /* Save number of bytes used to store length */

          keyinfo->seg[j].bit_start= 1;

          break;
@@ -95,6 +96,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
          if (!my_binary_compare(keyinfo->seg[j].charset))

            keyinfo->flag|= HA_END_SPACE_KEY;

          keyinfo->flag|= HA_VAR_LENGTH_KEY;

          length+= 2;

          /* Save number of bytes used to store length */

          keyinfo->seg[j].bit_start= 2;

          /*

mysql-test/r/heap.result

+13 −0
Original line number Diff line number Diff line
@@ -718,3 +718,16 @@ Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length I 
t1	MEMORY	10	Fixed	0	11	0	#	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t2	MEMORY	10	Fixed	0	12	0	#	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

drop table t1, t2;

CREATE TABLE t1(a VARCHAR(1), b VARCHAR(2), c VARCHAR(256),

KEY(a), KEY(b), KEY(c)) ENGINE=MEMORY;

INSERT INTO t1 VALUES('a','aa',REPEAT('a', 256)),('a','aa',REPEAT('a',256));

SELECT COUNT(*) FROM t1 WHERE a='a';

COUNT(*)

2

SELECT COUNT(*) FROM t1 WHERE b='aa';

COUNT(*)

2

SELECT COUNT(*) FROM t1 WHERE c=REPEAT('a',256);

COUNT(*)

2

DROP TABLE t1;

mysql-test/r/lock_multi.result

+8 −0
Original line number Diff line number Diff line
@@ -43,3 +43,11 @@ Field Type Null Key Default Extra 
a	int(11)	YES		NULL	

unlock tables;

drop table t1;

CREATE DATABASE mysqltest_1;

FLUSH TABLES WITH READ LOCK;

 DROP DATABASE mysqltest_1;

DROP DATABASE mysqltest_1;

ERROR HY000: Can't execute the query because you have a conflicting read lock

UNLOCK TABLES;

DROP DATABASE mysqltest_1;

ERROR HY000: Can't drop database 'mysqltest_1'; database doesn't exist

mysql-test/t/heap.test

+12 −0
Original line number Diff line number Diff line
@@ -458,4 +458,16 @@ create table t2 (c varchar(10)) engine=memory; 
show table status like 't_';

drop table t1, t2;



#

# BUG#18233 - Memory tables INDEX USING HASH (a,b) returns 1 row on

#             SELECT WHERE a= AND b=

#

CREATE TABLE t1(a VARCHAR(1), b VARCHAR(2), c VARCHAR(256),

                KEY(a), KEY(b), KEY(c)) ENGINE=MEMORY;

INSERT INTO t1 VALUES('a','aa',REPEAT('a', 256)),('a','aa',REPEAT('a',256));

SELECT COUNT(*) FROM t1 WHERE a='a';

SELECT COUNT(*) FROM t1 WHERE b='aa';

SELECT COUNT(*) FROM t1 WHERE c=REPEAT('a',256);

DROP TABLE t1;



# End of 5.0 tests

mysql-test/t/lock_multi.test

+35 −0
Original line number Diff line number Diff line
@@ -107,3 +107,38 @@ show columns from t1; 
connection locker;

unlock tables;

drop table t1;



#

# Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock

#

connect (con1,localhost,root,,);

connect (con2,localhost,root,,);

#

connection con1;

CREATE DATABASE mysqltest_1;

FLUSH TABLES WITH READ LOCK;

#

# With bug in place: acquire LOCK_mysql_create_table and

# wait in wait_if_global_read_lock().

connection con2;

send DROP DATABASE mysqltest_1;

--sleep 1

#

# With bug in place: try to acquire LOCK_mysql_create_table...

# When fixed: Reject dropping db because of the read lock.

connection con1;

--error ER_CANT_UPDATE_WITH_READLOCK

DROP DATABASE mysqltest_1;

UNLOCK TABLES;

#

connection con2;

reap;

#

connection default;

disconnect con1;

disconnect con2;

# This must have been dropped by connection 2 already,

# which waited until the global read lock was released.

--error ER_DB_DROP_EXISTS

DROP DATABASE mysqltest_1;