mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
c12cc90d12
run at startup" The server returned an error when trying to execute init-file with a stored procedure that could return multiple result sets to the client. A stored procedure can return multiple result sets if it contains PREPARE, SELECT, SHOW and similar statements. The fix is to set client_capabilites|=CLIENT_MULTI_RESULTS in sql_parse.cc:handle_bootstrap(). There is no "client" really, so nothing is ever sent. This makes init-file feature behave consistently: the prepared statements that can be called directly in the init-file can be used in a stored procedure too. Re-committed the patch originally submitted by Per-Erik after review. mysql-test/Makefile.am: Fix re-make without make clean. mysql-test/r/init_connect.result: Updated results (a test case for Bug#17843) mysql-test/r/init_file.result: Updated results (a test case for Bug#17843) mysql-test/std_data/init_file.dat: Add test coverage for new features added in 5.0. Note, that what can be done in init_file is very limited as it does not support any other delimiter except ';' -- only "one liners" and no multiple statement procedures. Also, this is executed with a dummy user "boot@", which calls for the use of DEFINER clause. mysql-test/t/init_connect.test: Add test coverage for new features added in 5.0. mysql-test/t/init_file.test: Add test coverage for new features added in 5.0 -- stored routines, views, triggers. The actual tests are in std_data/init_file.dat, here we just check the results and clean up. sql/sql_class.cc: Initialize Security_context::priv_host to an empty string: when executing an init-file, sql_parse.cc:get_default_definer() will use this for the value of the definer if it's not set in the query. sql/sql_parse.cc: Set CLIENT_MULTI_RESULTS in handle_bootstrap(), to make prepared statements work in stored procedures called from init-file.
138 lines
2.4 KiB
Text
138 lines
2.4 KiB
Text
select hex(@a);
|
|
hex(@a)
|
|
NULL
|
|
select hex(@a);
|
|
hex(@a)
|
|
610063
|
|
set global init_connect="set @a=2;set @b=3";
|
|
select @a, @b;
|
|
@a @b
|
|
2 3
|
|
set GLOBAL init_connect=DEFAULT;
|
|
select @a;
|
|
@a
|
|
NULL
|
|
set global init_connect="drop table if exists t1; create table t1(a char(10));\
|
|
insert into t1 values ('\0');insert into t1 values('abc')";
|
|
select hex(a) from t1;
|
|
hex(a)
|
|
00
|
|
616263
|
|
set GLOBAL init_connect="adsfsdfsdfs";
|
|
select @a;
|
|
Got one of the listed errors
|
|
drop table t1;
|
|
End of 4.1 tests
|
|
create table t1 (x int);
|
|
insert into t1 values (3), (5), (7);
|
|
create table t2 (y int);
|
|
create user mysqltest1@localhost;
|
|
grant all privileges on test.* to mysqltest1@localhost;
|
|
set global init_connect="create procedure p1() select * from t1";
|
|
call p1();
|
|
x
|
|
3
|
|
5
|
|
7
|
|
drop procedure p1;
|
|
set global init_connect="create procedure p1(x int)\
|
|
begin\
|
|
select count(*) from t1;\
|
|
select * from t1;\
|
|
set @x = x;
|
|
end";
|
|
call p1(42);
|
|
count(*)
|
|
3
|
|
x
|
|
3
|
|
5
|
|
7
|
|
select @x;
|
|
@x
|
|
42
|
|
set global init_connect="call p1(4711)";
|
|
select @x;
|
|
@x
|
|
4711
|
|
set global init_connect="drop procedure if exists p1";
|
|
call p1();
|
|
ERROR 42000: PROCEDURE test.p1 does not exist
|
|
create procedure p1(out sum int)
|
|
begin
|
|
declare n int default 0;
|
|
declare c cursor for select * from t1;
|
|
declare exit handler for not found
|
|
begin
|
|
close c;
|
|
set sum = n;
|
|
end;
|
|
open c;
|
|
loop
|
|
begin
|
|
declare x int;
|
|
fetch c into x;
|
|
if x > 3 then
|
|
set n = n + x;
|
|
end if;
|
|
end;
|
|
end loop;
|
|
end|
|
|
set global init_connect="call p1(@sum)";
|
|
select @sum;
|
|
@sum
|
|
12
|
|
drop procedure p1;
|
|
create procedure p1(tbl char(10), v int)
|
|
begin
|
|
set @s = concat('insert into ', tbl, ' values (?)');
|
|
set @v = v;
|
|
prepare stmt1 from @s;
|
|
execute stmt1 using @v;
|
|
deallocate prepare stmt1;
|
|
end|
|
|
set global init_connect="call p1('t1', 11)";
|
|
select * from t1;
|
|
x
|
|
3
|
|
5
|
|
7
|
|
11
|
|
drop procedure p1;
|
|
create function f1() returns int
|
|
begin
|
|
declare n int;
|
|
select count(*) into n from t1;
|
|
return n;
|
|
end|
|
|
set global init_connect="set @x = f1()";
|
|
select @x;
|
|
@x
|
|
4
|
|
set global init_connect="create view v1 as select f1()";
|
|
select * from v1;
|
|
f1()
|
|
4
|
|
set global init_connect="drop view v1";
|
|
select * from v1;
|
|
ERROR 42S02: Table 'test.v1' doesn't exist
|
|
drop function f1;
|
|
create trigger trg1
|
|
after insert on t2
|
|
for each row
|
|
insert into t1 values (new.y);
|
|
set global init_connect="insert into t2 values (13), (17), (19)";
|
|
select * from t1;
|
|
x
|
|
3
|
|
5
|
|
7
|
|
11
|
|
13
|
|
17
|
|
19
|
|
drop trigger trg1;
|
|
set global init_connect=default;
|
|
revoke all privileges, grant option from mysqltest1@localhost;
|
|
drop user mysqltest1@localhost;
|
|
drop table t1, t2;
|