diff options
| author | unknown <sanja@montyprogram.com> | 2013-06-27 17:42:18 +0300 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-06-27 17:42:18 +0300 |
| commit | 70092601bc3fa0fbae06b12c1e77b81d05bc3224 (patch) | |
| tree | 41d08024013f6b845fb23be2defcc31d9e1009a2 /sql/sql_admin.cc | |
| parent | 94d722b6a43b86ee760f07915921cf58f9869a5d (diff) | |
| download | mariadb-git-70092601bc3fa0fbae06b12c1e77b81d05bc3224.tar.gz | |
merge of 2876.430.11 & 2876.430.1
CF_PREOPEN_TMP_TABLES & CF_HA_CLOSE & Patch for Bug#11746602 (27480: Extend CREATE TEMPORARY TABLES
privilege to allow temp table operations).
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 214cfdd0bbb..b21619753cf 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -122,8 +122,7 @@ static int prepare_for_repair(THD *thd, TABLE_LIST *table_list, MDL_EXCLUSIVE, MDL_TRANSACTION); if (lock_table_names(thd, table_list, table_list->next_global, - thd->variables.lock_wait_timeout, - MYSQL_OPEN_SKIP_TEMPORARY)) + thd->variables.lock_wait_timeout, 0)) DBUG_RETURN(0); has_mdl_lock= TRUE; |