Skip to content

M
MariaDB
Commit bc748bef authored by unknown's avatar unknown
Browse files
Options

Post-merge fixes. 

Multiple result sets from stored procedures now works with the
mysql and mysqltest clients.


client/mysqltest.c:
  Post-merge fixes.
mysql-test/r/index_merge_innodb.result:
  Post-merge fixes.
mysql-test/r/sp-error.result:
  Post-merge fixes.
  Removed now obsolete error test for multiple selects (without "into").
mysql-test/r/sp.result:
  Post-merge fixes.
  Added test for mulple result sets.
mysql-test/r/variables.result:
  Post-merge fixes.
mysql-test/t/index_merge_innodb.test:
  Post-merge fixes.
mysql-test/t/sp-error.test:
  Post-merge fixes.
  Removed now obsolete error test for multiple selects (without "into").
mysql-test/t/sp.test:
  Post-merge fixes.
  Added test for mulple result sets.
sql/lex.h:
  Post-merge fixes.
parent b8fa1718
Hide whitespace changes
Inline Side-by-side
Showing with 541 additions and 527 deletions
client/mysqltest.c
View file @ bc748bef
...@@ -135,8 +135,6 @@ static const char *embedded_server_groups[] = { ...@@ -135,8 +135,6 @@ static const char *embedded_server_groups[] = {
NullS NullS
}; };
static char delimiter= DEFAULT_DELIMITER;
DYNAMIC_ARRAY q_lines; DYNAMIC_ARRAY q_lines;
#include "sslopt-vars.h" #include "sslopt-vars.h"
...@@ -1629,17 +1627,6 @@ int do_while(struct st_query* q) ...@@ -1629,17 +1627,6 @@ int do_while(struct st_query* q)
return 0; return 0;
} }
int do_delimiter(char *p)
{
while (*p && my_isspace(charset_info,*p))
p++;
if (!*p)
die("Missing delimiter character\n");
delimiter=*p;
return 0;
}
my_bool end_of_query(int c, char* p) my_bool end_of_query(int c, char* p)
{ {
...@@ -2645,9 +2632,6 @@ int main(int argc, char **argv) ...@@ -2645,9 +2632,6 @@ int main(int argc, char **argv)
do_sync_with_master2(""); do_sync_with_master2("");
break; break;
} }
case Q_DELIMITER:
do_delimiter(q->first_argument);
break;
case Q_COMMENT: /* Ignore row */ case Q_COMMENT: /* Ignore row */
case Q_COMMENT_WITH_COMMAND: case Q_COMMENT_WITH_COMMAND:
break; break;
......
mysql-test/r/index_merge_innodb.result
View file @ bc748bef
...@@ -5,7 +5,7 @@ key1 int not null, ...@@ -5,7 +5,7 @@ key1 int not null,
key2 int not null, key2 int not null,
INDEX i1(key1), INDEX i1(key1),
INDEX i2(key2), INDEX i2(key2),
) type=innodb; ) engine=innodb;
explain select * from t1 where key1 < 5 or key2 > 197; explain select * from t1 where key1 < 5 or key2 > 197;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index_merge i1,i2 i1,i2 4,4 NULL 8 Using where 1 SIMPLE t1 index_merge i1,i2 i1,i2 4,4 NULL 8 Using where
......
mysql-test/r/sp-error.result
View file @ bc748bef
delete from mysql.proc; delete from mysql.proc;
create procedure syntaxerror(t int); create procedure syntaxerror(t int)|
ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
create procedure syntaxerror(t int); create procedure syntaxerror(t int)|
ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
create procedure syntaxerror(t int); create procedure syntaxerror(t int)|
ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
create procedure proc1() create procedure proc1()
set @x = 42; set @x = 42|
create function func1() returns int create function func1() returns int
return 42; return 42|
create procedure foo() create procedure foo()
create procedure bar() set @x=3; create procedure bar() set @x=3|
ERROR 2F003: Can't create a PROCEDURE from within another stored routine ERROR 2F003: Can't create a PROCEDURE from within another stored routine
create procedure foo() create procedure foo()
create function bar() returns double return 2.3; create function bar() returns double return 2.3|
ERROR 2F003: Can't create a FUNCTION from within another stored routine ERROR 2F003: Can't create a FUNCTION from within another stored routine
create procedure proc1() create procedure proc1()
set @x = 42; set @x = 42|
ERROR 42000: PROCEDURE proc1 already exists ERROR 42000: PROCEDURE proc1 already exists
create function func1() returns int create function func1() returns int
return 42; return 42|
ERROR 42000: FUNCTION func1 already exists ERROR 42000: FUNCTION func1 already exists
drop procedure proc1; drop procedure proc1|
drop function func1; drop function func1|
alter procedure foo; alter procedure foo|
ERROR 42000: PROCEDURE foo does not exist ERROR 42000: PROCEDURE foo does not exist
alter function foo; alter function foo|
ERROR 42000: FUNCTION foo does not exist ERROR 42000: FUNCTION foo does not exist
drop procedure foo; drop procedure foo|
ERROR 42000: PROCEDURE foo does not exist ERROR 42000: PROCEDURE foo does not exist
drop function foo; drop function foo|
ERROR 42000: FUNCTION foo does not exist ERROR 42000: FUNCTION foo does not exist
call foo(); call foo()|
ERROR 42000: PROCEDURE foo does not exist ERROR 42000: PROCEDURE foo does not exist
drop procedure if exists foo; drop procedure if exists foo|
Warnings: Warnings:
Warning 1288 PROCEDURE foo does not exist Warning 1289 PROCEDURE foo does not exist
show create procedure foo; show create procedure foo|
ERROR 42000: PROCEDURE foo does not exist ERROR 42000: PROCEDURE foo does not exist
create procedure foo() create procedure foo()
foo: loop foo: loop
leave bar; leave bar;
end loop; end loop|
ERROR 42000: LEAVE with no matching label: bar ERROR 42000: LEAVE with no matching label: bar
create procedure foo() create procedure foo()
foo: loop foo: loop
iterate bar; iterate bar;
end loop; end loop|
ERROR 42000: ITERATE with no matching label: bar ERROR 42000: ITERATE with no matching label: bar
create procedure foo() create procedure foo()
foo: begin foo: begin
iterate foo; iterate foo;
end; end|
ERROR 42000: ITERATE with no matching label: foo ERROR 42000: ITERATE with no matching label: foo
create procedure foo() create procedure foo()
foo: loop foo: loop
foo: loop foo: loop
set @x=2; set @x=2;
end loop foo; end loop foo;
end loop foo; end loop foo|
ERROR 42000: Redefining label foo ERROR 42000: Redefining label foo
create procedure foo() create procedure foo()
foo: loop foo: loop
set @x=2; set @x=2;
end loop bar; end loop bar|
ERROR 42000: End-label bar without match ERROR 42000: End-label bar without match
create procedure foo(out x int) create procedure foo(out x int)
begin begin
declare y int; declare y int;
set x = y; set x = y;
end; end|
Warnings: Warnings:
Warning 1294 Referring to uninitialized variable y Warning 1295 Referring to uninitialized variable y
drop procedure foo; drop procedure foo|
create procedure foo()
begin
select name from mysql.proc;
select type from mysql.proc;
end;
call foo();
ERROR 0A000: SELECT in a stored procedure must have INTO
drop procedure foo;
create procedure foo() create procedure foo()
return 42; return 42|
ERROR 42000: RETURN is only allowed in a FUNCTION ERROR 42000: RETURN is only allowed in a FUNCTION
create function foo() returns int create function foo() returns int
begin begin
declare x int; declare x int;
select max(c) into x from test.t; select max(c) into x from test.t;
return x; return x;
end; end|
ERROR 0A000: Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION ERROR 0A000: Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION
create procedure p(x int) create procedure p(x int)
insert into test.t1 values (x); insert into test.t1 values (x)|
create function f(x int) returns int create function f(x int) returns int
return x+42; return x+42|
call p(); call p()|
ERROR 42000: Wrong number of arguments for PROCEDURE p, expected 1, got 0 ERROR 42000: Wrong number of arguments for PROCEDURE p, expected 1, got 0
call p(1, 2); call p(1, 2)|
ERROR 42000: Wrong number of arguments for PROCEDURE p, expected 1, got 2 ERROR 42000: Wrong number of arguments for PROCEDURE p, expected 1, got 2
select f(); select f()|
ERROR 42000: Wrong number of arguments for FUNCTION f, expected 1, got 0 ERROR 42000: Wrong number of arguments for FUNCTION f, expected 1, got 0
select f(1, 2); select f(1, 2)|
ERROR 42000: Wrong number of arguments for FUNCTION f, expected 1, got 2 ERROR 42000: Wrong number of arguments for FUNCTION f, expected 1, got 2
drop procedure p; drop procedure p|
drop function f; drop function f|
create procedure p(val int, out res int) create procedure p(val int, out res int)
begin begin
declare x int default 0; declare x int default 0;
...@@ -115,7 +107,7 @@ set res = 0; ...@@ -115,7 +107,7 @@ set res = 0;
else else
set res = 1; set res = 1;
end if; end if;
end; end|
ERROR 42000: Undefined CONDITION: foo ERROR 42000: Undefined CONDITION: foo
create procedure p(val int, out res int) create procedure p(val int, out res int)
begin begin
...@@ -128,13 +120,13 @@ set res = 0; ...@@ -128,13 +120,13 @@ set res = 0;
else else
set res = 1; set res = 1;
end if; end if;
end; end|
ERROR 42000: Undefined CONDITION: bar ERROR 42000: Undefined CONDITION: bar
create function f(val int) returns int create function f(val int) returns int
begin begin
declare x int; declare x int;
set x = val+3; set x = val+3;
end; end|
ERROR 42000: No RETURN found in FUNCTION f ERROR 42000: No RETURN found in FUNCTION f
create function f(val int) returns int create function f(val int) returns int
begin begin
...@@ -143,16 +135,16 @@ set x = val+3; ...@@ -143,16 +135,16 @@ set x = val+3;
if x < 4 then if x < 4 then
return x; return x;
end if; end if;
end; end|
select f(10); select f(10)|
ERROR 2F005: FUNCTION f ended without RETURN ERROR 2F005: FUNCTION f ended without RETURN
drop function f; drop function f|
create procedure p() create procedure p()
begin begin
declare c cursor for insert into test.t1 values ("foo", 42); declare c cursor for insert into test.t1 values ("foo", 42);
open c; open c;
close c; close c;
end; end|
ERROR 42000: Cursor statement must be a SELECT ERROR 42000: Cursor statement must be a SELECT
create procedure p() create procedure p()
begin begin
...@@ -160,46 +152,46 @@ declare x int; ...@@ -160,46 +152,46 @@ declare x int;
declare c cursor for select * into x from test.t limit 1; declare c cursor for select * into x from test.t limit 1;
open c; open c;
close c; close c;
end; end|
ERROR 42000: Cursor SELECT must not have INTO ERROR 42000: Cursor SELECT must not have INTO
create procedure p() create procedure p()
begin begin
declare c cursor for select * from test.t; declare c cursor for select * from test.t;
open cc; open cc;
close c; close c;
end; end|
ERROR 42000: Undefined CURSOR: cc ERROR 42000: Undefined CURSOR: cc
drop table if exists t1; drop table if exists t1|
create table t1 (val int); create table t1 (val int)|
create procedure p() create procedure p()
begin begin
declare c cursor for select * from test.t1; declare c cursor for select * from test.t1;
open c; open c;
open c; open c;
close c; close c;
end; end|
call p(); call p()|
ERROR 24000: Cursor is already open ERROR 24000: Cursor is already open
drop procedure p; drop procedure p|
create procedure p() create procedure p()
begin begin
declare c cursor for select * from test.t1; declare c cursor for select * from test.t1;
open c; open c;
close c; close c;
close c; close c;
end; end|
call p(); call p()|
ERROR 24000: Cursor is not open ERROR 24000: Cursor is not open
drop procedure p; drop procedure p|
alter procedure bar3 sql security invoker; alter procedure bar3 sql security invoker|
ERROR 42000: PROCEDURE bar3 does not exist ERROR 42000: PROCEDURE bar3 does not exist
alter procedure bar3 name alter procedure bar3 name
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA; AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA|
ERROR 42000: Identifier name 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' is too long ERROR 42000: Identifier name 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' is too long
drop table t1; drop table t1|
drop table if exists t1; drop table if exists t1|
create table t1 (val int, x float); create table t1 (val int, x float)|
insert into t1 values (42, 3.1), (19, 1.2); insert into t1 values (42, 3.1), (19, 1.2)|
create procedure p() create procedure p()
begin begin
declare c cursor for select * from t1; declare c cursor for select * from t1;
...@@ -207,7 +199,7 @@ declare x int; ...@@ -207,7 +199,7 @@ declare x int;
open c; open c;
fetch c into x, y; fetch c into x, y;
close c; close c;
end; end|
ERROR 42000: Undeclared variable: y ERROR 42000: Undeclared variable: y
create procedure p() create procedure p()
begin begin
...@@ -216,10 +208,10 @@ declare x int; ...@@ -216,10 +208,10 @@ declare x int;
open c; open c;
fetch c into x; fetch c into x;
close c; close c;
end; end|
call p(); call p()|
ERROR HY000: Wrong number of FETCH variables ERROR HY000: Wrong number of FETCH variables
drop procedure p; drop procedure p|
create procedure p() create procedure p()
begin begin
declare c cursor for select * from t1; declare c cursor for select * from t1;
...@@ -229,66 +221,66 @@ declare z int; ...@@ -229,66 +221,66 @@ declare z int;
open c; open c;
fetch c into x, y, z; fetch c into x, y, z;
close c; close c;
end; end|
call p(); call p()|
ERROR HY000: Wrong number of FETCH variables ERROR HY000: Wrong number of FETCH variables
drop procedure p; drop procedure p|
create procedure p(in x int, x char(10)) create procedure p(in x int, x char(10))
begin begin
end; end|
ERROR 42000: Duplicate parameter: x ERROR 42000: Duplicate parameter: x
create function p(x int, x char(10)) create function p(x int, x char(10))
begin begin
end; end|
ERROR 42000: Duplicate parameter: x ERROR 42000: Duplicate parameter: x
create procedure p() create procedure p()
begin begin
declare x float; declare x float;
declare x int; declare x int;
end; end|
ERROR 42000: Duplicate variable: x ERROR 42000: Duplicate variable: x
create procedure p() create procedure p()
begin begin
declare c condition for 1064; declare c condition for 1064;
declare c condition for 1065; declare c condition for 1065;
end; end|
ERROR 42000: Duplicate condition: c ERROR 42000: Duplicate condition: c
create procedure p() create procedure p()
begin begin
declare c cursor for select * from t1; declare c cursor for select * from t1;
declare c cursor for select field from t1; declare c cursor for select field from t1;
end; end|
ERROR 42000: Duplicate cursor: c ERROR 42000: Duplicate cursor: c
create procedure bug1965() create procedure bug1965()
begin begin
declare c cursor for select val from t1 order by valname; declare c cursor for select val from t1 order by valname;
open c; open c;
close c; close c;
end; end|
call bug1965(); call bug1965()|
ERROR 42S22: Unknown column 'valname' in 'order clause' ERROR 42S22: Unknown column 'valname' in 'order clause'
drop procedure bug1965; drop procedure bug1965|
select 1 into a; select 1 into a|
ERROR 42000: Undeclared variable: a ERROR 42000: Undeclared variable: a
create procedure bug336(id char(16)) create procedure bug336(id char(16))
begin begin
declare x int; declare x int;
set x = (select sum(t.data) from test.t2 t); set x = (select sum(t.data) from test.t2 t);
end; end|
ERROR 0A000: Subselect value not supported ERROR 0A000: Subselect value not supported
create function bug1654() create function bug1654()
returns int returns int
return (select sum(t.data) from test.t2 t); return (select sum(t.data) from test.t2 t)|
ERROR 0A000: Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION ERROR 0A000: Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION
drop table if exists table_1; drop table if exists table_1|
create table t3 (column_1_0 int); create table t3 (column_1_0 int)|
create procedure bug1653() create procedure bug1653()
update t3 set column_1 = 0; update t3 set column_1 = 0|
call bug1653(); call bug1653()|
ERROR 42S22: Unknown column 'column_1' in 'field list' ERROR 42S22: Unknown column 'column_1' in 'field list'
drop table t3; drop table t3|
create table t3 (column_1 int); create table t3 (column_1 int)|
call bug1653(); call bug1653()|
drop procedure bug1653; drop procedure bug1653|
drop table t3; drop table t3|
drop table t1; drop table t1|
mysql-test/r/sp.result
View file @ bc748bef
...@@ -38,9 +38,9 @@ bar 666 ...@@ -38,9 +38,9 @@ bar 666
delete from t1; delete from t1;
create procedure empty() create procedure empty()
begin begin
end; end|
call empty(); call empty()|
drop procedure empty; drop procedure empty|
create procedure scope(a int, b float) create procedure scope(a int, b float)
begin begin
declare b int; declare b int;
...@@ -48,35 +48,35 @@ declare c float; ...@@ -48,35 +48,35 @@ declare c float;
begin begin
declare c int; declare c int;
end; end;
end; end|
drop procedure scope; drop procedure scope|
create procedure two(x1 char(16), x2 char(16), y int) create procedure two(x1 char(16), x2 char(16), y int)
begin begin
insert into test.t1 values (x1, y); insert into test.t1 values (x1, y);
insert into test.t1 values (x2, y); insert into test.t1 values (x2, y);
end; end|
call two("one", "two", 3); call two("one", "two", 3)|
select * from t1; select * from t1|
id data id data
one 3 one 3
two 3 two 3
delete from t1; delete from t1|
drop procedure two; drop procedure two|
create procedure locset(x char(16), y int) create procedure locset(x char(16), y int)
begin begin
declare z1, z2 int; declare z1, z2 int;
set z1 = y; set z1 = y;
set z2 = z1+2; set z2 = z1+2;
insert into test.t1 values (x, z2); insert into test.t1 values (x, z2);
end; end|
call locset("locset", 19); call locset("locset", 19)|
select * from t1; select * from t1|
id data id data
locset 21 locset 21
delete from t1; delete from t1|
drop procedure locset; drop procedure locset|
drop table if exists t3; drop table if exists t3|
create table t3 ( d date, i int, f double, s varchar(32) ); create table t3 ( d date, i int, f double, s varchar(32) )|
create procedure nullset() create procedure nullset()
begin begin
declare ld date; declare ld date;
...@@ -91,9 +91,9 @@ insert into t3 (i, f, s) values ((ld is null), 1, "ld is null"), ...@@ -91,9 +91,9 @@ insert into t3 (i, f, s) values ((ld is null), 1, "ld is null"),
((lf is null), 1, "lf is null"), ((lf is null), 1, "lf is null"),
((lf = 0), null, "lf = 0"), ((lf = 0), null, "lf = 0"),
((ls is null), 1, "ls is null"); ((ls is null), 1, "ls is null");
end; end|
call nullset(); call nullset()|
select * from t3; select * from t3|
d i f s d i f s
NULL NULL NULL NULL NULL NULL NULL NULL
NULL 1 1 ld is null NULL 1 1 ld is null
...@@ -102,140 +102,141 @@ NULL NULL NULL li = 0 ...@@ -102,140 +102,141 @@ NULL NULL NULL li = 0
NULL 1 1 lf is null NULL 1 1 lf is null
NULL NULL NULL lf = 0 NULL NULL NULL lf = 0
NULL 1 1 ls is null NULL 1 1 ls is null
drop table t3; drop table t3|
drop procedure nullset; drop procedure nullset|
create procedure mixset(x char(16), y int) create procedure mixset(x char(16), y int)
begin begin
declare z int; declare z int;
set @z = y, z = 666, max_join_size = 100; set @z = y, z = 666, max_join_size = 100;
insert into test.t1 values (x, z); insert into test.t1 values (x, z);
end; end|
call mixset("mixset", 19); call mixset("mixset", 19)|
show variables like 'max_join_size'; show variables like 'max_join_size'|
Variable_name Value Variable_name Value
max_join_size 100 max_join_size 100
select id,data,@z from t1; select id,data,@z from t1|
id data @z id data @z
mixset 666 19 mixset 666 19
delete from t1; delete from t1|
drop procedure mixset; drop procedure mixset|
create procedure zip(x char(16), y int) create procedure zip(x char(16), y int)
begin begin
declare z int; declare z int;
call zap(y, z); call zap(y, z);
call bar(x, z); call bar(x, z);
end; end|
create procedure zap(x int, out y int) create procedure zap(x int, out y int)
begin begin
declare z int; declare z int;
set z = x+1, y = z; set z = x+1, y = z;
end; end|
call zip("zip", 99); call zip("zip", 99)|
select * from t1; select * from t1|
id data id data
zip 100 zip 100
delete from t1; delete from t1|
drop procedure zip; drop procedure zip|
drop procedure bar; drop procedure bar|
call zap(7, @zap); call zap(7, @zap)|
select @zap; select @zap|
@zap @zap
8 8
drop procedure zap; drop procedure zap|
create procedure c1(x int) create procedure c1(x int)
call c2("c", x); call c2("c", x)|
create procedure c2(s char(16), x int) create procedure c2(s char(16), x int)
call c3(x, s); call c3(x, s)|
create procedure c3(x int, s char(16)) create procedure c3(x int, s char(16))
call c4("level", x, s); call c4("level", x, s)|
create procedure c4(l char(8), x int, s char(16)) create procedure c4(l char(8), x int, s char(16))
insert into t1 values (concat(l,s), x); insert into t1 values (concat(l,s), x)|
call c1(42); call c1(42)|
select * from t1; select * from t1|
id data id data
levelc 42 levelc 42
delete from t1; delete from t1|
drop procedure c1; drop procedure c1|
drop procedure c2; drop procedure c2|
drop procedure c3; drop procedure c3|
drop procedure c4; drop procedure c4|
create procedure iotest(x1 char(16), x2 char(16), y int) create procedure iotest(x1 char(16), x2 char(16), y int)
begin begin
call inc2(x2, y); call inc2(x2, y);
insert into test.t1 values (x1, y); insert into test.t1 values (x1, y);
end; end|
create procedure inc2(x char(16), y int) create procedure inc2(x char(16), y int)
begin begin
call inc(y); call inc(y);
insert into test.t1 values (x, y); insert into test.t1 values (x, y);
end; end|
create procedure inc(inout io int) create procedure inc(inout io int)
set io = io + 1; set io = io + 1|
call iotest("io1", "io2", 1); call iotest("io1", "io2", 1)|
select * from t1; select * from t1|
id data id data
io2 2 io2 2
io1 1 io1 1
delete from t1; delete from t1|
drop procedure iotest; drop procedure iotest|
drop procedure inc2; drop procedure inc2|
create procedure incr(inout x int) create procedure incr(inout x int)
call inc(x); call inc(x)|
select @zap; select @zap|
@zap @zap
8 8
call incr(@zap); call incr(@zap)|
select @zap; select @zap|
@zap @zap
9 9
drop procedure inc; drop procedure inc|
drop procedure incr; drop procedure incr|
create procedure cbv1() create procedure cbv1()
begin begin
declare y int default 3; declare y int default 3;
call cbv2(y+1, y); call cbv2(y+1, y);
insert into test.t1 values ("cbv1", y); insert into test.t1 values ("cbv1", y);
end; end|
create procedure cbv2(y1 int, inout y2 int) create procedure cbv2(y1 int, inout y2 int)
begin begin
set y2 = 4711; set y2 = 4711;
insert into test.t1 values ("cbv2", y1); insert into test.t1 values ("cbv2", y1);
end; end|
call cbv1(); call cbv1()|
select * from t1; select * from t1|
id data id data
cbv2 4 cbv2 4
cbv1 4711 cbv1 4711
delete from t1; delete from t1|
drop procedure cbv1; drop procedure cbv1|
drop procedure cbv2; drop procedure cbv2|
insert into t2 values ("a", 1, 1.1), ("b", 2, 1.2), ("c", 3, 1.3); insert into t2 values ("a", 1, 1.1), ("b", 2, 1.2), ("c", 3, 1.3)|
create procedure sub1(id char(16), x int) create procedure sub1(id char(16), x int)
insert into test.t1 values (id, x); insert into test.t1 values (id, x)|
create function sub3(i int) returns int create function sub3(i int) returns int
return i+1; return i+1|
call sub1("sub1a", (select 7)); call sub1("sub1a", (select 7))|
call sub1("sub1b", (select max(i) from t2)); call sub1("sub1b", (select max(i) from t2))|
call sub1("sub1c", (select i,d from t2 limit 1)); call sub1("sub1c", (select i,d from t2 limit 1))|
call sub1("sub1d", (select 1 from (select 1) a)); call sub1("sub1d", (select 1 from (select 1) a))|
select * from t1; select * from t1|
id data id data
sub1a 7 sub1a 7
sub1b 3 sub1b 3
sub1c 1 sub1c 1
sub1d 1 sub1d 1
select sub3((select max(i) from t2)); select sub3((select max(i) from t2))|
sub3((select max(i) from t2)) sub3((select max(i) from t2))
4 4
drop procedure sub1; drop procedure sub1|
drop function sub3; drop function sub3|
delete from t2|
create procedure a0(x int) create procedure a0(x int)
while x do while x do
set x = x-1; set x = x-1;
insert into test.t1 values ("a0", x); insert into test.t1 values ("a0", x);
end while; end while|
call a0(3); call a0(3)|
select * from t1; select * from t1|
id data id data
sub1a 7 sub1a 7
sub1b 3 sub1b 3
...@@ -244,68 +245,68 @@ sub1d 1 ...@@ -244,68 +245,68 @@ sub1d 1
a0 2 a0 2
a0 1 a0 1
a0 0 a0 0
delete from t1; delete from t1|
drop procedure a0; drop procedure a0|
create procedure a(x int) create procedure a(x int)
while x > 0 do while x > 0 do
set x = x-1; set x = x-1;
insert into test.t1 values ("a", x); insert into test.t1 values ("a", x);
end while; end while|
call a(3); call a(3)|
select * from t1; select * from t1|
id data id data
a 2 a 2
a 1 a 1
a 0 a 0
delete from t1; delete from t1|
drop procedure a; drop procedure a|
create procedure b(x int) create procedure b(x int)
repeat repeat
insert into test.t1 values (repeat("b",3), x); insert into test.t1 values (repeat("b",3), x);
set x = x-1; set x = x-1;
until x = 0 end repeat; until x = 0 end repeat|
call b(3); call b(3)|
select * from t1; select * from t1|
id data id data
bbb 3 bbb 3
bbb 2 bbb 2
bbb 1 bbb 1
delete from t1; delete from t1|
drop procedure b; drop procedure b|
create procedure b2(x int) create procedure b2(x int)
repeat(select 1 into outfile 'b2'); repeat(select 1 into outfile 'b2');
insert into test.t1 values (repeat("b2",3), x); insert into test.t1 values (repeat("b2",3), x);
set x = x-1; set x = x-1;
until x = 0 end repeat; until x = 0 end repeat|
drop procedure b2; drop procedure b2|
create procedure c(x int) create procedure c(x int)
hmm: while x > 0 do hmm: while x > 0 do
insert into test.t1 values ("c", x); insert into test.t1 values ("c", x);
set x = x-1; set x = x-1;
iterate hmm; iterate hmm;
insert into test.t1 values ("x", x); insert into test.t1 values ("x", x);
end while hmm; end while hmm|
call c(3); call c(3)|
select * from t1; select * from t1|
id data id data
c 3 c 3
c 2 c 2
c 1 c 1
delete from t1; delete from t1|
drop procedure c; drop procedure c|
create procedure d(x int) create procedure d(x int)
hmm: while x > 0 do hmm: while x > 0 do
insert into test.t1 values ("d", x); insert into test.t1 values ("d", x);
set x = x-1; set x = x-1;
leave hmm; leave hmm;
insert into test.t1 values ("x", x); insert into test.t1 values ("x", x);
end while; end while|
call d(3); call d(3)|
select * from t1; select * from t1|
id data id data
d 3 d 3
delete from t1; delete from t1|
drop procedure d; drop procedure d|
create procedure e(x int) create procedure e(x int)
foo: loop foo: loop
if x = 0 then if x = 0 then
...@@ -313,15 +314,15 @@ leave foo; ...@@ -313,15 +314,15 @@ leave foo;
end if; end if;
insert into test.t1 values ("e", x); insert into test.t1 values ("e", x);
set x = x-1; set x = x-1;
end loop foo; end loop foo|
call e(3); call e(3)|
select * from t1; select * from t1|
id data id data
e 3 e 3
e 2 e 2
e 1 e 1
delete from t1; delete from t1|
drop procedure e; drop procedure e|
create procedure f(x int) create procedure f(x int)
if x < 0 then if x < 0 then
insert into test.t1 values ("f", 0); insert into test.t1 values ("f", 0);
...@@ -329,17 +330,17 @@ elseif x = 0 then ...@@ -329,17 +330,17 @@ elseif x = 0 then
insert into test.t1 values ("f", 1); insert into test.t1 values ("f", 1);
else else
insert into test.t1 values ("f", 2); insert into test.t1 values ("f", 2);
end if; end if|
call f(-2); call f(-2)|
call f(0); call f(0)|
call f(4); call f(4)|
select * from t1; select * from t1|
id data id data
f 0 f 0
f 1 f 1
f 2 f 2
delete from t1; delete from t1|
drop procedure f; drop procedure f|
create procedure g(x int) create procedure g(x int)
case case
when x < 0 then when x < 0 then
...@@ -348,17 +349,17 @@ when x = 0 then ...@@ -348,17 +349,17 @@ when x = 0 then
insert into test.t1 values ("g", 1); insert into test.t1 values ("g", 1);
else else
insert into test.t1 values ("g", 2); insert into test.t1 values ("g", 2);
end case; end case|
call g(-42); call g(-42)|
call g(0); call g(0)|
call g(1); call g(1)|
select * from t1; select * from t1|
id data id data
g 0 g 0
g 1 g 1
g 2 g 2
delete from t1; delete from t1|
drop procedure g; drop procedure g|
create procedure h(x int) create procedure h(x int)
case x case x
when 0 then when 0 then
...@@ -367,17 +368,17 @@ when 1 then ...@@ -367,17 +368,17 @@ when 1 then
insert into test.t1 values ("h1", x); insert into test.t1 values ("h1", x);
else else
insert into test.t1 values ("h?", x); insert into test.t1 values ("h?", x);
end case; end case|
call h(0); call h(0)|
call h(1); call h(1)|
call h(17); call h(17)|
select * from t1; select * from t1|
id data id data
h0 0 h0 0
h1 1 h1 1
h? 17 h? 17
delete from t1; delete from t1|
drop procedure h; drop procedure h|
create procedure i(x int) create procedure i(x int)
foo: foo:
begin begin
...@@ -385,133 +386,159 @@ if x = 0 then ...@@ -385,133 +386,159 @@ if x = 0 then
leave foo; leave foo;
end if; end if;
insert into test.t1 values ("i", x); insert into test.t1 values ("i", x);
end foo; end foo|
call i(0); call i(0)|
call i(3); call i(3)|
select * from t1; select * from t1|
id data id data
i 3 i 3
delete from t1; delete from t1|
drop procedure i; drop procedure i|
insert into t1 values ("foo", 3), ("bar", 19)|
insert into t2 values ("x", 9, 4.1), ("y", -1, 19.2), ("z", 3, 2.2)|
create procedure sel1()
begin
select * from t1;
end|
call sel1()|
id data
foo 3
bar 19
drop procedure sel1|
create procedure sel2()
begin
select * from t1;
select * from t2;
end|
call sel2()|
id data
foo 3
bar 19
s i d
x 9 4.1
y -1 19.2
z 3 2.2
drop procedure sel2|
delete from t1|
delete from t2|
create procedure into_test(x char(16), y int) create procedure into_test(x char(16), y int)
begin begin
insert into test.t1 values (x, y); insert into test.t1 values (x, y);
select id,data into x,y from test.t1 limit 1; select id,data into x,y from test.t1 limit 1;
insert into test.t1 values (concat(x, "2"), y+2); insert into test.t1 values (concat(x, "2"), y+2);
end; end|
call into_test("into", 100); call into_test("into", 100)|
select * from t1; select * from t1|
id data id data
into 100 into 100
into2 102 into2 102
delete from t1; delete from t1|
drop procedure into_test; drop procedure into_test|
create procedure into_test2(x char(16), y int) create procedure into_test2(x char(16), y int)
begin begin
insert into test.t1 values (x, y); insert into test.t1 values (x, y);
select id,data into x,@z from test.t1 limit 1; select id,data into x,@z from test.t1 limit 1;
insert into test.t1 values (concat(x, "2"), y+2); insert into test.t1 values (concat(x, "2"), y+2);
end; end|
call into_test2("into", 100); call into_test2("into", 100)|
select id,data,@z from t1; select id,data,@z from t1|
id data @z id data @z
into 100 100 into 100 100
into2 102 100 into2 102 100
delete from t1; delete from t1|
drop procedure into_test2; drop procedure into_test2|
create procedure into_test3() create procedure into_test3()
begin begin
declare x char(16); declare x char(16);
declare y int; declare y int;
select * into x,y from test.t1 limit 1; select * into x,y from test.t1 limit 1;
insert into test.t2 values (x, y, 0.0); insert into test.t2 values (x, y, 0.0);
end; end|
insert into t1 values ("into3", 19); insert into t1 values ("into3", 19)|
delete from t2; call into_test3()|
call into_test3(); call into_test3()|
call into_test3(); select * from t2|
select * from t2;
s i d s i d
into3 19 0 into3 19 0
into3 19 0 into3 19 0
delete from t1; delete from t1|
delete from t2; delete from t2|
drop procedure into_test3; drop procedure into_test3|
create procedure into_test4() create procedure into_test4()
begin begin
declare x int; declare x int;
select data into x from test.t1 limit 1; select data into x from test.t1 limit 1;
insert into test.t3 values ("into4", x); insert into test.t3 values ("into4", x);
end; end|
delete from t1; delete from t1|
drop table if exists t3; drop table if exists t3|
create table t3 ( s char(16), d int); create table t3 ( s char(16), d int)|
call into_test4(); call into_test4()|
Warnings: Warnings:
select * from t3; select * from t3|
s d s d
into4 NULL into4 NULL
insert into t1 values ("i4", 77); insert into t1 values ("i4", 77)|
call into_test4(); call into_test4()|
select * from t3; select * from t3|
s d s d
into4 NULL into4 NULL
into4 77 into4 77
delete from t1; delete from t1|
drop table t3; drop table t3|
drop procedure into_test4; drop procedure into_test4|
create procedure into_outfile(x char(16), y int) create procedure into_outfile(x char(16), y int)
begin begin
insert into test.t1 values (x, y); insert into test.t1 values (x, y);
select * into outfile "/tmp/spout" from test.t1; select * into outfile "/tmp/spout" from test.t1;
insert into test.t1 values (concat(x, "2"), y+2); insert into test.t1 values (concat(x, "2"), y+2);
end; end|
call into_outfile("ofile", 1); call into_outfile("ofile", 1)|
delete from t1; delete from t1|
drop procedure into_outfile; drop procedure into_outfile|
create procedure into_dumpfile(x char(16), y int) create procedure into_dumpfile(x char(16), y int)
begin begin
insert into test.t1 values (x, y); insert into test.t1 values (x, y);
select * into dumpfile "/tmp/spdump" from test.t1 limit 1; select * into dumpfile "/tmp/spdump" from test.t1 limit 1;
insert into test.t1 values (concat(x, "2"), y+2); insert into test.t1 values (concat(x, "2"), y+2);
end; end|
call into_dumpfile("dfile", 1); call into_dumpfile("dfile", 1)|
delete from t1; delete from t1|
drop procedure into_dumpfile; drop procedure into_dumpfile|
create procedure create_select(x char(16), y int) create procedure create_select(x char(16), y int)
begin begin
insert into test.t1 values (x, y); insert into test.t1 values (x, y);
create table test.t3 select * from test.t1; create table test.t3 select * from test.t1;
insert into test.t3 values (concat(x, "2"), y+2); insert into test.t3 values (concat(x, "2"), y+2);
end; end|
drop table if exists t3; drop table if exists t3|
call create_select("cs", 90); call create_select("cs", 90)|
select * from t1, t3; select * from t1, t3|
id data id data id data id data
cs 90 cs 90 cs 90 cs 90
cs 90 cs2 92 cs 90 cs2 92
drop table if exists t3; drop table if exists t3|
delete from t1; delete from t1|
drop procedure create_select; drop procedure create_select|
create function e() returns double create function e() returns double
return 2.7182818284590452354; return 2.7182818284590452354|
set @e = e(); set @e = e()|
select e(), @e; select e(), @e|
e() @e e() @e
2.718281828459 2.718281828459 2.718281828459 2.718281828459
create function inc(i int) returns int create function inc(i int) returns int
return i+1; return i+1|
select inc(1), inc(99), inc(-71); select inc(1), inc(99), inc(-71)|
inc(1) inc(99) inc(-71) inc(1) inc(99) inc(-71)
2 100 -70 2 100 -70
create function mul(x int, y int) returns int create function mul(x int, y int) returns int
return x*y; return x*y|
select mul(1,1), mul(3,5), mul(4711, 666); select mul(1,1), mul(3,5), mul(4711, 666)|
mul(1,1) mul(3,5) mul(4711, 666) mul(1,1) mul(3,5) mul(4711, 666)
1 15 3137526 1 15 3137526
create function append(s1 char(8), s2 char(8)) returns char(16) create function append(s1 char(8), s2 char(8)) returns char(16)
return concat(s1, s2); return concat(s1, s2)|
select append("foo", "bar"); select append("foo", "bar")|
append("foo", "bar") append("foo", "bar")
foobar foobar
create function fac(n int unsigned) returns bigint unsigned create function fac(n int unsigned) returns bigint unsigned
...@@ -522,37 +549,37 @@ set f = f * n; ...@@ -522,37 +549,37 @@ set f = f * n;
set n = n - 1; set n = n - 1;
end while; end while;
return f; return f;
end; end|
select fac(1), fac(2), fac(5), fac(10); select fac(1), fac(2), fac(5), fac(10)|
fac(1) fac(2) fac(5) fac(10) fac(1) fac(2) fac(5) fac(10)
1 2 120 3628800 1 2 120 3628800
create function fun(d double, i int, u int unsigned) returns double create function fun(d double, i int, u int unsigned) returns double
return mul(inc(i), fac(u)) / e(); return mul(inc(i), fac(u)) / e()|
select fun(2.3, 3, 5); select fun(2.3, 3, 5)|
fun(2.3, 3, 5) fun(2.3, 3, 5)
176.58213176229 176.58213176229
insert into t2 values (append("xxx", "yyy"), mul(4,3), e()); insert into t2 values (append("xxx", "yyy"), mul(4,3), e())|
insert into t2 values (append("a", "b"), mul(2,mul(3,4)), fun(1.7, 4, 6)); insert into t2 values (append("a", "b"), mul(2,mul(3,4)), fun(1.7, 4, 6))|
select * from t2 where s = append("a", "b"); select * from t2 where s = append("a", "b")|
s i d s i d
ab 24 1324.36598821719 ab 24 1324.36598821719
select * from t2 where i = mul(4,3) or i = mul(mul(3,4),2); select * from t2 where i = mul(4,3) or i = mul(mul(3,4),2)|
s i d s i d
xxxyyy 12 2.71828182845905 xxxyyy 12 2.71828182845905
ab 24 1324.36598821719 ab 24 1324.36598821719
select * from t2 where d = e(); select * from t2 where d = e()|
s i d s i d
xxxyyy 12 2.71828182845905 xxxyyy 12 2.71828182845905
select * from t2; select * from t2|
s i d s i d
xxxyyy 12 2.71828182845905 xxxyyy 12 2.71828182845905
ab 24 1324.36598821719 ab 24 1324.36598821719
delete from t2; delete from t2|
drop function e; drop function e|
drop function inc; drop function inc|
drop function mul; drop function mul|
drop function append; drop function append|
drop function fun; drop function fun|
create procedure hndlr1(val int) create procedure hndlr1(val int)
begin begin
declare x int default 0; declare x int default 0;
...@@ -564,13 +591,13 @@ insert into test.t666 values ("hndlr1", val); # Non-existing table ...@@ -564,13 +591,13 @@ insert into test.t666 values ("hndlr1", val); # Non-existing table
if (x) then if (x) then
insert into test.t1 values ("hndlr1", val); # This instead then insert into test.t1 values ("hndlr1", val); # This instead then
end if; end if;
end; end|
call hndlr1(42); call hndlr1(42)|
select * from t1; select * from t1|
id data id data
hndlr1 42 hndlr1 42
delete from t1; delete from t1|
drop procedure hndlr1; drop procedure hndlr1|
create procedure hndlr2(val int) create procedure hndlr2(val int)
begin begin
declare x int default 0; declare x int default 0;
...@@ -579,13 +606,13 @@ declare exit handler for sqlstate '42S02' set x = 1; ...@@ -579,13 +606,13 @@ declare exit handler for sqlstate '42S02' set x = 1;
insert into test.t666 values ("hndlr2", val); # Non-existing table insert into test.t666 values ("hndlr2", val); # Non-existing table
end; end;
insert into test.t1 values ("hndlr2", x); insert into test.t1 values ("hndlr2", x);
end; end|
call hndlr2(42); call hndlr2(42)|
select * from t1; select * from t1|
id data id data
hndlr2 1 hndlr2 1
delete from t1; delete from t1|
drop procedure hndlr2; drop procedure hndlr2|
create procedure hndlr3(val int) create procedure hndlr3(val int)
begin begin
declare x int default 0; declare x int default 0;
...@@ -605,15 +632,15 @@ insert into test.t1 values ("hndlr3", y); ...@@ -605,15 +632,15 @@ insert into test.t1 values ("hndlr3", y);
end if; end if;
end; end;
end if; end if;
end; end|
call hndlr3(3); call hndlr3(3)|
select * from t1; select * from t1|
id data id data
hndlr3 13 hndlr3 13
delete from t1; delete from t1|
drop procedure hndlr3; drop procedure hndlr3|
drop table if exists t3; drop table if exists t3|
create table t3 ( id char(16), data int ); create table t3 ( id char(16), data int )|
create procedure hndlr4() create procedure hndlr4()
begin begin
declare x int default 0; declare x int default 0;
...@@ -621,13 +648,13 @@ declare val int; # No default ...@@ -621,13 +648,13 @@ declare val int; # No default
declare continue handler for sqlstate '02000' set x=1; declare continue handler for sqlstate '02000' set x=1;
select data into val from test.t3 where id='z' limit 1; # No hits select data into val from test.t3 where id='z' limit 1; # No hits
insert into test.t3 values ('z', val); insert into test.t3 values ('z', val);
end; end|
call hndlr4(); call hndlr4()|
select * from t3; select * from t3|
id data id data
z NULL z NULL
drop table t3; drop table t3|
drop procedure hndlr4; drop procedure hndlr4|
create procedure cur1() create procedure cur1()
begin begin
declare done int default 0; declare done int default 0;
...@@ -644,17 +671,17 @@ insert into test.t1 values (a, b+c); ...@@ -644,17 +671,17 @@ insert into test.t1 values (a, b+c);
end if; end if;
until done end repeat; until done end repeat;
close c; 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()|
select * from t1; select * from t1|
id data id data
foo 40 foo 40
bar 15 bar 15
zap 663 zap 663
drop procedure cur1; drop procedure cur1|
drop table if exists t3; drop table if exists t3|
create table t3 ( s char(16), i int ); create table t3 ( s char(16), i int )|
create procedure cur2() create procedure cur2()
begin begin
declare done int default 0; declare done int default 0;
...@@ -680,56 +707,56 @@ end; ...@@ -680,56 +707,56 @@ end;
until done end repeat; until done end repeat;
close c1; close c1;
close c2; close c2;
end; end|
call cur2(); call cur2()|
select * from t3; select * from t3|
s i s i
foo 40 foo 40
bar 3 bar 3
zap 663 zap 663
delete from t1; delete from t1|
delete from t2; delete from t2|
drop table t3; drop table t3|
drop procedure cur2; drop procedure cur2|
create procedure chistics() create procedure chistics()
language sql language sql
not deterministic not deterministic
sql security definer sql security definer
comment 'Characteristics procedure test' comment 'Characteristics procedure test'
insert into t1 values ("chistics", 1); insert into t1 values ("chistics", 1)|
call chistics(); call chistics()|
select * from t1; select * from t1|
id data id data
chistics 1 chistics 1
delete from t1; delete from t1|
alter procedure chistics sql security invoker name chistics2; alter procedure chistics sql security invoker name chistics2|
show create procedure chistics2; show create procedure chistics2|
Procedure Create Procedure Procedure Create Procedure
chistics2 CREATE PROCEDURE chistics2() chistics2 CREATE PROCEDURE chistics2()
SQL SECURITY INVOKER SQL SECURITY INVOKER
COMMENT 'Characteristics procedure test' COMMENT 'Characteristics procedure test'
insert into t1 values ("chistics", 1) insert into t1 values ("chistics", 1)
drop procedure chistics2; drop procedure chistics2|
create function chistics() returns int create function chistics() returns int
language sql language sql
deterministic deterministic
sql security invoker sql security invoker
comment 'Characteristics procedure test' comment 'Characteristics procedure test'
return 42; return 42|
select chistics(); select chistics()|
chistics() chistics()
42 42
alter function chistics name chistics2 comment 'Characteristics function test'; alter function chistics name chistics2 comment 'Characteristics function test'|
show create function chistics2; show create function chistics2|
Function Create Function Function Create Function
chistics2 CREATE FUNCTION chistics2() RETURNS int chistics2 CREATE FUNCTION chistics2() RETURNS int
DETERMINISTIC DETERMINISTIC
SQL SECURITY INVOKER SQL SECURITY INVOKER
COMMENT 'Characteristics function test' COMMENT 'Characteristics function test'
return 42 return 42
drop function chistics2; drop function chistics2|
insert into t1 values ("foo", 1), ("bar", 2), ("zip", 3); insert into t1 values ("foo", 1), ("bar", 2), ("zip", 3)|
set @@sql_mode = 'ANSI'; set @@sql_mode = 'ANSI'|
create procedure modes(out c1 int, out c2 int) create procedure modes(out c1 int, out c2 int)
begin begin
declare done int default 0; declare done int default 0;
...@@ -746,16 +773,16 @@ set c2 = c2 + 1; ...@@ -746,16 +773,16 @@ set c2 = c2 + 1;
end if; end if;
until done end repeat; until done end repeat;
close c; close c;
end; 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)|
set sql_select_limit = default; set sql_select_limit = default|
select @c1, @c2; select @c1, @c2|
@c1 @c2 @c1 @c2
12 3 12 3
delete from t1; delete from t1|
drop procedure modes; drop procedure modes|
create procedure bug822(a_id char(16), a_data int) create procedure bug822(a_id char(16), a_data int)
begin begin
declare n int; declare n int;
...@@ -763,16 +790,16 @@ select count(*) into n from t1 where id = a_id and data = a_data; ...@@ -763,16 +790,16 @@ select count(*) into n from t1 where id = a_id and data = a_data;
if n = 0 then if n = 0 then
insert into t1 (id, data) values (a_id, a_data); insert into t1 (id, data) values (a_id, a_data);
end if; end if;
end; end|
call bug822('foo', 42); call bug822('foo', 42)|
call bug822('foo', 42); call bug822('foo', 42)|
call bug822('bar', 666); call bug822('bar', 666)|
select * from t1; select * from t1|
id data id data
foo 42 foo 42
bar 666 bar 666
delete from t1; delete from t1|
drop procedure bug822; drop procedure bug822|
create procedure bug1495() create procedure bug1495()
begin begin
declare x int; declare x int;
...@@ -782,19 +809,19 @@ insert into t1 values ("less", x-10); ...@@ -782,19 +809,19 @@ insert into t1 values ("less", x-10);
else else
insert into t1 values ("more", x+10); insert into t1 values ("more", x+10);
end if; end if;
end; end|
insert into t1 values ('foo', 12); insert into t1 values ('foo', 12)|
call bug1495(); call bug1495()|
delete from t1 where id='foo'; delete from t1 where id='foo'|
insert into t1 values ('bar', 7); insert into t1 values ('bar', 7)|
call bug1495(); call bug1495()|
delete from t1 where id='bar'; delete from t1 where id='bar'|
select * from t1; select * from t1|
id data id data
less 2 less 2
more 17 more 17
delete from t1; delete from t1|
drop procedure bug1495; drop procedure bug1495|
create procedure bug1547(s char(16)) create procedure bug1547(s char(16))
begin begin
declare x int; declare x int;
...@@ -804,44 +831,44 @@ insert into t1 values ("less", x-10); ...@@ -804,44 +831,44 @@ insert into t1 values ("less", x-10);
else else
insert into t1 values ("more", x+10); insert into t1 values ("more", x+10);
end if; end if;
end; end|
insert into t1 values ("foo", 12), ("bar", 7); insert into t1 values ("foo", 12), ("bar", 7)|
call bug1547("foo"); call bug1547("foo")|
call bug1547("bar"); call bug1547("bar")|
select * from t1; select * from t1|
id data id data
foo 12 foo 12
bar 7 bar 7
less 2 less 2
more 17 more 17
delete from t1; delete from t1|
drop procedure bug1547; drop procedure bug1547|
drop table if exists t70; drop table if exists t70|
create table t70 (s1 int,s2 int); create table t70 (s1 int,s2 int)|
insert into t70 values (1,2); insert into t70 values (1,2)|
create procedure bug1656(out p1 int, out p2 int) create procedure bug1656(out p1 int, out p2 int)
select * into p1, p1 from t70; select * into p1, p1 from t70|
call bug1656(@1, @2); call bug1656(@1, @2)|
select @1, @2; select @1, @2|
@1 @2 @1 @2
2 NULL 2 NULL
drop table t70; drop table t70|
drop procedure bug1656; drop procedure bug1656|
drop table if exists t3; drop table if exists t3|
create table t3(a int); create table t3(a int)|
create procedure bug1862() create procedure bug1862()
begin begin
insert into t3 values(2); insert into t3 values(2);
flush tables; flush tables;
end; end|
call bug1862(); call bug1862()|
call bug1862(); call bug1862()|
select * from t3; select * from t3|
a a
2 2
2 2
drop table t3; drop table t3|
drop procedure bug1862; drop procedure bug1862|
create procedure bug1874() create procedure bug1874()
begin begin
declare x int; declare x int;
...@@ -854,20 +881,20 @@ select sum(data) into x from t1; ...@@ -854,20 +881,20 @@ select sum(data) into x from t1;
insert into t2 values ("sum", x, 0); insert into t2 values ("sum", x, 0);
select avg(data) into y from t1; select avg(data) into y from t1;
insert into t2 values ("avg", 0, y); insert into t2 values ("avg", 0, y);
end; end|
insert into t1 (data) values (3), (1), (5), (9), (4); insert into t1 (data) values (3), (1), (5), (9), (4)|
call bug1874(); call bug1874()|
select * from t2; select * from t2|
s i d s i d
max 9 0 max 9 0
min 1 0 min 1 0
sum 22 0 sum 22 0
avg 0 4.4 avg 0 4.4
delete from t1; delete from t1|
delete from t2; delete from t2|
drop procedure bug1874; drop procedure bug1874|
drop table if exists fac; drop table if exists fac|
create table fac (n int unsigned not null primary key, f bigint unsigned); create table fac (n int unsigned not null primary key, f bigint unsigned)|
create procedure ifac(n int unsigned) create procedure ifac(n int unsigned)
begin begin
declare i int unsigned default 1; declare i int unsigned default 1;
...@@ -880,9 +907,9 @@ insert into test.fac values (i, fac(i)); ...@@ -880,9 +907,9 @@ insert into test.fac values (i, fac(i));
set i = i + 1; set i = i + 1;
end; end;
end while; end while;
end; end|
call ifac(20); call ifac(20)|
select * from fac; select * from fac|
n f n f
1 1 1 1
2 2 2 2
...@@ -904,19 +931,19 @@ n f ...@@ -904,19 +931,19 @@ n f
18 6402373705728000 18 6402373705728000
19 121645100408832000 19 121645100408832000
20 2432902008176640000 20 2432902008176640000
drop table fac; drop table fac|
show function status like '%f%'; show function status like '%f%'|
Name Type Definer Modified Created Security_type Comment Name Type Definer Modified Created Security_type Comment
fac FUNCTION root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER fac FUNCTION root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
drop procedure ifac; drop procedure ifac|
drop function fac; drop function fac|
show function status like '%f%'; show function status like '%f%'|
Name Type Definer Modified Created Security_type Comment Name Type Definer Modified Created Security_type Comment
drop table if exists primes; drop table if exists primes|
create table primes ( create table primes (
i int unsigned not null primary key, i int unsigned not null primary key,
p bigint unsigned not null p bigint unsigned not null
); )|
insert into primes values insert into primes values
( 0, 3), ( 1, 5), ( 2, 7), ( 3, 11), ( 4, 13), ( 0, 3), ( 1, 5), ( 2, 7), ( 3, 11), ( 4, 13),
( 5, 17), ( 6, 19), ( 7, 23), ( 8, 29), ( 9, 31), ( 5, 17), ( 6, 19), ( 7, 23), ( 8, 29), ( 9, 31),
...@@ -926,7 +953,7 @@ insert into primes values ...@@ -926,7 +953,7 @@ insert into primes values
(25, 103), (26, 107), (27, 109), (28, 113), (29, 127), (25, 103), (26, 107), (27, 109), (28, 113), (29, 127),
(30, 131), (31, 137), (32, 139), (33, 149), (34, 151), (30, 131), (31, 137), (32, 139), (33, 149), (34, 151),
(35, 157), (36, 163), (37, 167), (38, 173), (39, 179), (35, 157), (36, 163), (37, 167), (38, 173), (39, 179),
(40, 181), (41, 191), (42, 193), (43, 197), (44, 199); (40, 181), (41, 191), (42, 193), (43, 197), (44, 199)|
create procedure opp(n bigint unsigned, out pp bool) create procedure opp(n bigint unsigned, out pp bool)
begin begin
declare r double; declare r double;
...@@ -952,7 +979,7 @@ set s = s+1; ...@@ -952,7 +979,7 @@ set s = s+1;
end; end;
end if; end if;
end loop; end loop;
end; end|
create procedure ip(m int unsigned) create procedure ip(m int unsigned)
begin begin
declare p bigint unsigned; declare p bigint unsigned;
...@@ -969,8 +996,8 @@ end if; ...@@ -969,8 +996,8 @@ end if;
set p = p+2; set p = p+2;
end; end;
end while; end while;
end; end|
show create procedure opp; show create procedure opp|
Procedure Create Procedure Procedure Create Procedure
opp CREATE PROCEDURE opp(n bigint unsigned, out pp bool) opp CREATE PROCEDURE opp(n bigint unsigned, out pp bool)
begin begin
...@@ -998,24 +1025,24 @@ end; ...@@ -998,24 +1025,24 @@ end;
end if; end if;
end loop; end loop;
end end
show procedure status like '%p%'; show procedure status like '%p%'|
Name Type Definer Modified Created Security_type Comment Name Type Definer Modified Created Security_type Comment
ip PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER ip PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
opp PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER opp PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
call ip(200); call ip(200)|
select * from primes where i=45 or i=100 or i=199; select * from primes where i=45 or i=100 or i=199|
i p i p
45 211 45 211
100 557 100 557
199 1229 199 1229
drop table primes; drop table primes|
drop procedure opp; drop procedure opp|
drop procedure ip; drop procedure ip|
show procedure status like '%p%'; show procedure status like '%p%'|
Name Type Definer Modified Created Security_type Comment Name Type Definer Modified Created Security_type Comment
drop table if exists fib; drop table if exists fib|
create table fib ( f bigint unsigned not null ); create table fib ( f bigint unsigned not null )|
insert into fib values (1), (1); insert into fib values (1), (1)|
create procedure fib(n int unsigned) create procedure fib(n int unsigned)
begin begin
if n > 0 then if n > 0 then
...@@ -1030,9 +1057,9 @@ insert into fib values (x+y); ...@@ -1030,9 +1057,9 @@ insert into fib values (x+y);
call fib(n-1); call fib(n-1);
end; end;
end if; end if;
end; end|
call fib(20); call fib(20)|
select * from fib order by f asc; select * from fib order by f asc|
f f
1 1
1 1
...@@ -1056,25 +1083,25 @@ f ...@@ -1056,25 +1083,25 @@ f
6765 6765
10946 10946
17711 17711
drop table fib; drop table fib|
drop procedure fib; drop procedure fib|
create procedure bar(x char(16), y int) create procedure bar(x char(16), y int)
comment "111111111111" sql security invoker comment "111111111111" sql security invoker
insert into test.t1 values (x, y); insert into test.t1 values (x, y)|
show procedure status like 'bar'; show procedure status like 'bar'|
Name Type Definer Modified Created Security_type Comment Name Type Definer Modified Created Security_type Comment
bar PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 INVOKER 111111111111 bar PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 INVOKER 111111111111
alter procedure bar name bar2 comment "2222222222" sql security definer; alter procedure bar name bar2 comment "2222222222" sql security definer|
alter procedure bar2 name bar comment "3333333333"; alter procedure bar2 name bar comment "3333333333"|
alter procedure bar; alter procedure bar|
show create procedure bar; show create procedure bar|
Procedure Create Procedure Procedure Create Procedure
bar CREATE PROCEDURE bar(x char(16), y int) bar CREATE PROCEDURE bar(x char(16), y int)
COMMENT '3333333333' COMMENT '3333333333'
insert into test.t1 values (x, y) insert into test.t1 values (x, y)
show procedure status like 'bar'; show procedure status like 'bar'|
Name Type Definer Modified Created Security_type Comment Name Type Definer Modified Created Security_type Comment
bar PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER 3333333333 bar PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER 3333333333
drop procedure bar; drop procedure bar|
drop table t1; drop table t1;
drop table t2; drop table t2;
mysql-test/r/variables.result
View file @ bc748bef
...@@ -360,7 +360,7 @@ set sql_log_bin=1; ...@@ -360,7 +360,7 @@ set sql_log_bin=1;
set sql_log_off=1; set sql_log_off=1;
set sql_log_update=1; set sql_log_update=1;
Warnings: Warnings:
Note 1298 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored. Note 1299 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
set sql_low_priority_updates=1; set sql_low_priority_updates=1;
set sql_max_join_size=200; set sql_max_join_size=200;
select @@sql_max_join_size,@@max_join_size; select @@sql_max_join_size,@@max_join_size;
......
mysql-test/t/index_merge_innodb.test
View file @ bc748bef
...@@ -14,7 +14,7 @@ create table t1 ...@@ -14,7 +14,7 @@ create table t1
INDEX i1(key1), INDEX i1(key1),
INDEX i2(key2), INDEX i2(key2),
) type=innodb; ) engine=innodb;
--disable_query_log --disable_query_log
let $1=200; let $1=200;
......
mysql-test/t/sp-error.test
View file @ bc748bef
...@@ -32,18 +32,18 @@ create function func1() returns int ...@@ -32,18 +32,18 @@ create function func1() returns int
return 42| return 42|
# Can't create recursively # Can't create recursively
--error 1286 --error 1287
create procedure foo() create procedure foo()
create procedure bar() set @x=3| create procedure bar() set @x=3|
--error 1286 --error 1287
create procedure foo() create procedure foo()
create function bar() returns double return 2.3| create function bar() returns double return 2.3|
# Already exists # Already exists
--error 1287 --error 1288
create procedure proc1() create procedure proc1()
set @x = 42| set @x = 42|
--error 1287 --error 1288
create function func1() returns int create function func1() returns int
return 42| return 42|
...@@ -51,39 +51,39 @@ drop procedure proc1| ...@@ -51,39 +51,39 @@ drop procedure proc1|
drop function func1| drop function func1|
# Does not exist # Does not exist
--error 1288 --error 1289
alter procedure foo| alter procedure foo|
--error 1288 --error 1289
alter function foo| alter function foo|
--error 1288 --error 1289
drop procedure foo| drop procedure foo|
--error 1288 --error 1289
drop function foo| drop function foo|
--error 1288 --error 1289
call foo()| call foo()|
drop procedure if exists foo| drop procedure if exists foo|
--error 1288 --error 1289
show create procedure foo| show create procedure foo|
# LEAVE/ITERATE with no match # LEAVE/ITERATE with no match
--error 1291 --error 1292
create procedure foo() create procedure foo()
foo: loop foo: loop
leave bar; leave bar;
end loop| end loop|
--error 1291 --error 1292
create procedure foo() create procedure foo()
foo: loop foo: loop
iterate bar; iterate bar;
end loop| end loop|
--error 1291 --error 1292
create procedure foo() create procedure foo()
foo: begin foo: begin
iterate foo; iterate foo;
end| end|
# Redefining label # Redefining label
--error 1292 --error 1293
create procedure foo() create procedure foo()
foo: loop foo: loop
foo: loop foo: loop
...@@ -92,7 +92,7 @@ foo: loop ...@@ -92,7 +92,7 @@ foo: loop
end loop foo| end loop foo|
# End label mismatch # End label mismatch
--error 1293 --error 1294
create procedure foo() create procedure foo()
foo: loop foo: loop
set @x=2; set @x=2;
...@@ -106,24 +106,13 @@ begin ...@@ -106,24 +106,13 @@ begin
end| end|
drop procedure foo| drop procedure foo|
# We require INTO in SELECTs for some older clients (as mysql and mysqltest,
# for now).
create procedure foo()
begin
select name from mysql.proc;
select type from mysql.proc;
end|
--error 1295
call foo()|
drop procedure foo|
# RETURN in FUNCTION only # RETURN in FUNCTION only
--error 1296 --error 1297
create procedure foo() create procedure foo()
return 42| return 42|
# Doesn't allow queries in FUNCTIONs (for now :-( ) # Doesn't allow queries in FUNCTIONs (for now :-( )
--error 1297 --error 1298
create function foo() returns int create function foo() returns int
begin begin
declare x int; declare x int;
...@@ -137,19 +126,19 @@ create procedure p(x int) ...@@ -137,19 +126,19 @@ create procedure p(x int)
create function f(x int) returns int create function f(x int) returns int
return x+42| return x+42|
--error 1301 --error 1302
call p()| call p()|
--error 1301 --error 1302
call p(1, 2)| call p(1, 2)|
--error 1301 --error 1302
select f()| select f()|
--error 1301 --error 1302
select f(1, 2)| select f(1, 2)|
drop procedure p| drop procedure p|
drop function f| drop function f|
--error 1302 --error 1303
create procedure p(val int, out res int) create procedure p(val int, out res int)
begin begin
declare x int default 0; declare x int default 0;
...@@ -163,7 +152,7 @@ begin ...@@ -163,7 +152,7 @@ begin
end if; end if;
end| end|
--error 1302 --error 1303
create procedure p(val int, out res int) create procedure p(val int, out res int)
begin begin
declare x int default 0; declare x int default 0;
...@@ -178,7 +167,7 @@ begin ...@@ -178,7 +167,7 @@ begin
end if; end if;
end| end|
--error 1303 --error 1304
create function f(val int) returns int create function f(val int) returns int
begin begin
declare x int; declare x int;
...@@ -196,12 +185,12 @@ begin ...@@ -196,12 +185,12 @@ begin
end if; end if;
end| end|
--error 1304 --error 1305
select f(10)| select f(10)|
drop function f| drop function f|
--error 1305 --error 1306
create procedure p() create procedure p()
begin begin
declare c cursor for insert into test.t1 values ("foo", 42); declare c cursor for insert into test.t1 values ("foo", 42);
...@@ -210,7 +199,7 @@ begin ...@@ -210,7 +199,7 @@ begin
close c; close c;
end| end|
--error 1306 --error 1307
create procedure p() create procedure p()
begin begin
declare x int; declare x int;
...@@ -220,7 +209,7 @@ begin ...@@ -220,7 +209,7 @@ begin
close c; close c;
end| end|
--error 1307 --error 1308
create procedure p() create procedure p()
begin begin
declare c cursor for select * from test.t; declare c cursor for select * from test.t;
...@@ -242,7 +231,7 @@ begin ...@@ -242,7 +231,7 @@ begin
open c; open c;
close c; close c;
end| end|
--error 1308 --error 1309
call p()| call p()|
drop procedure p| drop procedure p|
...@@ -254,11 +243,11 @@ begin ...@@ -254,11 +243,11 @@ begin
close c; close c;
close c; close c;
end| end|
--error 1309 --error 1310
call p()| call p()|
drop procedure p| drop procedure p|
--error 1288 --error 1289
alter procedure bar3 sql security invoker| alter procedure bar3 sql security invoker|
--error 1059 --error 1059
alter procedure bar3 name alter procedure bar3 name
...@@ -272,7 +261,7 @@ drop table if exists t1| ...@@ -272,7 +261,7 @@ drop table if exists t1|
create table t1 (val int, x float)| create table t1 (val int, x float)|
insert into t1 values (42, 3.1), (19, 1.2)| insert into t1 values (42, 3.1), (19, 1.2)|
--error 1310 --error 1311
create procedure p() create procedure p()
begin begin
declare c cursor for select * from t1; declare c cursor for select * from t1;
...@@ -292,7 +281,7 @@ begin ...@@ -292,7 +281,7 @@ begin
fetch c into x; fetch c into x;
close c; close c;
end| end|
--error 1311 --error 1312
call p()| call p()|
drop procedure p| drop procedure p|
...@@ -307,34 +296,34 @@ begin ...@@ -307,34 +296,34 @@ begin
fetch c into x, y, z; fetch c into x, y, z;
close c; close c;
end| end|
--error 1311 --error 1312
call p()| call p()|
drop procedure p| drop procedure p|
--error 1313 --error 1314
create procedure p(in x int, x char(10)) create procedure p(in x int, x char(10))
begin begin
end| end|
--error 1313 --error 1314
create function p(x int, x char(10)) create function p(x int, x char(10))
begin begin
end| end|
--error 1314 --error 1315
create procedure p() create procedure p()
begin begin
declare x float; declare x float;
declare x int; declare x int;
end| end|
--error 1315 --error 1316
create procedure p() create procedure p()
begin begin
declare c condition for 1064; declare c condition for 1064;
declare c condition for 1065; declare c condition for 1065;
end| end|
--error 1316 --error 1317
create procedure p() create procedure p()
begin begin
declare c cursor for select * from t1; declare c cursor for select * from t1;
...@@ -358,13 +347,13 @@ drop procedure bug1965| ...@@ -358,13 +347,13 @@ drop procedure bug1965|
# #
# BUG#1966 # BUG#1966
# #
--error 1310 --error 1311
select 1 into a| select 1 into a|
# #
# BUG#336 # BUG#336
# #
--error 1318 --error 1319
create procedure bug336(id char(16)) create procedure bug336(id char(16))
begin begin
declare x int; declare x int;
...@@ -374,7 +363,7 @@ end| ...@@ -374,7 +363,7 @@ end|
# #
# BUG#1654 # BUG#1654
# #
--error 1297 --error 1298
create function bug1654() create function bug1654()
returns int returns int
return (select sum(t.data) from test.t2 t)| return (select sum(t.data) from test.t2 t)|
......
mysql-test/t/sp.test
View file @ bc748bef
...@@ -289,7 +289,7 @@ select sub3((select max(i) from t2))| ...@@ -289,7 +289,7 @@ select sub3((select max(i) from t2))|
drop procedure sub1| drop procedure sub1|
#drop procedure sub2| #drop procedure sub2|
drop function sub3| drop function sub3|
delete from t2|
# Basic tests of the flow control constructs # Basic tests of the flow control constructs
...@@ -462,6 +462,30 @@ delete from t1| ...@@ -462,6 +462,30 @@ delete from t1|
drop procedure i| drop procedure i|
# SELECT with one of more result set sent back to the clinet
insert into t1 values ("foo", 3), ("bar", 19)|
insert into t2 values ("x", 9, 4.1), ("y", -1, 19.2), ("z", 3, 2.2)|
create procedure sel1()
begin
select * from t1;
end|
call sel1()|
drop procedure sel1|
create procedure sel2()
begin
select * from t1;
select * from t2;
end|
call sel2()|
drop procedure sel2|
delete from t1|
delete from t2|
# SELECT INTO local variables # SELECT INTO local variables
create procedure into_test(x char(16), y int) create procedure into_test(x char(16), y int)
begin begin
...@@ -501,7 +525,6 @@ begin ...@@ -501,7 +525,6 @@ begin
end| end|
insert into t1 values ("into3", 19)| insert into t1 values ("into3", 19)|
delete from t2|
# Two call needed for bug test # Two call needed for bug test
call into_test3()| call into_test3()|
call into_test3()| call into_test3()|
......
sql/lex.h
View file @ bc748bef
...@@ -258,8 +258,8 @@ static SYMBOL symbols[] = { ...@@ -258,8 +258,8 @@ static SYMBOL symbols[] = {
{ "LOGS", SYM(LOGS_SYM),0,0}, { "LOGS", SYM(LOGS_SYM),0,0},
{ "LONG", SYM(LONG_SYM),0,0}, { "LONG", SYM(LONG_SYM),0,0},
{ "LONGBLOB", SYM(LONGBLOB),0,0}, { "LONGBLOB", SYM(LONGBLOB),0,0},
{ "LOOP", SYM(LOOP_SYM),0,0},
{ "LONGTEXT", SYM(LONGTEXT),0,0}, { "LONGTEXT", SYM(LONGTEXT),0,0},
{ "LOOP", SYM(LOOP_SYM),0,0},
{ "LOW_PRIORITY", SYM(LOW_PRIORITY),0,0}, { "LOW_PRIORITY", SYM(LOW_PRIORITY),0,0},
{ "MASTER", SYM(MASTER_SYM),0,0}, { "MASTER", SYM(MASTER_SYM),0,0},
{ "MASTER_CONNECT_RETRY", SYM(MASTER_CONNECT_RETRY_SYM),0,0}, { "MASTER_CONNECT_RETRY", SYM(MASTER_CONNECT_RETRY_SYM),0,0},
...@@ -480,7 +480,6 @@ static SYMBOL symbols[] = { ...@@ -480,7 +480,6 @@ static SYMBOL symbols[] = {
{ "WORK", SYM(WORK_SYM),0,0}, { "WORK", SYM(WORK_SYM),0,0},
{ "WRITE", SYM(WRITE_SYM),0,0}, { "WRITE", SYM(WRITE_SYM),0,0},
{ "WHILE", SYM(WHILE_SYM),0,0}, { "WHILE", SYM(WHILE_SYM),0,0},
{ "NO_WRITE_TO_BINLOG", SYM(NO_WRITE_TO_BINLOG),0,0},
{ "X509", SYM(X509_SYM),0,0}, { "X509", SYM(X509_SYM),0,0},
{ "XOR", SYM(XOR),0,0}, { "XOR", SYM(XOR),0,0},
{ "YEAR", SYM(YEAR_SYM),0,0}, { "YEAR", SYM(YEAR_SYM),0,0},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7