Skip to content

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

BUG#21524 ps.test updated to meet recent changes in SQL parser 


mysql-test/r/ps.result:
  brand new ps.result recorded out of updated ps.test output
mysql-test/t/disabled.def:
  ps.test enabled anew
mysql-test/t/ps.test:
  ps.test updated to ensure FLUSH/RESET are not allowed in stored functions at both parse and execution time
parent b0417e9d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 274 deletions
mysql-test/r/ps.result
View file @ c2f99747
This diff is collapsed.
mysql-test/t/disabled.def
View file @ c2f99747
...@@ -15,7 +15,6 @@ ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t ...@@ -15,7 +15,6 @@ ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t
ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
ndb_load : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed ndb_load : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed
partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
ps : BUG#21524 2006-08-08 pgalbraith 'ps' test fails in --ps-protocol test AMD64 bit
ps_7ndb : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open ps_7ndb : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open
rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
rpl_ndb_2myisam : BUG#19227 Seems to pass currently rpl_ndb_2myisam : BUG#19227 Seems to pass currently
......
mysql-test/t/ps.test
View file @ c2f99747
...@@ -1447,13 +1447,15 @@ create procedure proc_1() reset query cache; ...@@ -1447,13 +1447,15 @@ create procedure proc_1() reset query cache;
call proc_1(); call proc_1();
call proc_1(); call proc_1();
call proc_1(); call proc_1();
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin reset query cache; return 1; end| create function func_1() returns int begin reset query cache; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
drop function func_1; drop function func_1;
drop procedure proc_1;
prepare abc from "reset query cache"; prepare abc from "reset query cache";
execute abc; execute abc;
execute abc; execute abc;
...@@ -1462,13 +1464,15 @@ deallocate prepare abc; ...@@ -1462,13 +1464,15 @@ deallocate prepare abc;
create procedure proc_1() reset master; create procedure proc_1() reset master;
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin reset master; return 1; end| create function func_1() returns int begin reset master; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
drop function func_1; drop function func_1;
drop procedure proc_1;
prepare abc from "reset master"; prepare abc from "reset master";
execute abc; execute abc;
execute abc; execute abc;
...@@ -1480,13 +1484,15 @@ create procedure proc_1() reset slave; ...@@ -1480,13 +1484,15 @@ create procedure proc_1() reset slave;
call proc_1(); call proc_1();
call proc_1(); call proc_1();
call proc_1(); call proc_1();
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin reset slave; return 1; end| create function func_1() returns int begin reset slave; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
drop function func_1; drop function func_1;
drop procedure proc_1;
prepare abc from "reset slave"; prepare abc from "reset slave";
execute abc; execute abc;
execute abc; execute abc;
...@@ -1527,15 +1533,15 @@ call proc_1(); ...@@ -1527,15 +1533,15 @@ call proc_1();
call proc_1(); call proc_1();
call proc_1(); call proc_1();
call proc_1(); call proc_1();
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin flush hosts; return 1; end| create function func_1() returns int begin flush hosts; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_SP_DOES_NOT_EXIST --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
--error ER_SP_DOES_NOT_EXIST
drop function func_1; drop function func_1;
drop procedure proc_1;
prepare abc from "flush hosts"; prepare abc from "flush hosts";
execute abc; execute abc;
execute abc; execute abc;
...@@ -1547,15 +1553,15 @@ create procedure proc_1() flush privileges; ...@@ -1547,15 +1553,15 @@ create procedure proc_1() flush privileges;
call proc_1(); call proc_1();
call proc_1(); call proc_1();
call proc_1(); call proc_1();
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin flush privileges; return 1; end| create function func_1() returns int begin flush privileges; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_SP_DOES_NOT_EXIST --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
--error ER_SP_DOES_NOT_EXIST
drop function func_1; drop function func_1;
drop procedure proc_1;
prepare abc from "flush privileges"; prepare abc from "flush privileges";
deallocate prepare abc; deallocate prepare abc;
...@@ -1567,11 +1573,15 @@ call proc_1(); ...@@ -1567,11 +1573,15 @@ call proc_1();
unlock tables; unlock tables;
call proc_1(); call proc_1();
unlock tables; unlock tables;
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin flush tables with read lock; return 1; end| create function func_1() returns int begin flush tables with read lock; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual;
drop function func_1;
drop procedure proc_1;
prepare abc from "flush tables with read lock"; prepare abc from "flush tables with read lock";
execute abc; execute abc;
execute abc; execute abc;
...@@ -1584,15 +1594,15 @@ create procedure proc_1() flush tables; ...@@ -1584,15 +1594,15 @@ create procedure proc_1() flush tables;
call proc_1(); call proc_1();
call proc_1(); call proc_1();
call proc_1(); call proc_1();
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin flush tables; return 1; end| create function func_1() returns int begin flush tables; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_SP_DOES_NOT_EXIST --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
--error ER_SP_DOES_NOT_EXIST
drop function func_1; drop function func_1;
drop procedure proc_1;
prepare abc from "flush tables"; prepare abc from "flush tables";
execute abc; execute abc;
execute abc; execute abc;
...@@ -1622,15 +1632,15 @@ select Host, User from mysql.user limit 0; ...@@ -1622,15 +1632,15 @@ select Host, User from mysql.user limit 0;
select Host, Db from mysql.host limit 0; select Host, Db from mysql.host limit 0;
show open tables from mysql; show open tables from mysql;
flush tables; flush tables;
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin flush tables; return 1; end| create function func_1() returns int begin flush tables; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_SP_DOES_NOT_EXIST --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
--error ER_SP_DOES_NOT_EXIST
drop function func_1; drop function func_1;
drop procedure proc_1;
flush tables; flush tables;
select Host, User from mysql.user limit 0; select Host, User from mysql.user limit 0;
select Host, Db from mysql.host limit 0; select Host, Db from mysql.host limit 0;
...@@ -1659,15 +1669,15 @@ create procedure proc_1() flush logs; ...@@ -1659,15 +1669,15 @@ create procedure proc_1() flush logs;
call proc_1(); call proc_1();
call proc_1(); call proc_1();
call proc_1(); call proc_1();
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin flush logs; return 1; end| create function func_1() returns int begin flush logs; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_SP_DOES_NOT_EXIST --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
--error ER_SP_DOES_NOT_EXIST
drop function func_1; drop function func_1;
drop procedure proc_1;
prepare abc from "flush logs"; prepare abc from "flush logs";
execute abc; execute abc;
execute abc; execute abc;
...@@ -1679,15 +1689,15 @@ create procedure proc_1() flush status; ...@@ -1679,15 +1689,15 @@ create procedure proc_1() flush status;
call proc_1(); call proc_1();
call proc_1(); call proc_1();
call proc_1(); call proc_1();
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin flush status; return 1; end| create function func_1() returns int begin flush status; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_SP_DOES_NOT_EXIST --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
--error ER_SP_DOES_NOT_EXIST
drop function func_1; drop function func_1;
drop procedure proc_1;
prepare abc from "flush status"; prepare abc from "flush status";
execute abc; execute abc;
execute abc; execute abc;
...@@ -1699,15 +1709,15 @@ create procedure proc_1() flush slave; ...@@ -1699,15 +1709,15 @@ create procedure proc_1() flush slave;
call proc_1(); call proc_1();
call proc_1(); call proc_1();
call proc_1(); call proc_1();
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin flush slave; return 1; end| create function func_1() returns int begin flush slave; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_SP_DOES_NOT_EXIST --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
--error ER_SP_DOES_NOT_EXIST
drop function func_1; drop function func_1;
drop procedure proc_1;
prepare abc from "flush slave"; prepare abc from "flush slave";
execute abc; execute abc;
execute abc; execute abc;
...@@ -1716,15 +1726,15 @@ deallocate prepare abc; ...@@ -1716,15 +1726,15 @@ deallocate prepare abc;
create procedure proc_1() flush master; create procedure proc_1() flush master;
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin flush master; return 1; end| create function func_1() returns int begin flush master; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_SP_DOES_NOT_EXIST --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
--error ER_SP_DOES_NOT_EXIST
drop function func_1; drop function func_1;
drop procedure proc_1;
prepare abc from "flush master"; prepare abc from "flush master";
deallocate prepare abc; deallocate prepare abc;
...@@ -1733,15 +1743,15 @@ create procedure proc_1() flush des_key_file; ...@@ -1733,15 +1743,15 @@ create procedure proc_1() flush des_key_file;
call proc_1(); call proc_1();
call proc_1(); call proc_1();
call proc_1(); call proc_1();
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin flush des_key_file; return 1; end| create function func_1() returns int begin flush des_key_file; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_SP_DOES_NOT_EXIST --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
--error ER_SP_DOES_NOT_EXIST
drop function func_1; drop function func_1;
drop procedure proc_1;
prepare abc from "flush des_key_file"; prepare abc from "flush des_key_file";
execute abc; execute abc;
execute abc; execute abc;
...@@ -1753,15 +1763,15 @@ create procedure proc_1() flush user_resources; ...@@ -1753,15 +1763,15 @@ create procedure proc_1() flush user_resources;
call proc_1(); call proc_1();
call proc_1(); call proc_1();
call proc_1(); call proc_1();
drop procedure proc_1;
delimiter |; delimiter |;
--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
create function func_1() returns int begin flush user_resources; return 1; end| create function func_1() returns int begin flush user_resources; return 1; end|
create function func_1() returns int begin call proc_1(); return 1; end|
delimiter ;| delimiter ;|
--error ER_SP_DOES_NOT_EXIST --error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
select func_1(), func_1(), func_1() from dual; select func_1(), func_1(), func_1() from dual;
--error ER_SP_DOES_NOT_EXIST
drop function func_1; drop function func_1;
drop procedure proc_1;
prepare abc from "flush user_resources"; prepare abc from "flush user_resources";
execute abc; execute abc;
execute abc; execute abc;
...@@ -1865,22 +1875,6 @@ execute abc; ...@@ -1865,22 +1875,6 @@ execute abc;
deallocate prepare abc; deallocate prepare abc;
create procedure proc_1() show scheduler status;
drop procedure proc_1;
delimiter |;
--error ER_SP_NO_RETSET
create function func_1() returns int begin show scheduler status; return 1; end|
delimiter ;|
--error ER_SP_DOES_NOT_EXIST
select func_1(), func_1(), func_1() from dual;
--error ER_SP_DOES_NOT_EXIST
drop function func_1;
--error ER_UNSUPPORTED_PS
prepare abc from "show scheduler status";
--error ER_UNKNOWN_STMT_HANDLER
deallocate prepare abc;
--disable_warnings --disable_warnings
drop procedure if exists a; drop procedure if exists a;
--enable_warnings --enable_warnings
...@@ -1997,10 +1991,13 @@ call proc_1(); ...@@ -1997,10 +1991,13 @@ call proc_1();
call proc_1(); call proc_1();
drop procedure proc_1; drop procedure proc_1;
create procedure proc_1() install plugin my_plug soname 'some_plugin.so'; create procedure proc_1() install plugin my_plug soname 'some_plugin.so';
--replace_regex / \'.*\'/ PATH_TO_SO/
--error ER_CANT_OPEN_LIBRARY --error ER_CANT_OPEN_LIBRARY
call proc_1(); call proc_1();
--replace_regex / \'.*\'/ PATH_TO_SO/
--error ER_CANT_OPEN_LIBRARY --error ER_CANT_OPEN_LIBRARY
call proc_1(); call proc_1();
--replace_regex / \'.*\'/ PATH_TO_SO/
--error ER_CANT_OPEN_LIBRARY --error ER_CANT_OPEN_LIBRARY
call proc_1(); call proc_1();
drop procedure proc_1; drop procedure proc_1;
...@@ -2150,7 +2147,7 @@ drop event if exists xyz; ...@@ -2150,7 +2147,7 @@ drop event if exists xyz;
#drop event xyz; #drop event xyz;
#drop procedure proc_1; #drop procedure proc_1;
delimiter |; delimiter |;
--error ER_SP_NO_RETSET --error ER_EVENT_RECURSIVITY_FORBIDDEN
create function func_1() returns int begin create event xyz on schedule at now() do select 123; return 1; end| create function func_1() returns int begin create event xyz on schedule at now() do select 123; return 1; end|
delimiter ;| delimiter ;|
--error ER_SP_DOES_NOT_EXIST --error ER_SP_DOES_NOT_EXIST
......
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