database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Fix a bad BitKeeper dependency structure for the "funcs_1" suite:

Browse Source 
Step 2:
Restore the 5.1 contents in the 5.0-dependent files.
This commit is contained in:
joerg@debian.(none)
2007-07-27 15:41:27 +02:00
parent c80ced4111
commit 4d9cbaf313
51 changed files with 12413 additions and 6985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
View File

@@ -209,7 +209,7 @@ BEGIN
set @x = x;
set @y = y;
set @z = 234;
SELECT f1, f2 into @x, @y from t2 limit 1;
SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
SELECT @x, @y, @z, invar;
BEGIN
set @x = 2;
@@ -257,7 +257,7 @@ BEGIN
declare x integer; declare y integer;
set @x=x;
set @y=y;
SELECT f4, f3 into @x, @y from t2 limit 1;
SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
SELECT @x, @y;
END//
delimiter ;//
@@ -1271,7 +1271,8 @@ BEGIN
declare f5_value char(20);
declare f4_value integer;
declare f6_value integer;
declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
where f4 >=-5000 order by f4 limit 3;
open cur1;
while proceed do
SELECT count AS 'loop';
@@ -1368,7 +1369,7 @@ create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) )
#Error: 1329 SQLSTATE: 02000 (ER_SP_FETCH_NO_DATA) Message: No data to FETCH
SELECT f1, f2, f4, f5 from t2;
SELECT f1, f2, f4, f5 from t2 order by f4;
delimiter //;
CREATE PROCEDURE sp1( )
@@ -1379,21 +1380,21 @@ BEGIN
declare newf2 char(20);
declare newf5 char(20);
declare newf4 integer;
declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
open cur1;
open cur2;
BEGIN
declare continue handler for sqlstate '02000' set count = 1;
declare continue handler for sqlstate '02000' set count=1;
fetch cur1 into newf1, newf2, newf4, newf5;
SELECT '-1-', count, newf1, newf2, newf4, newf5;
insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
set count = 4;
set count= 4;
BEGIN
while count > 0 do
while count> 0 do
fetch cur1 into newf1, newf2, newf4, newf5;
SELECT '-2-', count, newf1, newf2, newf4, newf5;
set count = count - 1;
set count = count- 1;
END while;
SELECT '-3-', count, newf1, newf2, newf4, newf4;
END;
@@ -1453,8 +1454,10 @@ BEGIN
declare i_newf12 char(20);
declare i_newf13 date;
declare i_newf14 integer;
declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
where f4>=-5000 order by f4 limit 4;
declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
where f4>=-5000 order by f4 limit 3;
declare continue handler for sqlstate '02000' set proceed=0;
open cur1;
open cur2;
@@ -1486,8 +1489,10 @@ BEGIN
DECLARE o_newf12 CHAR(20);
DECLARE o_newf13 DATE;
DECLARE o_newf14 INTEGER;
DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
OPEN cur1;
OPEN cur2;

10
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
View File

@@ -54,7 +54,7 @@ connect (user2_1, localhost, user_1, , db_storedproc);
delimiter //;
CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
BEGIN
SELECT * FROM db_storedproc.t1 LIMIT 1;
SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
END//
delimiter ;//
@@ -244,21 +244,21 @@ delimiter ;//
CALL sp_ins_1();
SELECT row_count();
SELECT * FROM temp;
SELECT * FROM temp ORDER BY f4;
CALL sp_ins_3();
#FIXME: check is 1 correct here? I expect 3 for 3 inserted rows inside the procedure
SELECT row_count();
SELECT * FROM temp;
SELECT * FROM temp ORDER BY f4;
CALL sp_upd();
SELECT row_count();
SELECT * FROM temp;
SELECT * FROM temp ORDER BY f4;
#FIXME: check is 3 correct here? I expect 7 for 4 inserted and then 3 updated rows inside the procedure
CALL sp_ins_upd();
SELECT row_count();
SELECT * FROM temp;
SELECT * FROM temp ORDER BY f4;
# cleanup
DROP PROCEDURE sp_ins_1;

35
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
View File

@@ -6,19 +6,16 @@ let $message= .
. IMPORTANT NOTICE:
. -----------------
.
. FIXME: The <engine>_storedproc.result files are still NOT CHECKED
. for correctness!
. FIXME: The .result files are still NOT CHECKED for correctness!
.
. FIXME: Several tests are affected by known problems around DECIMAL
. FIXME: and NUMERIC that needs to be checked again after WL#2984
. FIXME: and NUMERIC that will be checked again after WL#2984 once
. FIXME: has been completed. Some of them are marked in the result.
.
. This .result file has been checked OK with Linux 5.0.23-bk,
. ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
.
. This file has been saved although it might contain failures / wrong
. results to be able to detect _new_ differences in the behaviour.
. Hopefully the remaining checks can be made soon.
. Currently (Dec 06, 2005) this .result file is checked OK for Linux
. with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
. Using the available Windows version 5.0.16 there are differences
. that can be ignored (e.g. WL#2984).
.;
--source include/show_msg80.inc
@@ -914,7 +911,7 @@ SELECT * from t1 where f2 = f1;
#/t'ql/mysql-test
#t]# t@localhost t
#FIXME check this is OK:--error 1064
--error 0,1064
CREATE PROCEDURE function()
SELECT * from t1 where f2=f1;
DROP PROCEDURE function;
@@ -1015,7 +1012,7 @@ CREATE PROCEDURE collate()
CREATE PROCEDURE column()
SELECT * from t1 where f2=f1;
#FIXME check this is OK:--error 1064
--error 1064
CREATE PROCEDURE columns()
SELECT * from t1 where f2=f1;
DROP PROCEDURE columns;
@@ -1192,7 +1189,7 @@ CREATE PROCEDURE false()
CREATE PROCEDURE fetch()
SELECT * from t1 where f2=f1;
#FIXME check this is OK:--error 1064
--error 1064
CREATE PROCEDURE fields()
SELECT * from t1 where f2=f1;
DROP PROCEDURE fields;
@@ -1213,7 +1210,7 @@ CREATE PROCEDURE force()
CREATE PROCEDURE foreign()
SELECT * from t1 where f2=f1;
#FIXME check this is OK:--error 1064
--error 1064
CREATE PROCEDURE found()
SELECT * from t1 where f2=f1;
DROP PROCEDURE found;
@@ -1226,7 +1223,7 @@ CREATE PROCEDURE from()
CREATE PROCEDURE fulltext()
SELECT * from t1 where f2=f1;
#FIXME check this is OK:--error 1064
--error 1064
CREATE PROCEDURE goto()
SELECT * from t1 where f2=f1;
DROP PROCEDURE goto;
@@ -1495,7 +1492,7 @@ CREATE PROCEDURE precision()
CREATE PROCEDURE primary()
SELECT * from t1 where f2=f1;
#FIXME check this is OK:--error 1064
--error 1064
CREATE PROCEDURE privileges()
SELECT * from t1 where f2=f1;
DROP PROCEDURE privileges;
@@ -1656,7 +1653,7 @@ CREATE PROCEDURE straight_join()
CREATE PROCEDURE table()
SELECT * from t1 where f2=f1;
#FIXME check this is OK:--error 1064
--error 1064
CREATE PROCEDURE tables()
SELECT * from t1 where f2=f1;
DROP PROCEDURE tables;
@@ -1837,7 +1834,7 @@ CREATE FUNCTION char ascii not null(f1 char ascii not null) returns char ascii n
CREATE FUNCTION tinytext(f1 tinytext) returns tinytext
return f1;
#FIXME check this is OK:--error 1064
--error 1064
CREATE FUNCTION text(f1 text) returns text
return f1;
DROP FUNCTION text;
@@ -10128,7 +10125,7 @@ DROP PROCEDURE IF EXISTS sp1;
--enable_warnings
delimiter //;
--error 1064
#FIXME check this is OK:--error 1064
CREATE PROCEDURE sp1()
BEGIN
declare precision char;
@@ -10430,7 +10427,7 @@ delimiter ;//
DROP PROCEDURE IF EXISTS sp1;
delimiter //;
--error 1064
#FIXME check this is OK:--error 1064
CREATE PROCEDURE sp1()
BEGIN
declare soname char;