Commit 8975c9bb authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_handler.cc:
  Auto merged
parents ad5ac3f8 0bb025f7

mysql-test/r/alter_table.result

+4 −0
Original line number Diff line number Diff line
@@ -562,3 +562,7 @@ desc t1; 
Field	Type	Null	Key	Default	Extra

mycol	int(10)	NO		0	

drop table t1;

create table t1 (t varchar(255) default null, key t (t(80)))

engine=myisam default charset=latin1;

alter table t1 change t t text;

drop table t1;

mysql-test/r/create.result

+5 −0
Original line number Diff line number Diff line
@@ -598,6 +598,11 @@ DESC t2; 
Field	Type	Null	Key	Default	Extra

f2	varchar(171)	YES		NULL	

DROP TABLE t1,t2;

CREATE TABLE t12913 (f1 ENUM ('a','b')) AS SELECT 'a' AS f1;

SELECT * FROM t12913;

f1

a

DROP TABLE t12913;

create database mysqltest;

use mysqltest;

drop database mysqltest;

mysql-test/r/sp-code.result

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ Pos Instruction 
9	set err@1 1

10	hreturn 5

11	cfetch c@0 n@4

12	jump_if_not 15 isnull(n@4)

12	jump_if_not 15(17) isnull(n@4)

13	set nulls@2 (nulls@2 + 1)

14	jump 17

15	set count@3 (count@3 + 1)

mysql-test/r/sp.result

+139 −19
Original line number Diff line number Diff line
@@ -3624,8 +3624,6 @@ drop procedure if exists bug7049_1| 
drop procedure if exists bug7049_2|

drop procedure if exists bug7049_3|

drop procedure if exists bug7049_4|

drop procedure if exists bug7049_5|

drop procedure if exists bug7049_6|

drop function if exists bug7049_1|

drop function if exists bug7049_2|

create table t3 ( x int unique )|
@@ -3650,18 +3648,6 @@ select 'Caught it' as 'Result'; 
call bug7049_3();

select 'Missed it' as 'Result';

end|

create procedure bug7049_5()

begin

declare x decimal(2,1);

set x = 'zap';

end|

create procedure bug7049_6()

begin

declare exit handler for sqlwarning

select 'Caught it' as 'Result';

call bug7049_5();

select 'Missed it' as 'Result';

end|

create function bug7049_1()

returns int

begin
@@ -3691,9 +3677,6 @@ Caught it 
select * from t3|

x

42

call bug7049_6()|

Result

Caught it

select bug7049_2()|

bug7049_2()

1
@@ -3702,8 +3685,6 @@ drop procedure bug7049_1| 
drop procedure bug7049_2|

drop procedure bug7049_3|

drop procedure bug7049_4|

drop procedure bug7049_5|

drop procedure bug7049_6|

drop function bug7049_1|

drop function bug7049_2|

drop function if exists bug13941|
@@ -4387,4 +4368,143 @@ id county 
2	NULL

drop table t3|

drop procedure bug15441|

drop procedure if exists bug14498_1|

drop procedure if exists bug14498_2|

drop procedure if exists bug14498_3|

drop procedure if exists bug14498_4|

drop procedure if exists bug14498_5|

create procedure bug14498_1()

begin

declare continue handler for sqlexception select 'error' as 'Handler';

if v then

select 'yes' as 'v';

else

select 'no' as 'v';

end if;

select 'done' as 'End';

end|

create procedure bug14498_2()

begin

declare continue handler for sqlexception select 'error' as 'Handler';

while v do

select 'yes' as 'v';

end while;

select 'done' as 'End';

end|

create procedure bug14498_3()

begin

declare continue handler for sqlexception select 'error' as 'Handler';

repeat

select 'maybe' as 'v';

until v end repeat;

select 'done' as 'End';

end|

create procedure bug14498_4()

begin

declare continue handler for sqlexception select 'error' as 'Handler';

case v

when 1 then

select '1' as 'v';

when 2 then

select '2' as 'v';

else

select '?' as 'v';

end case;

select 'done' as 'End';

end|

create procedure bug14498_5()

begin

declare continue handler for sqlexception select 'error' as 'Handler';

case

when v = 1 then

select '1' as 'v';

when v = 2 then

select '2' as 'v';

else

select '?' as 'v';

end case;

select 'done' as 'End';

end|

call bug14498_1()|

Handler

error

End

done

call bug14498_2()|

Handler

error

End

done

call bug14498_3()|

v

maybe

Handler

error

End

done

call bug14498_5()|

Handler

error

End

done

drop procedure bug14498_1|

drop procedure bug14498_2|

drop procedure bug14498_3|

drop procedure bug14498_4|

drop procedure bug14498_5|

drop table if exists t3|

drop procedure if exists bug15231_1|

drop procedure if exists bug15231_2|

drop procedure if exists bug15231_3|

drop procedure if exists bug15231_4|

create table t3 (id int not null)|

create procedure bug15231_1()

begin

declare xid integer;

declare xdone integer default 0;

declare continue handler for not found set xdone = 1;

set xid=null;

call bug15231_2(xid);

select xid, xdone;

end|

create procedure bug15231_2(inout ioid integer)

begin

select "Before NOT FOUND condition is triggered" as '1';

select id into ioid from t3 where id=ioid;

select "After NOT FOUND condtition is triggered" as '2';

if ioid is null then

set ioid=1;

end if;

end|

create procedure bug15231_3()

begin

declare exit handler for sqlwarning

select 'Caught it (wrong)' as 'Result';

call bug15231_4();

end|

create procedure bug15231_4()

begin

declare x decimal(2,1);

set x = 'zap';

select 'Missed it (correct)' as 'Result';

end|

call bug15231_1()|

1

Before NOT FOUND condition is triggered

2

After NOT FOUND condtition is triggered

xid	xdone

1	0

Warnings:

Warning	1329	No data to FETCH

call bug15231_3()|

Result

Missed it (correct)

Warnings:

Warning	1366	Incorrect decimal value: 'zap' for column 'x' at row 1

drop table if exists t3|

drop procedure if exists bug15231_1|

drop procedure if exists bug15231_2|

drop procedure if exists bug15231_3|

drop procedure if exists bug15231_4|

drop table t1,t2;

mysql-test/r/type_decimal.result

+13 −0
Original line number Diff line number Diff line
@@ -772,3 +772,16 @@ productid zlevelprice 
003trans	39.98

004trans	31.18

drop table t1, t2;

create table t1 (a double(53,0));

insert into t1 values (9988317491112007680) ,(99883133042600208184115200);

select a from t1;

a

9988317491112007680

99883133042600208184115200

truncate t1;

insert into t1 values (9988317491112007680.0) ,(99883133042600208184115200.0);

select a from t1;

a

9988317491112007680

99883133042600208184115200

drop table t1;