Commit 3cd6015c authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 

into  example.com:/work/mysql-5.0-runtime
parents 1b6d9589 133d2aa5

mysql-test/r/sp-error.result

+39 −0
Original line number Diff line number Diff line
@@ -634,6 +634,45 @@ flush tables; 
return 5;

end|

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create function bug8409() returns int begin reset query cache;

return 1; end|

ERROR 0A000: RESET is not allowed in stored function or trigger

create function bug8409() returns int begin reset master;

return 1; end|

ERROR 0A000: RESET is not allowed in stored function or trigger

create function bug8409() returns int begin reset slave;

return 1; end|

ERROR 0A000: RESET is not allowed in stored function or trigger

create function bug8409() returns int begin flush hosts;

return 1; end|

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create function bug8409() returns int begin flush privileges;

return 1; end|

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create function bug8409() returns int begin flush tables with read lock;

return 1; end|

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create function bug8409() returns int begin flush tables;

return 1; end|

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create function bug8409() returns int begin flush logs;

return 1; end|

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create function bug8409() returns int begin flush status;

return 1; end|

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create function bug8409() returns int begin flush slave;

return 1; end|

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create function bug8409() returns int begin flush master;

return 1; end|

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create function bug8409() returns int begin flush des_key_file;

return 1; end|

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create function bug8409() returns int begin flush user_resources;

return 1; end|

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create procedure bug9529_901234567890123456789012345678901234567890123456789012345()

begin

end|

mysql-test/r/trigger.result

+72 −1
Original line number Diff line number Diff line
@@ -626,12 +626,51 @@ Trigger Event Table Statement Timing Created sql_mode Definer 
t1_bi	INSERT	t1	set new.a = '2004-01-00'	BEFORE	#		root@localhost

drop table t1;

create table t1 (id int);

create trigger t1_ai after insert on t1 for each row reset query cache;

ERROR 0A000: RESET is not allowed in stored function or trigger

create trigger t1_ai after insert on t1 for each row reset master;

ERROR 0A000: RESET is not allowed in stored function or trigger

create trigger t1_ai after insert on t1 for each row reset slave;

ERROR 0A000: RESET is not allowed in stored function or trigger

create trigger t1_ai after insert on t1 for each row flush hosts;

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create trigger t1_ai after insert on t1 for each row flush tables with read lock;

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create trigger t1_ai after insert on t1 for each row flush logs;

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create trigger t1_ai after insert on t1 for each row flush status;

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create trigger t1_ai after insert on t1 for each row flush slave;

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create trigger t1_ai after insert on t1 for each row flush master;

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create trigger t1_ai after insert on t1 for each row flush des_key_file;

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create trigger t1_ai after insert on t1 for each row flush user_resources;

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create trigger t1_ai after insert on t1 for each row flush tables;

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create trigger t1_ai after insert on t1 for each row flush privileges;

ERROR 0A000: FLUSH is not allowed in stored function or trigger

create procedure p1() flush tables;

drop procedure if exists p1;

create trigger t1_ai after insert on t1 for each row call p1();

create procedure p1() flush tables;

insert into t1 values (0);

ERROR 0A000: FLUSH is not allowed in stored function or trigger

drop procedure p1;

create procedure p1() reset query cache;

insert into t1 values (0);

ERROR 0A000: RESET is not allowed in stored function or trigger

drop procedure p1;

create procedure p1() reset master;

insert into t1 values (0);

ERROR 0A000: RESET is not allowed in stored function or trigger

drop procedure p1;

create procedure p1() reset slave;

insert into t1 values (0);

ERROR 0A000: RESET is not allowed in stored function or trigger

drop procedure p1;

create procedure p1() flush hosts;

insert into t1 values (0);

ERROR 0A000: FLUSH is not allowed in stored function or trigger

drop procedure p1;
@@ -639,6 +678,38 @@ create procedure p1() flush privileges; 
insert into t1 values (0);

ERROR 0A000: FLUSH is not allowed in stored function or trigger

drop procedure p1;

create procedure p1() flush tables with read lock;

insert into t1 values (0);

ERROR 0A000: FLUSH is not allowed in stored function or trigger

drop procedure p1;

create procedure p1() flush tables;

insert into t1 values (0);

ERROR 0A000: FLUSH is not allowed in stored function or trigger

drop procedure p1;

create procedure p1() flush logs;

insert into t1 values (0);

ERROR 0A000: FLUSH is not allowed in stored function or trigger

drop procedure p1;

create procedure p1() flush status;

insert into t1 values (0);

ERROR 0A000: FLUSH is not allowed in stored function or trigger

drop procedure p1;

create procedure p1() flush slave;

insert into t1 values (0);

ERROR 0A000: FLUSH is not allowed in stored function or trigger

drop procedure p1;

create procedure p1() flush master;

insert into t1 values (0);

ERROR 0A000: FLUSH is not allowed in stored function or trigger

drop procedure p1;

create procedure p1() flush des_key_file;

insert into t1 values (0);

ERROR 0A000: FLUSH is not allowed in stored function or trigger

drop procedure p1;

create procedure p1() flush user_resources;

insert into t1 values (0);

ERROR 0A000: FLUSH is not allowed in stored function or trigger

drop procedure p1;

drop table t1;

create table t1 (id int, data int, username varchar(16));

insert into t1 (id, data) values (1, 0);

mysql-test/t/sp-error.test

+39 −0
Original line number Diff line number Diff line
@@ -899,6 +899,45 @@ begin 
  flush tables;

  return 5;

end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin reset query cache;

return 1; end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin reset master;

return 1; end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin reset slave;

return 1; end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin flush hosts;

return 1; end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin flush privileges;

return 1; end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin flush tables with read lock;

return 1; end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin flush tables;

return 1; end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin flush logs;

return 1; end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin flush status;

return 1; end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin flush slave;

return 1; end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin flush master;

return 1; end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin flush des_key_file;

return 1; end|

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create function bug8409() returns int begin flush user_resources;

return 1; end|





#

mysql-test/t/trigger.test

+89 −1
Original line number Diff line number Diff line
@@ -651,17 +651,105 @@ drop table t1; 
# of functions and triggers.

create table t1 (id int);

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row reset query cache;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row reset master;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row reset slave;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row flush hosts;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row flush tables with read lock;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row flush logs;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row flush status;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row flush slave;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row flush master;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row flush des_key_file;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row flush user_resources;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row flush tables;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

create trigger t1_ai after insert on t1 for each row flush privileges;

create procedure p1() flush tables;

--disable_warnings

drop procedure if exists p1;

--enable_warnings



create trigger t1_ai after insert on t1 for each row call p1();

create procedure p1() flush tables;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() reset query cache;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() reset master;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() reset slave;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() flush hosts;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() flush privileges;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() flush tables with read lock;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() flush tables;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() flush logs;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() flush status;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() flush slave;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() flush master;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() flush des_key_file;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

create procedure p1() flush user_resources;

--error ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG

insert into t1 values (0);



drop procedure p1;

drop table t1;

sql/sp_head.cc

+6 −0
Original line number Diff line number Diff line
@@ -230,6 +230,12 @@ sp_get_flags_for_command(LEX *lex) 
    else

      flags= sp_head::HAS_COMMIT_OR_ROLLBACK;

    break;

  case SQLCOM_FLUSH:

    flags= sp_head::HAS_SQLCOM_FLUSH;

    break;

  case SQLCOM_RESET:

    flags= sp_head::HAS_SQLCOM_RESET;

    break;

  case SQLCOM_CREATE_INDEX:

  case SQLCOM_CREATE_DB:

  case SQLCOM_CREATE_VIEW: