diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-06-18 02:01:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-06-18 02:01:34 +0300 |
| commit | 2534521f9a7d66b48cb9ca9402e82a0c58b156d8 (patch) | |
| tree | 920207a20892d748bd6b04a6699f07a5f3f1fae5 /sql/sp_head.cc | |
| parent | 0b7f8ed9738546f57d9159b52894e5abc99086fc (diff) | |
| download | mariadb-git-2534521f9a7d66b48cb9ca9402e82a0c58b156d8.tar.gz | |
Fixed some merge issues:
- temporary tables now works
- mysql-system_tables updated to not use temporary tables
- PASSWORD() function fixed
- Support for STATS_AUTO_RECALC, STATS_PERSISTENT and STATS_SAMPLE_PAGES table options
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index e54bd796bbb..59363a7a04a 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -3094,7 +3094,8 @@ int sp_instr::exec_open_and_lock_tables(THD *thd, TABLE_LIST *tables) Check whenever we have access to tables for this statement and open and lock them before executing instructions core function. */ - if (check_table_access(thd, SELECT_ACL, tables, FALSE, UINT_MAX, FALSE) + if (open_temporary_tables(thd, tables) || + check_table_access(thd, SELECT_ACL, tables, FALSE, UINT_MAX, FALSE) || open_and_lock_tables(thd, tables, TRUE, 0)) result= -1; else |