diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-06-12 16:34:18 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-06-12 16:34:18 +0300 |
| commit | b96af9a3abe792c8711d59b693509ccd0677a150 (patch) | |
| tree | 526a4e021acc77d2379cee74873bd3cae1b53fd9 /sql/sql_trigger.cc | |
| parent | 33ffe0dd29b6564e49dde8b1abda914da4b2f178 (diff) | |
| parent | 9892ace475752e0ddd333500bec91e13ca54d0f3 (diff) | |
| download | mariadb-git-b96af9a3abe792c8711d59b693509ccd0677a150.tar.gz | |
references lp:1011983
Merged latest MariaDB development in: bzr merge lp:maria/5.5
=>
Text conflict in CMakeLists.txt
Text conflict in sql/handler.h
Text conflict in support-files/CMakeLists.txt
3 conflicts
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 149c2431324..00baa0b596f 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -561,7 +561,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) if (result) goto end; - close_all_tables_for_name(thd, table->s, FALSE); + close_all_tables_for_name(thd, table->s, HA_EXTRA_NOT_USED); /* Reopen the table if we were under LOCK TABLES. Ignore the return value for now. It's better to |