mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B31866-5.1-opt
This commit is contained in:
commit
61bd5d0fec
3 changed files with 21 additions and 0 deletions
|
|
@ -1978,3 +1978,9 @@ a
|
||||||
1
|
1
|
||||||
drop table table_25411_a;
|
drop table table_25411_a;
|
||||||
drop table table_25411_b;
|
drop table table_25411_b;
|
||||||
|
DROP TRIGGER IF EXISTS trg;
|
||||||
|
Warnings:
|
||||||
|
Note 1360 Trigger does not exist
|
||||||
|
SHOW CREATE TRIGGER trg;
|
||||||
|
ERROR HY000: Trigger does not exist
|
||||||
|
End of 5.1 tests.
|
||||||
|
|
|
||||||
|
|
@ -2246,3 +2246,15 @@ select * from table_25411_a;
|
||||||
drop table table_25411_a;
|
drop table table_25411_a;
|
||||||
drop table table_25411_b;
|
drop table table_25411_b;
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug #31866: MySQL Server crashes on SHOW CREATE TRIGGER statement
|
||||||
|
#
|
||||||
|
|
||||||
|
--disable-warnings
|
||||||
|
DROP TRIGGER IF EXISTS trg;
|
||||||
|
--enable-warnings
|
||||||
|
|
||||||
|
--error ER_TRG_DOES_NOT_EXIST
|
||||||
|
SHOW CREATE TRIGGER trg;
|
||||||
|
|
||||||
|
--echo End of 5.1 tests.
|
||||||
|
|
|
||||||
|
|
@ -6862,6 +6862,9 @@ bool show_create_trigger(THD *thd, const sp_name *trg_name)
|
||||||
{
|
{
|
||||||
TABLE_LIST *lst= get_trigger_table(thd, trg_name);
|
TABLE_LIST *lst= get_trigger_table(thd, trg_name);
|
||||||
|
|
||||||
|
if (!lst)
|
||||||
|
return TRUE;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Open the table by name in order to load Table_triggers_list object.
|
Open the table by name in order to load Table_triggers_list object.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue