1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

After merge fixes for WL#1218 "Triggers"

Browse Source
This commit is contained in:
dlenev@brandersnatch.localdomain 2004-09-09 23:44:27 +04:00
parent c46e640009
commit 0ae54976d3
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/t/trigger.test
View File

@ -151,15 +151,15 @@ drop table t1;
# #
create table t1 (i int); create table t1 (i int);
--error 1362 --error 1363
create trigger trg before insert on t1 for each row set @a:= old.i; create trigger trg before insert on t1 for each row set @a:= old.i;
--error 1362 --error 1363
create trigger trg before delete on t1 for each row set @a:= new.i; create trigger trg before delete on t1 for each row set @a:= new.i;
--error 1361
create trigger trg before update on t1 for each row set old.i:=1;
--error 1362 --error 1362
create trigger trg before update on t1 for each row set old.i:=1;
--error 1363
create trigger trg before delete on t1 for each row set new.i:=1; create trigger trg before delete on t1 for each row set new.i:=1;
--error 1361 --error 1362
create trigger trg after update on t1 for each row set new.i:=1; create trigger trg after update on t1 for each row set new.i:=1;
# TODO: We should also test wrong field names here, we don't do it now # TODO: We should also test wrong field names here, we don't do it now
# because proper error handling is not in place yet. # because proper error handling is not in place yet.
@ -173,23 +173,23 @@ create trigger trg after update on t1 for each row set new.i:=1;
create trigger trg before insert on t2 for each row set @a:=1; create trigger trg before insert on t2 for each row set @a:=1;
create trigger trg before insert on t1 for each row set @a:=1; create trigger trg before insert on t1 for each row set @a:=1;
--error 1358 --error 1359
create trigger trg after insert on t1 for each row set @a:=1; create trigger trg after insert on t1 for each row set @a:=1;
--error 1358 --error 1359
create trigger trg2 before insert on t1 for each row set @a:=1; create trigger trg2 before insert on t1 for each row set @a:=1;
drop trigger t1.trg; drop trigger t1.trg;
--error 1359 --error 1360
drop trigger t1.trg; drop trigger t1.trg;
create view v1 as select * from t1; create view v1 as select * from t1;
--error 1360 --error 1361
create trigger trg before insert on v1 for each row set @a:=1; create trigger trg before insert on v1 for each row set @a:=1;
drop view v1; drop view v1;
drop table t1; drop table t1;
create temporary table t1 (i int); create temporary table t1 (i int);
--error 1360 --error 1361
create trigger trg before insert on t1 for each row set @a:=1; create trigger trg before insert on t1 for each row set @a:=1;
drop table t1; drop table t1;

3
sql/sp_head.cc
View File

@ -311,9 +311,8 @@ sp_head::init_strings(THD *thd, LEX *lex, sp_name *name)
} }
else if (thd->db) else if (thd->db)
{ {
m_db.length= thd->db_length m_db.length= thd->db_length;
m_db.str= strmake_root(root, thd->db, m_db.length); m_db.str= strmake_root(root, thd->db, m_db.length);
} }
if (m_param_begin && m_param_end) if (m_param_begin && m_param_end)

2
sql/sql_trigger.cc
View File

@ -88,7 +88,7 @@ int mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
again until we are done. (Acquiring LOCK_open is not enough because again until we are done. (Acquiring LOCK_open is not enough because
global read lock is held without helding LOCK_open). global read lock is held without helding LOCK_open).
*/ */
if (wait_if_global_read_lock(thd, 0)) if (wait_if_global_read_lock(thd, 0, 0))
DBUG_RETURN(-1); DBUG_RETURN(-1);
VOID(pthread_mutex_lock(&LOCK_open)); VOID(pthread_mutex_lock(&LOCK_open));