mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
d4088df5e9
Post-review version. Some minor review fixes, but also changed the way some errors are handled: Don't return specific parse errors; instead always use the more general "table corrupt" error (amended accordingly). mysql-test/r/sp-destruct.result: Updated results. mysql-test/r/sp-error.result: Updated for fully qualified name in "no return" error message. mysql-test/t/sp-destruct.test: Adopted the more consistent error handling for a corrupted mysql.proc table. (No more "parse error" et al). sql/share/errmsg.txt: Changed ER_SP_PROC_TABLE_CORRUPT to be more explicit. sql/sp.cc: Review fixes. Changed the handling of parse errors, and added the routine name to the "table corrupt" error message. sql/sql_base.cc: Review changes: Change error tests and added comments. sql/sql_parse.cc: Mored ER_SP_NORETURN test of functions to sql_yacc.yy for more general error handling. sql/sql_yacc.yy: Mored ER_SP_NORETURN test of functions from sql_parse.cc for more general error handling.
77 lines
3.4 KiB
Text
77 lines
3.4 KiB
Text
use test;
|
|
drop procedure if exists bug14233;
|
|
drop function if exists bug14233;
|
|
drop table if exists t1;
|
|
drop view if exists v1;
|
|
create procedure bug14233()
|
|
set @x = 42;
|
|
create function bug14233_f() returns int
|
|
return 42;
|
|
create table t1 (id int);
|
|
create trigger t1_ai after insert on t1 for each row call bug14233();
|
|
alter table mysql.proc drop type;
|
|
call bug14233();
|
|
ERROR HY000: Failed to load routine test.bug14233. The table mysql.proc is missing, corrupt, or contains bad data (internal code -5)
|
|
create view v1 as select bug14233_f();
|
|
ERROR HY000: Failed to load routine test.bug14233_f. The table mysql.proc is missing, corrupt, or contains bad data (internal code -5)
|
|
insert into t1 values (0);
|
|
ERROR HY000: Failed to load routine test.bug14233. The table mysql.proc is missing, corrupt, or contains bad data (internal code -5)
|
|
flush table mysql.proc;
|
|
call bug14233();
|
|
ERROR HY000: Incorrect information in file: './mysql/proc.frm'
|
|
create view v1 as select bug14233_f();
|
|
ERROR HY000: Incorrect information in file: './mysql/proc.frm'
|
|
insert into t1 values (0);
|
|
ERROR HY000: Incorrect information in file: './mysql/proc.frm'
|
|
flush table mysql.proc;
|
|
call bug14233();
|
|
ERROR 42S02: Table 'mysql.proc' doesn't exist
|
|
create view v1 as select bug14233_f();
|
|
ERROR 42S02: Table 'mysql.proc' doesn't exist
|
|
insert into t1 values (0);
|
|
ERROR 42S02: Table 'mysql.proc' doesn't exist
|
|
flush table mysql.proc;
|
|
flush privileges;
|
|
delete from mysql.proc where name like 'bug14233%';
|
|
insert into mysql.proc
|
|
(
|
|
db, name, type, specific_name, language, sql_data_access, is_deterministic,
|
|
security_type, param_list, returns, body, definer, created, modified,
|
|
sql_mode, comment
|
|
)
|
|
values
|
|
(
|
|
'test', 'bug14233_1', 'FUNCTION', 'bug14233_1', 'SQL', 'READS_SQL_DATA', 'NO',
|
|
'DEFINER', '', 'int(10)',
|
|
'select count(*) from mysql.user',
|
|
'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''
|
|
),
|
|
(
|
|
'test', 'bug14233_2', 'FUNCTION', 'bug14233_2', 'SQL', 'READS_SQL_DATA', 'NO',
|
|
'DEFINER', '', 'int(10)',
|
|
'begin declare x int; select count(*) into x from mysql.user; end',
|
|
'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''
|
|
),
|
|
(
|
|
'test', 'bug14233_3', 'PROCEDURE', 'bug14233_3', 'SQL', 'READS_SQL_DATA','NO',
|
|
'DEFINER', '', '',
|
|
'alksj wpsj sa ^#!@ ',
|
|
'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''
|
|
);
|
|
select bug14233_1();
|
|
ERROR HY000: Failed to load routine test.bug14233_1. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
|
|
create view v1 as select bug14233_1();
|
|
ERROR HY000: Failed to load routine test.bug14233_1. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
|
|
select bug14233_2();
|
|
ERROR HY000: Failed to load routine test.bug14233_2. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
|
|
create view v1 as select bug14233_2();
|
|
ERROR HY000: Failed to load routine test.bug14233_2. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
|
|
call bug14233_3();
|
|
ERROR HY000: Failed to load routine test.bug14233_3. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
|
|
drop trigger t1_ai;
|
|
create trigger t1_ai after insert on t1 for each row call bug14233_3();
|
|
insert into t1 values (0);
|
|
ERROR HY000: Failed to load routine test.bug14233_3. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
|
|
delete from mysql.proc where name like 'bug14233%';
|
|
drop trigger t1_ai;
|
|
drop table t1;
|