From f614f19e884aa69996984abd8444edbfd35422a5 Mon Sep 17 00:00:00 2001 From: "mikef@nslinuxw4.bedford.progress.com" <> Date: Wed, 6 Jun 2001 15:45:07 -0400 Subject: [PATCH] sql_table.cc re-apply a lost change where we check to see if the sql_table.cc table handler supports temporary tables --- BitKeeper/etc/logging_ok | 9 +-------- sql/sql_table.cc | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 0ef0a6a42c7..20c4a1faba5 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,8 +1 @@ -heikki@donna.mysql.fi -jani@janikt.pp.saunalahti.fi -monty@hundin.mysql.fi -mwagner@evoq.mwagner.org -paul@central.snake.net -sasha@mysql.sashanet.com -serg@serg.mysql.com -paul@teton.kitebird.com +mikef@nslinuxw4.bedford.progress.com diff --git a/sql/sql_table.cc b/sql/sql_table.cc index f287481921d..3fa2bc5d9d3 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -221,6 +221,13 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, db_options|=HA_OPTION_PACK_RECORD; file=get_new_handler((TABLE*) 0, create_info->db_type); + if ((create_info->options & HA_LEX_CREATE_TMP_TABLE) && + (file->option_flag() & HA_NO_TEMP_TABLES)) + { + my_error(ER_ILLEGAL_HA,MYF(0),table_name); + DBUG_RETURN(-1); + } + /* Don't pack keys in old tables if the user has requested this */ while ((sql_field=it++))