Commit e0db2186 authored by unknown's avatar unknown
Browse files

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 974d3b47 13f5fca9

mysql-test/r/sp-error.result

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ fetch c into v; 
end|

delete from t1|

call bug7299()|

ERROR 02000: No data to FETCH

ERROR 02000: No data - zero rows fetched, selected, or processed

drop procedure bug7299|

create procedure bug9073()

begin

mysql-test/r/sp.result

+8 −8
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ delete from t1| 
create table t3 ( s char(16), d int)|

call into_test4()|

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

select * from t3|

s	d

into4	NULL
@@ -1787,10 +1787,10 @@ end| 
call bug1863(10)|

Warnings:

Note	1051	Unknown table 'temp_t1'

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

call bug1863(10)|

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

select * from t4|

f1	rc	t3

2	0	NULL
@@ -2084,10 +2084,10 @@ end| 
call bug4579_1()|

call bug4579_1()|

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

call bug4579_1()|

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

drop procedure bug4579_1|

drop procedure bug4579_2|

drop table t3|
@@ -2566,7 +2566,7 @@ call bug7743("OneWord")| 
var

NULL

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

call bug7743("anotherword")|

var

2
@@ -2574,7 +2574,7 @@ call bug7743("AnotherWord")| 
var

NULL

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

drop procedure bug7743|

drop table t4|

delete from t3|
@@ -4496,7 +4496,7 @@ After NOT FOUND condtition is triggered 
xid	xdone

1	0

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

call bug15231_3()|

Result

Missed it (correct)

mysql-test/r/type_decimal.result

+0 −13
Original line number Diff line number Diff line
@@ -772,16 +772,3 @@ 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;

mysql-test/r/variables.result

+2 −2
Original line number Diff line number Diff line
@@ -537,10 +537,10 @@ select @@query_prealloc_size = @test; 
create table t1 (a int);

select a into @x from t1;

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

show warnings;

Level	Code	Message

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

drop table t1;

set @@warning_count=1;

ERROR HY000: Variable 'warning_count' is a read only variable

mysql-test/r/view_grant.result

+4 −4
Original line number Diff line number Diff line
@@ -348,12 +348,12 @@ select * from v1; 
f2()

NULL

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

select * from v2;

f2()

NULL

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

select * from v3;

ERROR HY000: View 'mysqltest.v3' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them

select * from v4;
@@ -394,12 +394,12 @@ select * from v3; 
f2()

NULL

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

select * from v4;

f2()

NULL

Warnings:

Warning	1329	No data to FETCH

Warning	1329	No data - zero rows fetched, selected, or processed

select * from v5;

ERROR HY000: View 'mysqltest.v5' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them

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