Commit b02748fd authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 

into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1


mysql-test/r/func_time.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/lock_multi.result:
  manual merge
mysql-test/t/lock_multi.test:
  manual merge
sql/ha_innodb.cc:
  manual merge
parents 2deb5a61 783866ff

mysql-test/r/func_in.result

+0 −29
Original line number Diff line number Diff line
@@ -202,35 +202,6 @@ select count(*) from t1 where id not in (1,2); 
count(*)

1

drop table t1;

create table t1 (f1 char(1), f2 int);

insert into t1 values (1,0),('a',1),('z',2);

select f1 from t1 where f1 in (1,'z');

f1

1

z

select f2 from t1 where f2 in (1,'z');

f2

0

1

Warnings:

Warning	1292	Truncated incorrect INTEGER value: 'z'

select f1 from t1 where 'z' in (1,f1);

f1

z

select * from t1 where 'z' in (f2,f1);

f1	f2

1	0

a	1

z	2

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'z'

Warning	1292	Truncated incorrect DOUBLE value: 'z'

Warning	1292	Truncated incorrect DOUBLE value: 'z'

select * from t1 where 1 in (f2,f1);

f1	f2

1	0

a	1

drop table t1;

CREATE TABLE t1 (a int PRIMARY KEY);

INSERT INTO t1 VALUES (44), (45), (46);

SELECT * FROM t1 WHERE a IN (45);

mysql-test/r/func_time.result

+2 −2
Original line number Diff line number Diff line
@@ -785,8 +785,8 @@ select f1 from t1 where "2006-1-1" between f1 and 'zzz'; 
f1

Warnings:

Warning	1292	Incorrect date value: 'zzz' for column 'f1' at row 1

Warning	1292	Truncated incorrect INTEGER value: 'zzz'

Warning	1292	Truncated incorrect INTEGER value: 'zzz'

Warning	1292	Truncated incorrect DOUBLE value: 'zzz'

Warning	1292	Truncated incorrect DOUBLE value: 'zzz'

select f1 from t1 where makedate(2006,1) between date(f1) and date(f3);

f1

2006-01-01

mysql-test/r/lock_multi.result

+6 −0
Original line number Diff line number Diff line
@@ -74,3 +74,9 @@ 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

create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb;

lock tables t1 write;

 alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //

 alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //

unlock tables;

drop table t1;

mysql-test/t/func_in.test

+0 −12
Original line number Diff line number Diff line
@@ -109,18 +109,6 @@ select count(*) from t1 where id not in (1); 
select count(*) from t1 where id not in (1,2);

drop table t1;



#

# Bug#18360 Incorrect type coercion in IN() results in false comparison

#

create table t1 (f1 char(1), f2 int);

insert into t1 values (1,0),('a',1),('z',2);

select f1 from t1 where f1 in (1,'z');

select f2 from t1 where f2 in (1,'z');

select f1 from t1 where 'z' in (1,f1);

select * from t1 where 'z' in (f2,f1);

select * from t1 where 1 in (f2,f1);

drop table t1;



# End of 4.1 tests



#

mysql-test/t/lock_multi.test

+55 −0
Original line number Diff line number Diff line
@@ -191,4 +191,59 @@ disconnect con2; 
--error ER_DB_DROP_EXISTS

DROP DATABASE mysqltest_1;



#

# Bug #17264: MySQL Server freeze

#

connection locker;

create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb;

lock tables t1 write;

connection writer;

--sleep 2

delimiter //;

send alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //

delimiter ;//

connection reader;

--sleep 2

delimiter //;

send alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //

delimiter ;//

connection locker;

--sleep 2

unlock tables;

connection writer;

reap;

connection reader;

reap;

connection locker;

drop table t1;



# End of 5.0 tests

# Bug#16986 - Deadlock condition with MyISAM tables

#

connection locker;

use mysql;

LOCK TABLES columns_priv WRITE, db WRITE, host WRITE, user WRITE;

FLUSH TABLES;

--sleep 1

#

connection reader;

use mysql;

#NOTE:  This must be a multi-table select, otherwise the deadlock will not occur

send SELECT user.Select_priv FROM user, db WHERE user.user = db.user LIMIT 1;

--sleep 1

#

connection locker;

# Make test case independent from earlier grants.

--replace_result "Table is already up to date" "OK"

OPTIMIZE TABLES columns_priv, db, host, user;

UNLOCK TABLES;

#

connection reader;

reap;

use test;

#

connection locker;

use test;

#

connection default;