1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
This commit is contained in:
unknown 2006-01-17 19:46:02 +01:00
commit e0db2186e4
7 changed files with 17 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/sp-error.result
View File

@ -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

16
mysql-test/r/sp.result
View File

@ -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)

13
mysql-test/r/type_decimal.result
View File

@ -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;

4
mysql-test/r/variables.result
View File

@ -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

8
mysql-test/r/view_grant.result
View File

@ -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;

12
mysql-test/t/type_decimal.test
View File

@ -377,15 +377,3 @@ insert INTO t2 SELECT * FROM t1;
select * from t2;
drop table t1, t2;
#
# A test case for Bug#7670 "Loss of precision for some integer values stored
# into DOUBLE column": check that there is no truncation
# when inserting big integers into double columns.
#
create table t1 (a double(53,0));
insert into t1 values (9988317491112007680) ,(99883133042600208184115200);
select a from t1;
truncate t1;
insert into t1 values (9988317491112007680.0) ,(99883133042600208184115200.0);
select a from t1;
drop table t1;

4
sql/share/errmsg.txt
View File

@ -5175,8 +5175,8 @@ ER_SP_WRONG_NO_OF_FETCH_ARGS
eng "Incorrect number of FETCH variables"
ger "Falsche Anzahl von FETCH-Variablen"
ER_SP_FETCH_NO_DATA 02000
eng "No data to FETCH"
ger "Keine Daten mit FETCH abzuholen"
eng "No data - zero rows fetched, selected, or processed"
ger "Keine Daten - null Zeilen geholt (fetch), ausgewählt oder verarbeitet"
ER_SP_DUP_PARAM 42000
eng "Duplicate parameter: %s"
ger "Doppelter Parameter: %s"