diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-07-28 21:56:15 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-07-28 21:56:15 +0400 |
| commit | 8c4e3896066c613abf60b8d5ec6b57102fdb139b (patch) | |
| tree | 786c56fda759133b5e84c930c40b8538e6069c34 /sql/sql_acl.cc | |
| parent | c4c678f653077f6ca93bd8b50906410e29d4b127 (diff) | |
| download | mariadb-git-8c4e3896066c613abf60b8d5ec6b57102fdb139b.tar.gz | |
Fix a failing assert when running funcs_1.innodb_trig_03 test.
The failure was introduced by a precursor patch for the
fix for Bug#52044.
When opening tables for GRANT statement
to check that subject columns exist,
mysql_table_grant() would try to lock the
tables, and thus start a transaction.
This was unnecessary and lead to an assert.
sql/sql_acl.cc:
Use open_normal_and_derived_tables() rather than
open_and_lock_tables() to avoid an assert
that no transaction is started in GRANT statement.
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 0008968de2a..7163702d401 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3072,7 +3072,7 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list, class LEX_COLUMN *column; List_iterator <LEX_COLUMN> column_iter(columns); - if (open_and_lock_tables(thd, table_list, TRUE, 0)) + if (open_normal_and_derived_tables(thd, table_list, 0)) DBUG_RETURN(TRUE); while ((column = column_iter++)) |