database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

fixed result.

Browse Source
This commit is contained in:
unknown
2013-07-08 19:11:57 +03:00
parent 97d125084d
commit d82b512535
1 changed files with 14 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -737,8 +737,6 @@ close c;
end| end|
insert into t2 values ("foo", 42, -1.9), ("bar", 3, 12.1), ("zap", 666, -3.14)| insert into t2 values ("foo", 42, -1.9), ("bar", 3, 12.1), ("zap", 666, -3.14)|
call cur1()| call cur1()|
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
select * from t1| select * from t1|
id data id data
foo 40 foo 40
@ -774,8 +772,6 @@ close c1;
close c2; close c2;
end| end|
call cur2()| call cur2()|
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
select * from t3 order by i,s| select * from t3 order by i,s|
s i s i
bar 3 bar 3
@ -865,8 +861,6 @@ end$
set @@sql_mode = ''| set @@sql_mode = ''|
set sql_select_limit = 1| set sql_select_limit = 1|
call modes(@c1, @c2)| call modes(@c1, @c2)|
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
set sql_select_limit = default| set sql_select_limit = default|
select @c1, @c2| select @c1, @c2|
@c1 @c2 @c1 @c2
@ -1688,64 +1682,42 @@ end|
call h_ee()| call h_ee()|
h_ee h_ee
Inner (good) Inner (good)
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
call h_es()| call h_es()|
h_es h_es
Outer (good) Inner (bad)
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
call h_en()| call h_en()|
h_en h_en
Outer (good) Inner (bad)
Warnings:
Warning 1329 No data - zero rows fetched, selected, or processed
call h_ew()| call h_ew()|
h_ew h_ew
Outer (good) Inner (bad)
call h_ex()| call h_ex()|
h_ex h_ex
Outer (good) Inner (bad)
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
call h_se()| call h_se()|
h_se h_se
Inner (good) Inner (good)
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
call h_ss()| call h_ss()|
h_ss h_ss
Inner (good) Inner (good)
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
call h_sn()| call h_sn()|
h_sn h_sn
Outer (good) Inner (bad)
Warnings:
Warning 1329 No data - zero rows fetched, selected, or processed
call h_sw()| call h_sw()|
h_sw h_sw
Outer (good) Inner (bad)
call h_sx()| call h_sx()|
h_sx h_sx
Outer (good) Inner (bad)
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
call h_ne()| call h_ne()|
h_ne h_ne
Inner (good) Inner (good)
Warnings:
Warning 1329 No data - zero rows fetched, selected, or processed
call h_ns()| call h_ns()|
h_ns h_ns
Inner (good) Inner (good)
Warnings:
Warning 1329 No data - zero rows fetched, selected, or processed
call h_nn()| call h_nn()|
h_nn h_nn
Inner (good) Inner (good)
Warnings:
Warning 1329 No data - zero rows fetched, selected, or processed
call h_we()| call h_we()|
h_we h_we
Inner (good) Inner (good)
@ -1758,18 +1730,12 @@ Inner (good)
call h_xe()| call h_xe()|
h_xe h_xe
Inner (good) Inner (good)
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
call h_xs()| call h_xs()|
h_xs h_xs
Inner (good) Inner (good)
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
call h_xx()| call h_xx()|
h_xx h_xx
Inner (good) Inner (good)
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
drop table t3| drop table t3|
drop procedure h_ee| drop procedure h_ee|
drop procedure h_es| drop procedure h_es|
@ -1918,8 +1884,6 @@ set @x2 = 2;
close c1; close c1;
end| end|
call bug2260()| call bug2260()|
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
select @x2| select @x2|
@x2 @x2
2 2
@ -2063,8 +2027,6 @@ insert into t3 values (123456789012);
insert into t3 values (0); insert into t3 values (0);
end| end|
call bug2780()| call bug2780()|
Warnings:
Warning 1264 Out of range value for column 's1' at row 1
select @x| select @x|
@x @x
1 1
@ -2487,8 +2449,6 @@ declare continue handler for sqlstate 'HY000' begin end;
select s1 from t3 union select s2 from t3; select s1 from t3 union select s2 from t3;
end| end|
call bug4904()| call bug4904()|
Warnings:
Error 1267 Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (latin2_general_ci,IMPLICIT) for operation 'UNION'
drop procedure bug4904| drop procedure bug4904|
drop table t3| drop table t3|
drop procedure if exists bug336| drop procedure if exists bug336|
@ -2628,17 +2588,13 @@ select row_count()|
row_count() row_count()
1 1
call bug4905()| call bug4905()|
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
select row_count()| select row_count()|
row_count() row_count()
-1 0
call bug4905()| call bug4905()|
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
select row_count()| select row_count()|
row_count() row_count()
-1 0
select * from t3| select * from t3|
s1 s1
1 1
@ -2659,14 +2615,10 @@ insert into t3 values (1)|
call bug6029()| call bug6029()|
sqlstate 23000 sqlstate 23000
sqlstate 23000 sqlstate 23000
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
delete from t3| delete from t3|
call bug6029()| call bug6029()|
1136 1136
1136 1136
Warnings:
Error 1136 Column count doesn't match value count at row 1
drop procedure bug6029| drop procedure bug6029|
drop table t3| drop table t3|
drop procedure if exists bug8540| drop procedure if exists bug8540|
@ -2961,23 +2913,15 @@ end|
call bug6900()| call bug6900()|
2 2
2 2
Warnings:
Error 1136 Column count doesn't match value count at row 1
call bug9074()| call bug9074()|
x1 x2 x3 x4 x5 x6 x1 x2 x3 x4 x5 x6
1 1 1 1 1 1 1 1 1 1 1 1
Warnings:
Error 1062 Duplicate entry 'a' for key 'w'
call bug6900_9074(0)| call bug6900_9074(0)|
sqlexception sqlexception
sqlexception sqlexception
Warnings:
Error 1136 Column count doesn't match value count at row 1
call bug6900_9074(1)| call bug6900_9074(1)|
23000 sqlexception
23000 sqlexception
Warnings:
Error 1062 Duplicate entry 'a' for key 'w'
drop procedure bug6900| drop procedure bug6900|
drop procedure bug9074| drop procedure bug9074|
drop procedure bug6900_9074| drop procedure bug6900_9074|
@ -3020,13 +2964,9 @@ delete from t1|
call bug9856()| call bug9856()|
16 16
16 16
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
call bug9856()| call bug9856()|
16 16
16 16
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
drop procedure bug9856| drop procedure bug9856|
drop procedure if exists bug9674_1| drop procedure if exists bug9674_1|
drop procedure if exists bug9674_2| drop procedure if exists bug9674_2|
@ -3256,8 +3196,6 @@ x
2 2
x x
3 3
Warnings:
Error 1326 Cursor is not open
call bug10961()| call bug10961()|
x x
1 1
@ -3265,8 +3203,6 @@ x
2 2
x x
3 3
Warnings:
Error 1326 Cursor is not open
drop procedure bug10961| drop procedure bug10961|
DROP PROCEDURE IF EXISTS bug6866| DROP PROCEDURE IF EXISTS bug6866|
DROP VIEW IF EXISTS tv| DROP VIEW IF EXISTS tv|
@ -3274,9 +3210,9 @@ Warnings:
Note 1051 Unknown table 'test.tv' Note 1051 Unknown table 'test.tv'
DROP TABLE IF EXISTS tt1,tt2,tt3| DROP TABLE IF EXISTS tt1,tt2,tt3|
Warnings: Warnings:
Note 1051 Unknown table 'tt1' Note 1051 Unknown table 'test.tt1'
Note 1051 Unknown table 'tt2' Note 1051 Unknown table 'test.tt2'
Note 1051 Unknown table 'tt3' Note 1051 Unknown table 'test.tt3'
CREATE TABLE tt1 (a1 int, a2 int, a3 int, data varchar(10))| CREATE TABLE tt1 (a1 int, a2 int, a3 int, data varchar(10))|
CREATE TABLE tt2 (a2 int, data2 varchar(10))| CREATE TABLE tt2 (a2 int, data2 varchar(10))|
CREATE TABLE tt3 (a3 int, data3 varchar(10))| CREATE TABLE tt3 (a3 int, data3 varchar(10))|
@ -3382,11 +3318,7 @@ insert into t1 values
('Name4', 13), ('Name4', 13),
('Name5', 14)| ('Name5', 14)|
call bug11529()| call bug11529()|
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
call bug11529()| call bug11529()|
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
delete from t1| delete from t1|
drop procedure bug11529| drop procedure bug11529|
set character set utf8| set character set utf8|
@ -3560,32 +3492,24 @@ end;
end if; end if;
end| end|
call bug12168('a')| call bug12168('a')|
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
select * from t4| select * from t4|
a a
1 1
3 3
truncate t4| truncate t4|
call bug12168('b')| call bug12168('b')|
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
select * from t4| select * from t4|
a a
2 2
4 4
truncate t4| truncate t4|
call bug12168('a')| call bug12168('a')|
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
select * from t4| select * from t4|
a a
1 1
3 3
truncate t4| truncate t4|
call bug12168('b')| call bug12168('b')|
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
select * from t4| select * from t4|
a a
2 2
@ -3885,8 +3809,6 @@ end|
call bug7049_2()| call bug7049_2()|
Result Result
Caught it Caught it
Warnings:
Error 1062 Duplicate entry '42' for key 'x'
select * from t3| select * from t3|
x x
42 42
@ -3894,16 +3816,12 @@ delete from t3|
call bug7049_4()| call bug7049_4()|
Result Result
Caught it Caught it
Warnings:
Error 1062 Duplicate entry '42' for key 'x'
select * from t3| select * from t3|
x x
42 42
select bug7049_2()| select bug7049_2()|
bug7049_2() bug7049_2()
1 1
Warnings:
Error 1062 Duplicate entry '42' for key 'x'
drop table t3| drop table t3|
drop procedure bug7049_1| drop procedure bug7049_1|
drop procedure bug7049_2| drop procedure bug7049_2|
@ -4031,8 +3949,6 @@ end|
call bug14845()| call bug14845()|
a a
0 0
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
drop procedure bug14845| drop procedure bug14845|
drop procedure if exists bug13549_1| drop procedure if exists bug13549_1|
drop procedure if exists bug13549_2| drop procedure if exists bug13549_2|
@ -4236,8 +4152,6 @@ end|
call bug13729()| call bug13729()|
55 55
55 55
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
select * from t3| select * from t3|
s1 s1
1 1
@ -4274,15 +4188,11 @@ Handler
boo boo
v isnull(v) v isnull(v)
NULL 1 NULL 1
Warnings:
Error 1054 Unknown column 'undefined_var' in 'field list'
call bug14643_2()| call bug14643_2()|
Handler Handler
boo boo
Handler Handler
boo boo
Warnings:
Error 1054 Unknown column 'undefined_var' in 'field list'
drop procedure bug14643_1| drop procedure bug14643_1|
drop procedure bug14643_2| drop procedure bug14643_2|
drop procedure if exists bug14304| drop procedure if exists bug14304|
@ -4606,15 +4516,11 @@ Handler
error error
End End
done done
Warnings:
Error 1054 Unknown column 'v' in 'field list'
call bug14498_2()| call bug14498_2()|
Handler Handler
error error
End End
done done
Warnings:
Error 1054 Unknown column 'v' in 'field list'
call bug14498_3()| call bug14498_3()|
v v
maybe maybe
@ -4622,22 +4528,16 @@ Handler
error error
End End
done done
Warnings:
Error 1054 Unknown column 'v' in 'field list'
call bug14498_4()| call bug14498_4()|
Handler Handler
error error
End End
done done
Warnings:
Error 1054 Unknown column 'v' in 'field list'
call bug14498_5()| call bug14498_5()|
Handler Handler
error error
End End
done done
Warnings:
Error 1054 Unknown column 'v' in 'field list'
drop procedure bug14498_1| drop procedure bug14498_1|
drop procedure bug14498_2| drop procedure bug14498_2|
drop procedure bug14498_3| drop procedure bug14498_3|
@ -4702,8 +4602,6 @@ Before NOT FOUND condition is triggered
After NOT FOUND condtition is triggered After NOT FOUND condtition is triggered
xid xdone xid xdone
1 1 1 1
Warnings:
Warning 1329 No data - zero rows fetched, selected, or processed
call bug15231_3()| call bug15231_3()|
Result Result
Missed it (correct) Missed it (correct)
@ -4711,8 +4609,6 @@ Level Code Message
Warning 1366 Incorrect decimal value: 'zap' for column 'x' at row 1 Warning 1366 Incorrect decimal value: 'zap' for column 'x' at row 1
Result Result
Caught it (correct) Caught it (correct)
Warnings:
Warning 1366 Incorrect decimal value: 'zap' for column 'x' at row 1
call bug15231_5()| call bug15231_5()|
Result Result
Missed it (correct) Missed it (correct)
@ -4741,8 +4637,6 @@ end|
call bug15011()| call bug15011()|
Handler Handler
Inner Inner
Warnings:
Error 1062 Duplicate entry '1' for key 'PRIMARY'
drop procedure bug15011| drop procedure bug15011|
drop table t3| drop table t3|
drop procedure if exists bug17476| drop procedure if exists bug17476|
@ -4818,8 +4712,6 @@ i
1 1
i i
0 0
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
drop table t3| drop table t3|
drop procedure bug16887| drop procedure bug16887|
drop procedure if exists bug16474_1| drop procedure if exists bug16474_1|
@ -4892,8 +4784,6 @@ declare continue handler for sqlexception begin end;
select no_such_function(); select no_such_function();
end| end|
call bug18787()| call bug18787()|
Warnings:
Error 1305 FUNCTION test.no_such_function does not exist
drop procedure bug18787| drop procedure bug18787|
create database bug18344_012345678901| create database bug18344_012345678901|
use bug18344_012345678901| use bug18344_012345678901|
@ -5267,8 +5157,6 @@ statement failed
statement failed statement failed
statement after update statement after update
statement after update statement after update
Warnings:
Error 1242 Subquery returns more than 1 row
select * from t3| select * from t3|
a a
1 1
@ -5280,8 +5168,6 @@ statement failed
statement failed statement failed
statement after update statement after update
statement after update statement after update
Warnings:
Error 1242 Subquery returns more than 1 row
select * from t3| select * from t3|
a a
1 1
@ -5314,8 +5200,6 @@ in continue handler
in continue handler in continue handler
reachable code a2 reachable code a2
reachable code a2 reachable code a2
Warnings:
Error 1242 Subquery returns more than 1 row
select * from t3| select * from t3|
a a
1 1
@ -5331,8 +5215,6 @@ in continue handler
in continue handler in continue handler
reachable code a2 reachable code a2
reachable code a2 reachable code a2
Warnings:
Error 1242 Subquery returns more than 1 row
select * from t3| select * from t3|
a a
1 1
@ -5366,8 +5248,6 @@ in continue handler
in continue handler in continue handler
reachable code a2 reachable code a2
reachable code a2 reachable code a2
Warnings:
Error 1305 FUNCTION test.no_such_function does not exist
drop procedure bug8153_proc_a| drop procedure bug8153_proc_a|
drop procedure bug8153_proc_b| drop procedure bug8153_proc_b|
drop table t3| drop table t3|
@ -5936,13 +5816,9 @@ end|
select func_8407_a()| select func_8407_a()|
func_8407_a() func_8407_a()
NULL NULL
Warnings:
Error 1146 Table 'test.no_such_view' doesn't exist
select func_8407_b()| select func_8407_b()|
func_8407_b() func_8407_b()
1500 1500
Warnings:
Error 1146 Table 'test.no_such_view' doesn't exist
drop function func_8407_a| drop function func_8407_a|
drop function func_8407_b| drop function func_8407_b|
drop table if exists table_26503| drop table if exists table_26503|
@ -6064,8 +5940,6 @@ looping i
looping 0 looping 0
leaving handler leaving handler
leaving handler leaving handler
Warnings:
Error 1062 Duplicate entry '1' for key 'a'
call proc_26503_ok_2(2)| call proc_26503_ok_2(2)|
do something do something
do something do something
@ -6077,8 +5951,6 @@ looping i
looping 4 looping 4
leaving handler leaving handler
leaving handler leaving handler
Warnings:
Error 1062 Duplicate entry '2' for key 'a'
call proc_26503_ok_3(3)| call proc_26503_ok_3(3)|
do something do something
do something do something
@ -6098,8 +5970,6 @@ looping i
looping 0 looping 0
leaving handler leaving handler
leaving handler leaving handler
Warnings:
Error 1062 Duplicate entry '3' for key 'a'
call proc_26503_ok_4(4)| call proc_26503_ok_4(4)|
do something do something
do something do something
@ -6111,8 +5981,6 @@ looping i
looping 4 looping 4
leaving handler leaving handler
leaving handler leaving handler
Warnings:
Error 1062 Duplicate entry '4' for key 'a'
drop table table_26503| drop table table_26503|
drop procedure proc_26503_ok_1| drop procedure proc_26503_ok_1|
drop procedure proc_26503_ok_2| drop procedure proc_26503_ok_2|
@ -6826,8 +6694,6 @@ DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @exception:= 'run';
SELECT x FROM t1; SELECT x FROM t1;
END| END|
CALL bug29770(); CALL bug29770();
Warnings:
Error 1054 Unknown column 'x' in 'field list'
SELECT @state, @exception; SELECT @state, @exception;
@state @exception @state @exception
run NULL run NULL
@ -6866,8 +6732,6 @@ end;
end while; end while;
end// end//
call proc_33618(20); call proc_33618(20);
Warnings:
Error 1329 No data - zero rows fetched, selected, or processed
drop table t_33618; drop table t_33618;
drop procedure proc_33618; drop procedure proc_33618;
# #
@ -7803,9 +7667,6 @@ END $
SELECT f1(); SELECT f1();
f1() f1()
1 1
Warnings:
Error 1424 Recursive stored functions and triggers are not allowed.
Error 1305 FUNCTION test.f1 does not exist
DROP FUNCTION f1; DROP FUNCTION f1;
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# -- End of 5.1 tests # -- End of 5.1 tests