From 70092601bc3fa0fbae06b12c1e77b81d05bc3224 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 27 Jun 2013 17:42:18 +0300 Subject: 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). --- sql/sql_admin.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sql/sql_admin.cc') 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; -- cgit v1.2.1