Manual merge
This commit is contained in:
unknown
parent
0708859ba8
commit
71f90b7e6f
@ -1128,9 +1128,9 @@ drop view if exists v1, v2, v3, v4;
|
||||
create function bug11555_1() returns int return (select max(i) from t1);
|
||||
create function bug11555_2() returns int return bug11555_1();
|
||||
create view v1 as select bug11555_1();
|
||||
ERROR 42S02: Table 'test.t1' doesn't exist
|
||||
drop view v1;
|
||||
create view v2 as select bug11555_2();
|
||||
ERROR 42S02: Table 'test.t1' doesn't exist
|
||||
drop view v2;
|
||||
create table t1 (i int);
|
||||
create view v1 as select bug11555_1();
|
||||
create view v2 as select bug11555_2();
|
||||
@ -1143,8 +1143,7 @@ ERROR HY000: View 'test.v2' references invalid table(s) or column(s) or function
|
||||
select * from v3;
|
||||
ERROR HY000: View 'test.v3' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
|
||||
create view v4 as select * from v1;
|
||||
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
|
||||
drop view v1, v2, v3;
|
||||
drop view v1, v2, v3, v4;
|
||||
drop function bug11555_1;
|
||||
drop function bug11555_2;
|
||||
create table t1 (i int);
|
||||
@ -1153,12 +1152,12 @@ create trigger t1_ai after insert on t1 for each row insert into t2 values (new.
|
||||
create view v1 as select * from t1;
|
||||
drop table t2;
|
||||
insert into v1 values (1);
|
||||
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
|
||||
ERROR HY000: Table 't2' was not locked with LOCK TABLES
|
||||
drop trigger t1_ai;
|
||||
create function bug11555_1() returns int return (select max(i) from t2);
|
||||
create trigger t1_ai after insert on t1 for each row set @a:=bug11555_1();
|
||||
insert into v1 values (2);
|
||||
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
|
||||
ERROR HY000: Table 't2' was not locked with LOCK TABLES
|
||||
drop function bug11555_1;
|
||||
drop table t1;
|
||||
drop view v1;
|
||||
@ -1269,6 +1268,138 @@ call bug24491();
|
||||
ERROR 42S22: Unknown column 'y.value' in 'field list'
|
||||
drop procedure bug24491;
|
||||
drop tables t1;
|
||||
DROP FUNCTION IF EXISTS bug18914_f1;
|
||||
DROP FUNCTION IF EXISTS bug18914_f2;
|
||||
DROP PROCEDURE IF EXISTS bug18914_p1;
|
||||
DROP PROCEDURE IF EXISTS bug18914_p2;
|
||||
DROP TABLE IF EXISTS t1, t2;
|
||||
CREATE TABLE t1 (i INT);
|
||||
CREATE PROCEDURE bug18914_p1() CREATE TABLE t2 (i INT);
|
||||
CREATE PROCEDURE bug18914_p2() DROP TABLE IF EXISTS no_such_table;
|
||||
CREATE FUNCTION bug18914_f1() RETURNS INT
|
||||
BEGIN
|
||||
CALL bug18914_p1();
|
||||
RETURN 1;
|
||||
END |
|
||||
CREATE FUNCTION bug18914_f2() RETURNS INT
|
||||
BEGIN
|
||||
CALL bug18914_p2();
|
||||
RETURN 1;
|
||||
END |
|
||||
CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW
|
||||
CALL bug18914_p1();
|
||||
INSERT INTO t1 VALUES (1);
|
||||
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
|
||||
SELECT bug18914_f1();
|
||||
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
|
||||
SELECT bug18914_f2();
|
||||
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
|
||||
SELECT * FROM t2;
|
||||
ERROR 42S02: Table 'test.t2' doesn't exist
|
||||
DROP FUNCTION bug18914_f1;
|
||||
DROP FUNCTION bug18914_f2;
|
||||
DROP PROCEDURE bug18914_p1;
|
||||
DROP PROCEDURE bug18914_p2;
|
||||
DROP TABLE t1;
|
||||
drop table if exists bogus_table_20713;
|
||||
drop function if exists func_20713_a;
|
||||
drop function if exists func_20713_b;
|
||||
create table bogus_table_20713( id int(10) not null primary key);
|
||||
insert into bogus_table_20713 values (1), (2), (3);
|
||||
create function func_20713_a() returns int(11)
|
||||
begin
|
||||
declare id int;
|
||||
declare continue handler for sqlexception set id=null;
|
||||
set @in_func := 1;
|
||||
set id = (select id from bogus_table_20713 where id = 3);
|
||||
set @in_func := 2;
|
||||
return id;
|
||||
end//
|
||||
create function func_20713_b() returns int(11)
|
||||
begin
|
||||
declare id int;
|
||||
declare continue handler for sqlstate value '42S02' set id=null;
|
||||
set @in_func := 1;
|
||||
set id = (select id from bogus_table_20713 where id = 3);
|
||||
set @in_func := 2;
|
||||
return id;
|
||||
end//
|
||||
set @in_func := 0;
|
||||
select func_20713_a();
|
||||
func_20713_a()
|
||||
NULL
|
||||
select @in_func;
|
||||
@in_func
|
||||
2
|
||||
set @in_func := 0;
|
||||
select func_20713_b();
|
||||
func_20713_b()
|
||||
NULL
|
||||
select @in_func;
|
||||
@in_func
|
||||
2
|
||||
drop table bogus_table_20713;
|
||||
set @in_func := 0;
|
||||
select func_20713_a();
|
||||
func_20713_a()
|
||||
NULL
|
||||
select @in_func;
|
||||
@in_func
|
||||
2
|
||||
set @in_func := 0;
|
||||
select func_20713_b();
|
||||
func_20713_b()
|
||||
NULL
|
||||
select @in_func;
|
||||
@in_func
|
||||
2
|
||||
drop function if exists func_20713_a;
|
||||
drop function if exists func_20713_b;
|
||||
drop table if exists table_25345_a;
|
||||
drop table if exists table_25345_b;
|
||||
drop procedure if exists proc_25345;
|
||||
drop function if exists func_25345;
|
||||
drop function if exists func_25345_b;
|
||||
create table table_25345_a (a int);
|
||||
create table table_25345_b (b int);
|
||||
create procedure proc_25345()
|
||||
begin
|
||||
declare c1 cursor for select a from table_25345_a;
|
||||
declare c2 cursor for select b from table_25345_b;
|
||||
select 1 as result;
|
||||
end ||
|
||||
create function func_25345() returns int(11)
|
||||
begin
|
||||
call proc_25345();
|
||||
return 1;
|
||||
end ||
|
||||
create function func_25345_b() returns int(11)
|
||||
begin
|
||||
declare c1 cursor for select a from table_25345_a;
|
||||
declare c2 cursor for select b from table_25345_b;
|
||||
return 1;
|
||||
end ||
|
||||
call proc_25345();
|
||||
result
|
||||
1
|
||||
select func_25345();
|
||||
ERROR 0A000: Not allowed to return a result set from a function
|
||||
select func_25345_b();
|
||||
func_25345_b()
|
||||
1
|
||||
drop table table_25345_a;
|
||||
call proc_25345();
|
||||
result
|
||||
1
|
||||
select func_25345();
|
||||
ERROR 0A000: Not allowed to return a result set from a function
|
||||
select func_25345_b();
|
||||
func_25345_b()
|
||||
1
|
||||
drop table table_25345_b;
|
||||
drop procedure proc_25345;
|
||||
drop function func_25345;
|
||||
drop function func_25345_b;
|
||||
End of 5.0 tests
|
||||
drop function if exists bug16164;
|
||||
create function bug16164() returns int
|
||||
|
||||
@ -1155,9 +1155,13 @@ create function f12_2() returns int
|
||||
return (select count(*) from t3)|
|
||||
drop temporary table t3|
|
||||
select f12_1()|
|
||||
ERROR 42S02: Table 'test.t3' doesn't exist
|
||||
f12_1()
|
||||
3
|
||||
Warnings:
|
||||
Note 1051 Unknown table 't3'
|
||||
select f12_1() from t1 limit 1|
|
||||
ERROR 42S02: Table 'test.t3' doesn't exist
|
||||
f12_1()
|
||||
3
|
||||
drop function f0|
|
||||
drop function f1|
|
||||
drop function f2|
|
||||
@ -5832,4 +5836,38 @@ END|
|
||||
CALL bug24117()|
|
||||
DROP PROCEDURE bug24117|
|
||||
DROP TABLE t3|
|
||||
drop function if exists func_8407_a|
|
||||
drop function if exists func_8407_b|
|
||||
create function func_8407_a() returns int
|
||||
begin
|
||||
declare x int;
|
||||
declare continue handler for sqlexception
|
||||
begin
|
||||
end;
|
||||
select 1 from no_such_view limit 1 into x;
|
||||
return x;
|
||||
end|
|
||||
create function func_8407_b() returns int
|
||||
begin
|
||||
declare x int default 0;
|
||||
declare continue handler for sqlstate '42S02'
|
||||
begin
|
||||
set x:= x+1000;
|
||||
end;
|
||||
case (select 1 from no_such_view limit 1)
|
||||
when 1 then set x:= x+1;
|
||||
when 2 then set x:= x+2;
|
||||
else set x:= x+100;
|
||||
end case;
|
||||
set x:=x + 500;
|
||||
return x;
|
||||
end|
|
||||
select func_8407_a()|
|
||||
func_8407_a()
|
||||
NULL
|
||||
select func_8407_b()|
|
||||
func_8407_b()
|
||||
1500
|
||||
drop function func_8407_a|
|
||||
drop function func_8407_b|
|
||||
drop table t1,t2;
|
||||
|
||||
@ -1335,4 +1335,41 @@ SELECT fubar_id FROM t2;
|
||||
fubar_id
|
||||
1
|
||||
DROP TABLE t1,t2;
|
||||
DROP TABLE IF EXISTS bug21825_A;
|
||||
DROP TABLE IF EXISTS bug21825_B;
|
||||
CREATE TABLE bug21825_A (id int(10));
|
||||
CREATE TABLE bug21825_B (id int(10));
|
||||
CREATE TRIGGER trgA AFTER INSERT ON bug21825_A
|
||||
FOR EACH ROW
|
||||
BEGIN
|
||||
INSERT INTO bug21825_B (id) values (1);
|
||||
END//
|
||||
INSERT INTO bug21825_A (id) VALUES (10);
|
||||
INSERT INTO bug21825_A (id) VALUES (20);
|
||||
DROP TABLE bug21825_B;
|
||||
DELETE FROM bug21825_A WHERE id = 20;
|
||||
DROP TABLE bug21825_A;
|
||||
DROP TABLE IF EXISTS bug22580_t1;
|
||||
DROP PROCEDURE IF EXISTS bug22580_proc_1;
|
||||
DROP PROCEDURE IF EXISTS bug22580_proc_2;
|
||||
CREATE TABLE bug22580_t1 (a INT, b INT);
|
||||
CREATE PROCEDURE bug22580_proc_2()
|
||||
BEGIN
|
||||
DROP TABLE IF EXISTS bug22580_tmp;
|
||||
CREATE TEMPORARY TABLE bug22580_tmp (a INT);
|
||||
DROP TABLE bug22580_tmp;
|
||||
END||
|
||||
CREATE PROCEDURE bug22580_proc_1()
|
||||
BEGIN
|
||||
CALL bug22580_proc_2();
|
||||
END||
|
||||
CREATE TRIGGER t1bu BEFORE UPDATE ON bug22580_t1
|
||||
FOR EACH ROW
|
||||
BEGIN
|
||||
CALL bug22580_proc_1();
|
||||
END||
|
||||
INSERT INTO bug22580_t1 VALUES (1,1);
|
||||
DROP TABLE bug22580_t1;
|
||||
DROP PROCEDURE bug22580_proc_1;
|
||||
DROP PROCEDURE bug22580_proc_2;
|
||||
End of 5.0 tests
|
||||
|
||||
@ -1611,10 +1611,12 @@ create function bug11555_1() returns int return (select max(i) from t1);
|
||||
create function bug11555_2() returns int return bug11555_1();
|
||||
# It is OK to report name of implicitly used table which is missing
|
||||
# when we create view.
|
||||
--error ER_NO_SUCH_TABLE
|
||||
# For stored functions however, because of exceptions handlers, there is
|
||||
# no easy way to find out if a missing table makes the view invalid.
|
||||
create view v1 as select bug11555_1();
|
||||
--error ER_NO_SUCH_TABLE
|
||||
drop view v1;
|
||||
create view v2 as select bug11555_2();
|
||||
drop view v2;
|
||||
# But we should hide name of missing implicitly used table when we use view
|
||||
create table t1 (i int);
|
||||
create view v1 as select bug11555_1();
|
||||
@ -1629,9 +1631,8 @@ select * from v2;
|
||||
select * from v3;
|
||||
# Note that creation of view which depends on broken view is yet
|
||||
# another form of view usage.
|
||||
--error ER_VIEW_INVALID
|
||||
create view v4 as select * from v1;
|
||||
drop view v1, v2, v3;
|
||||
drop view v1, v2, v3, v4;
|
||||
# We also should hide details about broken triggers which are
|
||||
# invoked for view.
|
||||
drop function bug11555_1;
|
||||
@ -1641,12 +1642,14 @@ create table t2 (i int);
|
||||
create trigger t1_ai after insert on t1 for each row insert into t2 values (new.i);
|
||||
create view v1 as select * from t1;
|
||||
drop table t2;
|
||||
--error ER_VIEW_INVALID
|
||||
# Limitation, the desired error is ER_VIEW_INVALID
|
||||
--error ER_TABLE_NOT_LOCKED
|
||||
insert into v1 values (1);
|
||||
drop trigger t1_ai;
|
||||
create function bug11555_1() returns int return (select max(i) from t2);
|
||||
create trigger t1_ai after insert on t1 for each row set @a:=bug11555_1();
|
||||
--error ER_VIEW_INVALID
|
||||
# Limitation, the desired error is ER_VIEW_INVALID
|
||||
--error ER_TABLE_NOT_LOCKED
|
||||
insert into v1 values (2);
|
||||
drop function bug11555_1;
|
||||
drop table t1;
|
||||
@ -1843,6 +1846,184 @@ call bug24491();
|
||||
drop procedure bug24491;
|
||||
drop tables t1;
|
||||
|
||||
#
|
||||
# BUG#18914: Calling certain SPs from triggers fail
|
||||
#
|
||||
# Failing to call a procedure that does implicit commit from a trigger
|
||||
# is a correct behaviour, however the error message was misleading.
|
||||
#
|
||||
# DROP TABLE IF EXISTS is also fixed to give correct error instead of
|
||||
# "Table doesn't exist".
|
||||
#
|
||||
--disable_warnings
|
||||
DROP FUNCTION IF EXISTS bug18914_f1;
|
||||
DROP FUNCTION IF EXISTS bug18914_f2;
|
||||
DROP PROCEDURE IF EXISTS bug18914_p1;
|
||||
DROP PROCEDURE IF EXISTS bug18914_p2;
|
||||
DROP TABLE IF EXISTS t1, t2;
|
||||
--enable_warnings
|
||||
|
||||
CREATE TABLE t1 (i INT);
|
||||
|
||||
CREATE PROCEDURE bug18914_p1() CREATE TABLE t2 (i INT);
|
||||
CREATE PROCEDURE bug18914_p2() DROP TABLE IF EXISTS no_such_table;
|
||||
|
||||
delimiter |;
|
||||
CREATE FUNCTION bug18914_f1() RETURNS INT
|
||||
BEGIN
|
||||
CALL bug18914_p1();
|
||||
RETURN 1;
|
||||
END |
|
||||
|
||||
CREATE FUNCTION bug18914_f2() RETURNS INT
|
||||
BEGIN
|
||||
CALL bug18914_p2();
|
||||
RETURN 1;
|
||||
END |
|
||||
delimiter ;|
|
||||
|
||||
CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW
|
||||
CALL bug18914_p1();
|
||||
|
||||
--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
|
||||
INSERT INTO t1 VALUES (1);
|
||||
|
||||
--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
|
||||
SELECT bug18914_f1();
|
||||
|
||||
--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
|
||||
SELECT bug18914_f2();
|
||||
|
||||
--error ER_NO_SUCH_TABLE
|
||||
SELECT * FROM t2;
|
||||
|
||||
DROP FUNCTION bug18914_f1;
|
||||
DROP FUNCTION bug18914_f2;
|
||||
DROP PROCEDURE bug18914_p1;
|
||||
DROP PROCEDURE bug18914_p2;
|
||||
DROP TABLE t1;
|
||||
|
||||
#
|
||||
# Bug#20713 (Functions will not not continue for SQLSTATE VALUE '42S02')
|
||||
#
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists bogus_table_20713;
|
||||
drop function if exists func_20713_a;
|
||||
drop function if exists func_20713_b;
|
||||
--enable_warnings
|
||||
|
||||
create table bogus_table_20713( id int(10) not null primary key);
|
||||
insert into bogus_table_20713 values (1), (2), (3);
|
||||
|
||||
delimiter //;
|
||||
|
||||
create function func_20713_a() returns int(11)
|
||||
begin
|
||||
declare id int;
|
||||
|
||||
declare continue handler for sqlexception set id=null;
|
||||
|
||||
set @in_func := 1;
|
||||
set id = (select id from bogus_table_20713 where id = 3);
|
||||
set @in_func := 2;
|
||||
|
||||
return id;
|
||||
end//
|
||||
|
||||
create function func_20713_b() returns int(11)
|
||||
begin
|
||||
declare id int;
|
||||
|
||||
declare continue handler for sqlstate value '42S02' set id=null;
|
||||
|
||||
set @in_func := 1;
|
||||
set id = (select id from bogus_table_20713 where id = 3);
|
||||
set @in_func := 2;
|
||||
|
||||
return id;
|
||||
end//
|
||||
|
||||
delimiter ;//
|
||||
|
||||
set @in_func := 0;
|
||||
select func_20713_a();
|
||||
select @in_func;
|
||||
|
||||
set @in_func := 0;
|
||||
select func_20713_b();
|
||||
select @in_func;
|
||||
|
||||
drop table bogus_table_20713;
|
||||
|
||||
set @in_func := 0;
|
||||
select func_20713_a();
|
||||
select @in_func;
|
||||
|
||||
set @in_func := 0;
|
||||
select func_20713_b();
|
||||
select @in_func;
|
||||
|
||||
drop function if exists func_20713_a;
|
||||
drop function if exists func_20713_b;
|
||||
|
||||
#
|
||||
# Bug#25345 (Cursors from Functions)
|
||||
#
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists table_25345_a;
|
||||
drop table if exists table_25345_b;
|
||||
drop procedure if exists proc_25345;
|
||||
drop function if exists func_25345;
|
||||
drop function if exists func_25345_b;
|
||||
--enable_warnings
|
||||
|
||||
create table table_25345_a (a int);
|
||||
create table table_25345_b (b int);
|
||||
|
||||
delimiter ||;
|
||||
|
||||
create procedure proc_25345()
|
||||
begin
|
||||
declare c1 cursor for select a from table_25345_a;
|
||||
declare c2 cursor for select b from table_25345_b;
|
||||
|
||||
select 1 as result;
|
||||
end ||
|
||||
|
||||
create function func_25345() returns int(11)
|
||||
begin
|
||||
call proc_25345();
|
||||
return 1;
|
||||
end ||
|
||||
|
||||
create function func_25345_b() returns int(11)
|
||||
begin
|
||||
declare c1 cursor for select a from table_25345_a;
|
||||
declare c2 cursor for select b from table_25345_b;
|
||||
|
||||
return 1;
|
||||
end ||
|
||||
|
||||
delimiter ;||
|
||||
|
||||
call proc_25345();
|
||||
--error ER_SP_NO_RETSET
|
||||
select func_25345();
|
||||
select func_25345_b();
|
||||
|
||||
drop table table_25345_a;
|
||||
|
||||
call proc_25345();
|
||||
--error ER_SP_NO_RETSET
|
||||
select func_25345();
|
||||
select func_25345_b();
|
||||
|
||||
drop table table_25345_b;
|
||||
drop procedure proc_25345;
|
||||
drop function func_25345;
|
||||
drop function func_25345_b;
|
||||
|
||||
#
|
||||
# End of 5.0 tests
|
||||
|
||||
@ -1625,4 +1625,78 @@ SELECT fubar_id FROM t2;
|
||||
|
||||
DROP TABLE t1,t2;
|
||||
|
||||
#
|
||||
# Bug#21285 (Incorrect message error deleting records in a table with a
|
||||
# trigger for inserting)
|
||||
#
|
||||
|
||||
--disable_warnings
|
||||
DROP TABLE IF EXISTS bug21825_A;
|
||||
DROP TABLE IF EXISTS bug21825_B;
|
||||
--enable_warnings
|
||||
|
||||
CREATE TABLE bug21825_A (id int(10));
|
||||
CREATE TABLE bug21825_B (id int(10));
|
||||
|
||||
delimiter //;
|
||||
|
||||
CREATE TRIGGER trgA AFTER INSERT ON bug21825_A
|
||||
FOR EACH ROW
|
||||
BEGIN
|
||||
INSERT INTO bug21825_B (id) values (1);
|
||||
END//
|
||||
delimiter ;//
|
||||
|
||||
INSERT INTO bug21825_A (id) VALUES (10);
|
||||
INSERT INTO bug21825_A (id) VALUES (20);
|
||||
|
||||
DROP TABLE bug21825_B;
|
||||
|
||||
# Must pass, the missing table in the insert trigger should not matter.
|
||||
DELETE FROM bug21825_A WHERE id = 20;
|
||||
|
||||
DROP TABLE bug21825_A;
|
||||
|
||||
#
|
||||
# Bug#22580 (DROP TABLE in nested stored procedure causes strange dependancy
|
||||
# error)
|
||||
#
|
||||
|
||||
--disable_warnings
|
||||
DROP TABLE IF EXISTS bug22580_t1;
|
||||
DROP PROCEDURE IF EXISTS bug22580_proc_1;
|
||||
DROP PROCEDURE IF EXISTS bug22580_proc_2;
|
||||
--enable_warnings
|
||||
|
||||
CREATE TABLE bug22580_t1 (a INT, b INT);
|
||||
|
||||
DELIMITER ||;
|
||||
|
||||
CREATE PROCEDURE bug22580_proc_2()
|
||||
BEGIN
|
||||
DROP TABLE IF EXISTS bug22580_tmp;
|
||||
CREATE TEMPORARY TABLE bug22580_tmp (a INT);
|
||||
DROP TABLE bug22580_tmp;
|
||||
END||
|
||||
|
||||
CREATE PROCEDURE bug22580_proc_1()
|
||||
BEGIN
|
||||
CALL bug22580_proc_2();
|
||||
END||
|
||||
|
||||
CREATE TRIGGER t1bu BEFORE UPDATE ON bug22580_t1
|
||||
FOR EACH ROW
|
||||
BEGIN
|
||||
CALL bug22580_proc_1();
|
||||
END||
|
||||
|
||||
DELIMITER ;||
|
||||
|
||||
# Must pass, the actions of the update trigger should not matter
|
||||
INSERT INTO bug22580_t1 VALUES (1,1);
|
||||
|
||||
DROP TABLE bug22580_t1;
|
||||
DROP PROCEDURE bug22580_proc_1;
|
||||
DROP PROCEDURE bug22580_proc_2;
|
||||
|
||||
--echo End of 5.0 tests
|
||||
|
||||
@ -813,6 +813,49 @@ enum enum_thread_type
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
This class represents the interface for internal error handlers.
|
||||
Internal error handlers are exception handlers used by the server
|
||||
implementation.
|
||||
*/
|
||||
class Internal_error_handler
|
||||
{
|
||||
protected:
|
||||
Internal_error_handler() {}
|
||||
virtual ~Internal_error_handler() {}
|
||||
|
||||
public:
|
||||
/**
|
||||
Handle an error condition.
|
||||
This method can be implemented by a subclass to achieve any of the
|
||||
following:
|
||||
- mask an error internally, prevent exposing it to the user,
|
||||
- mask an error and throw another one instead.
|
||||
When this method returns true, the error condition is considered
|
||||
'handled', and will not be propagated to upper layers.
|
||||
It is the responsability of the code installing an internal handler
|
||||
to then check for trapped conditions, and implement logic to recover
|
||||
from the anticipated conditions trapped during runtime.
|
||||
|
||||
This mechanism is similar to C++ try/throw/catch:
|
||||
- 'try' correspond to <code>THD::push_internal_handler()</code>,
|
||||
- 'throw' correspond to <code>my_error()</code>,
|
||||
which invokes <code>my_message_sql()</code>,
|
||||
- 'catch' correspond to checking how/if an internal handler was invoked,
|
||||
before removing it from the exception stack with
|
||||
<code>THD::pop_internal_handler()</code>.
|
||||
|
||||
@param sql_errno the error number
|
||||
@param level the error level
|
||||
@param thd the calling thread
|
||||
@return true if the error is handled
|
||||
*/
|
||||
virtual bool handle_error(uint sql_errno,
|
||||
MYSQL_ERROR::enum_warning_level level,
|
||||
THD *thd) = 0;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
For each client connection we create a separate thread with THD serving as
|
||||
a thread/connection descriptor
|
||||
@ -1632,6 +1675,31 @@ public:
|
||||
return FALSE;
|
||||
}
|
||||
thd_scheduler scheduler;
|
||||
|
||||
public:
|
||||
/**
|
||||
Add an internal error handler to the thread execution context.
|
||||
@param handler the exception handler to add
|
||||
*/
|
||||
void push_internal_handler(Internal_error_handler *handler);
|
||||
|
||||
/**
|
||||
Handle an error condition.
|
||||
@param sql_errno the error number
|
||||
@param level the error level
|
||||
@return true if the error is handled
|
||||
*/
|
||||
virtual bool handle_error(uint sql_errno,
|
||||
MYSQL_ERROR::enum_warning_level level);
|
||||
|
||||
/**
|
||||
Remove the error handler last pushed.
|
||||
*/
|
||||
void pop_internal_handler();
|
||||
|
||||
private:
|
||||
/** The current internal error handler for this thread, or NULL. */
|
||||
Internal_error_handler *m_internal_handler;
|
||||
};
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user