Commit 42fec6b6 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/psergey/mysql-5.0-bug12228-r4 

into mysql.com:/home/psergey/mysql-5.0-bug12228-r5


mysql-test/r/type_bit.result:
  Auto merged
mysql-test/t/sp-threads.test:
  Auto merged
mysql-test/t/type_bit.test:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
parents 6861b1bf 6b9ec78b

mysql-test/r/sp-threads.result

+25 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ Id User Host db Command Time State Info 
#	root	localhost	test	Sleep	#		NULL

#	root	localhost	test	Query	#	Locked	update t1, t2 set val= 1 where id1=id2

#	root	localhost	test	Query	#	NULL	show processlist

#	root	localhost	test	Sleep	#		NULL

unlock tables;

drop procedure bug9486;

drop table t1, t2;
@@ -64,3 +65,27 @@ insert into t1 (select f from v1); 
drop function bug11554;

drop table t1;

drop view v1;

drop procedure if exists p1;

drop procedure if exists p2;

create table t1 (s1 int)|

create procedure p1() select * from t1|

create procedure p2()

begin

insert into t1 values (1);

call p1();

select * from t1;

end|

use test;

lock table t1 write;

 call p2();

use test;

drop procedure p1;

create procedure p1() select * from t1;

unlock tables;

s1

1

s1

1

drop procedure p1;

drop procedure p2;

drop table t1;

mysql-test/r/type_bit.result

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ select 0 + b'1111111111111111'; 
select 0 + b'1000000000000001';

0 + b'1000000000000001'

32769

drop table if exists t1;

drop table if exists t1,t2;

create table t1 (a bit(65));

ERROR 42000: Display width out of range for column 'a' (max = 64)

create table t1 (a bit(0));

mysql-test/r/view.result

+2 −0
Original line number Diff line number Diff line
@@ -1880,6 +1880,8 @@ test.v5 check error View 'test.v5' references invalid table(s) or column(s) or f 
test.v6	check	status	OK

drop view v1, v2, v3, v4, v5, v6;

drop table t2;

drop function if exists f1;

drop function if exists f2;

CREATE TABLE t1 (col1 time);

CREATE TABLE t2 (col1 time);

CREATE TABLE t3 (col1 time);

mysql-test/t/sp-threads.test

+43 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


connect (con1root,localhost,root,,);

connect (con2root,localhost,root,,);

connect (con3root,localhost,root,,);



connection con1root;

use test;
@@ -130,6 +131,48 @@ drop function bug11554; 
drop table t1;

drop view v1;





# BUG#12228 

--disable_warnings

drop procedure if exists p1;

drop procedure if exists p2;

--enable_warnings



connection con1root;

delimiter |;

create table t1 (s1 int)|

create procedure p1() select * from t1|

create procedure p2()

begin

  insert into t1 values (1);

  call p1();

  select * from t1;

end|

delimiter ;|



connection con2root;

use test;

lock table t1 write;



connection con1root;

send call p2();



connection con3root;

use test;

drop procedure p1;

create procedure p1() select * from t1;



connection con2root;

unlock tables;



connection con1root;

# Crash will be here if we hit BUG#12228 

reap;



drop procedure p1;

drop procedure p2;

drop table t1;



#

# BUG#NNNN: New bug synopsis

#

mysql-test/t/type_bit.test

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ select 0 + b'1111111111111111'; 
select 0 + b'1000000000000001';



--disable_warnings

drop table if exists t1;

drop table if exists t1,t2;

--enable_warnings



--error 1439