From f3d2341f1f30384d92b285c1e421d8c599ee2b79 Mon Sep 17 00:00:00 2001
From: unknown <monty@tik.mysql.com>
Date: Mon, 13 Nov 2000 23:55:10 +0200
Subject: Bug fixes, TRUNCATE, safer passwords on command line and connect
 timeout

Docs/manual.texi:
  Update of safe_mysqld, TRUNCATE and changes for 3.23.28
client/mysql.cc:
  Added --timeout
client/mysqladmin.c:
  Safer password handling
client/mysqldump.c:
  Safer password handling
client/mysqlimport.c:
  Safer password handling
client/mysqlshow.c:
  Safer password handling
configure.in:
  Fixes for Darwin and added test of poll
include/my_pthread.h:
  Fixes for darwin
include/violite.h:
  Added test for polling
libmysql/libmysql.c:
  connect timeout
libmysql/violite.c:
  connect timeout
mysys/hash.c:
  Fix when delting from empty table
scripts/safe_mysqld.sh:
  Added --open-files, --core-file-size and --timezone
sql-bench/bench-init.pl.sh:
  Function print_time
sql-bench/crash-me.sh:
  Added test of truncate
sql-bench/test-insert.sh:
  More "estimated" tests
sql-bench/test-select.sh:
  More "estimated" tests
sql/filesort.cc:
  Removed allocation of extra memory
sql/ha_berkeley.cc:
  Better estimation of number of rows
sql/item_create.cc:
  Truncate
sql/item_create.h:
  Truncate
sql/item_strfunc.cc:
  Removed usage of MY_FAE
sql/lex.h:
  Truncate
sql/lock.cc:
  Fixed possible loop bug
sql/log.cc:
  Removed usage of FILE:s
sql/mysqld.cc:
  Print of more server variables
sql/sql_class.h:
  Changed FILE -> File
sql/sql_insert.cc:
  Fixed bug in temptable handling
sql/sql_lex.h:
  Cleanup
sql/sql_load.cc:
  Removed usage of MY_FAE
sql/sql_parse.cc:
  Cleanup + TRUNCATE
sql/sql_select.cc:
  Cleanup + fix for INSERT ... SELECT
sql/sql_yacc.yy:
  TRUNCATE
sql/violite.c:
  Merge with client/violite.c
strings/strstr-sparc.s:
  Fixed wrong register usage
---
 sql/sql_insert.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'sql/sql_insert.cc')

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 9fc47cd4dfc..ab580e7f2b2 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -571,7 +571,7 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list)
       thread_count++;
       pthread_mutex_unlock(&LOCK_thread_count);
       if (!(tmp->thd.db=my_strdup(table_list->db,MYF(MY_WME))) ||
-	  !(tmp->thd.query=my_strdup(table_list->real_name,MYF(MY_FAE))))
+	  !(tmp->thd.query=my_strdup(table_list->real_name,MYF(MY_WME))))
       {
 	delete tmp;
 	thd->fatal_error=1;
@@ -1323,7 +1323,8 @@ bool select_create::send_eof()
   {
     VOID(pthread_mutex_lock(&LOCK_open));
     mysql_unlock_tables(thd, lock);
-    hash_delete(&open_cache,(byte*) table);
+    if (!table->tmp_table)
+      hash_delete(&open_cache,(byte*) table);
     lock=0; table=0;
     VOID(pthread_mutex_unlock(&LOCK_open));
   }
@@ -1341,7 +1342,8 @@ void select_create::abort()
   if (table)
   {
     enum db_type table_type=table->db_type;
-    hash_delete(&open_cache,(byte*) table);
+    if (!table->tmp_table)
+      hash_delete(&open_cache,(byte*) table);
     quick_rm_table(table_type,db,name);
     table=0;
   }
-- 
cgit v1.2.1