diff options
| author | unknown <konstantin@mysql.com> | 2005-07-14 01:39:40 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-14 01:39:40 +0400 |
| commit | 8ba10fa95b23a8d99bd199aff5ba2b4b38d9f9de (patch) | |
| tree | 7cde4b48321b3b33647f2c12712510eeffd137fb /sql | |
| parent | 060730f40f8f9269c545eaadbd8bc88c6996e46b (diff) | |
| parent | 10ec1349d709301f6c6223272df6eaf9248ee1c8 (diff) | |
| download | mariadb-git-8ba10fa95b23a8d99bd199aff5ba2b4b38d9f9de.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-root
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_trigger.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index f058c306d42..fd79fc8b878 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -69,7 +69,10 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) But do we want this ? */ - if (open_and_lock_tables(thd, tables)) + /* We should have only one table in table list. */ + DBUG_ASSERT(tables->next_global == 0); + + if (!(table= open_ltable(thd, tables, tables->lock_type))) DBUG_RETURN(TRUE); /* @@ -80,8 +83,6 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) if (check_global_access(thd, SUPER_ACL)) DBUG_RETURN(TRUE); - table= tables->table; - /* We do not allow creation of triggers on views or temporary tables. We have to do this check here and not in |