Commit 7989c712 authored by kostja@bodhi.(none)'s avatar kostja@bodhi.(none)
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
parents c04ae188 1ecb226e

mysql-test/r/information_schema.result

+6 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,7 @@ c int(11) YES NULL 
drop view v1;

drop table t1;

alter database information_schema;

ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

drop database information_schema;

ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

drop table information_schema.tables;
@@ -1326,3 +1326,8 @@ v2 YES 
delete from v1;

drop view v1,v2;

drop table t1,t2;

alter database;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

alter database test;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

End of 5.0 tests.

mysql-test/r/innodb_mysql.result

+4 −0
Original line number Diff line number Diff line
@@ -735,4 +735,8 @@ COUNT(*) 
3072

set @@sort_buffer_size=default;

DROP TABLE t1,t2;

drop table if exists t1;

create table t1 (a int) engine=innodb;

alter table t1 alter a set default 1;

drop table t1;

End of 5.0 tests

mysql-test/r/query_cache.result

+39 −0
Original line number Diff line number Diff line
@@ -1467,3 +1467,42 @@ insert into t1 values ('c'); 
a

drop table t1;

set GLOBAL query_cache_size= default;

Bug#28249 Query Cache returns wrong result with concurrent insert/ certain lock

set GLOBAL query_cache_type=1;

set GLOBAL query_cache_limit=10000;

set GLOBAL query_cache_min_res_unit=0;

set GLOBAL query_cache_size= 100000;

flush tables;

drop table if exists t1, t2;

create table t1 (a int);

create table t2 (a int);

insert into t1 values (1),(2),(3);

Locking table T2 with a write lock.

lock table t2 write;

Select blocked by write lock.

select *, (select count(*) from t2) from t1;;

Sleeing is ok, because selecting should be done very fast.

Inserting into table T1.

insert into t1 values (4);

Unlocking the tables.

unlock tables;

Collecting result from previously blocked select.

Next select should contain 4 rows, as the insert is long finished.

select *, (select count(*) from t2) from t1;

a	(select count(*) from t2)

1	0

2	0

3	0

4	0

reset query cache;

select *, (select count(*) from t2) from t1;

a	(select count(*) from t2)

1	0

2	0

3	0

4	0

drop table t1,t2;

set GLOBAL query_cache_type=default;

set GLOBAL query_cache_limit=default;

set GLOBAL query_cache_min_res_unit=default;

set GLOBAL query_cache_size=default;

mysql-test/r/sp.result

+25 −0
Original line number Diff line number Diff line
@@ -6176,4 +6176,29 @@ v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI 
DROP VIEW v1;

DROP FUNCTION metered;

DROP TABLE t1;

drop database if exists mysqltest_db1;

create database mysqltest_db1;

create procedure mysqltest_db1.sp_bug28551() begin end;

call mysqltest_db1.sp_bug28551();

show warnings;

Level	Code	Message

drop database mysqltest_db1;

drop database if exists mysqltest_db1;

drop table if exists test.t1;

create database mysqltest_db1;

use mysqltest_db1;

drop database mysqltest_db1;

create table test.t1 (id int);

insert into test.t1 (id) values (1);

create procedure test.sp_bug29050() begin select * from t1; end//

show warnings;

Level	Code	Message

call test.sp_bug29050();

id

1

show warnings;

Level	Code	Message

use test;

drop procedure sp_bug29050;

drop table t1;

End of 5.0 tests

mysql-test/r/trigger-trans.result

+59 −0
Original line number Diff line number Diff line
@@ -82,3 +82,62 @@ ALICE 33 1 0 
THE CROWN	43	1	0

THE PIE	53	1	1

drop table t1;



Bug#26141 mixing table types in trigger causes full

table lock on innodb table



Ensure we do not open and lock tables for the triggers we do not

fire.



drop table if exists t1, t2, t3;

drop trigger if exists trg_bug26141_au;

drop trigger if exists trg_bug26141_ai;

create table t1 (c int primary key) engine=innodb;

create table t2 (c int) engine=myisam;

create table t3 (c int) engine=myisam;

insert into t1 (c) values (1);

create trigger trg_bug26141_ai after insert on t1

for each row

begin

insert into t2 (c) values (1);

# We need the 'sync' lock to synchronously wait in connection 2 till 

# the moment when the trigger acquired all the locks.

select release_lock("lock_bug26141_sync") into @a;

# 1000 is time in seconds of lock wait timeout -- this is a way

# to cause a manageable sleep up to 1000 seconds

select get_lock("lock_bug26141_wait", 1000) into @a;

end|

create trigger trg_bug26141_au after update on t1

for each row

begin

insert into t3 (c) values (1);

end|

select get_lock("lock_bug26141_wait", 0);

get_lock("lock_bug26141_wait", 0)

1

select get_lock("lock_bug26141_sync", /* must not be priorly locked */ 0);

get_lock("lock_bug26141_sync", /* must not be priorly locked */ 0)

1

insert into t1 (c) values (2);

select get_lock("lock_bug26141_sync", 1000);

get_lock("lock_bug26141_sync", 1000)

1

update t1 set c=3 where c=1;

select release_lock("lock_bug26141_sync");

release_lock("lock_bug26141_sync")

1

select release_lock("lock_bug26141_wait");

release_lock("lock_bug26141_wait")

1

select * from t1;

c

2

3

select * from t2;

c

1

select * from t3;

c

1

drop table t1, t2, t3;

End of 5.0 tests