Fixed bug in 'drop table'

Portability fixes


sql-bench/bench-init.pl.sh:
  Change mode to -rw-rw-r--
sql-bench/compare-results.sh:
  Change mode to -rw-rw-r--
sql-bench/run-all-tests.sh:
  Change mode to -rw-rw-r--
sql-bench/test-ATIS.sh:
  Change mode to -rw-rw-r--
sql-bench/test-alter-table.sh:
  Change mode to -rw-rw-r--
sql-bench/test-big-tables.sh:
  Change mode to -rw-rw-r--
sql-bench/test-connect.sh:
  Change mode to -rw-rw-r--
sql-bench/test-create.sh:
  Change mode to -rw-rw-r--
sql-bench/test-select.sh:
  Change mode to -rw-rw-r--
sql-bench/test-wisconsin.sh:
  Change mode to -rw-rw-r--
Docs/manual.texi:
  Added documentation for perror
myisam/mi_check.c:
  Portability fix
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
scripts/mysqlhotcopy.sh:
  Added --noindices
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/copy-db.sh:
  Changed multi_value_insert -> insert_multi_value
sql-bench/crash-me.sh:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/Adabas.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/access.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/access_odbc.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/frontbase.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/interbase.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/mimer.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/ms-sql.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/msql.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/mysql-3.22.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/mysql-3.23.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/mysql.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/oracle.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/pg.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/print-limit-table:
  Better groups
sql-bench/server-cfg.sh:
  Changed multi_value_insert -> insert_multi_value
sql-bench/test-insert.sh:
  Changed multi_value_insert -> insert_multi_value
sql/ha_myisam.cc:
  Added warning of number of rows changed in optimize
sql/mysqlbinlog.cc:
  Portability fix
sql/mysqld.cc:
  Changed mysqld to take less stack and safer shutdown
sql/share/swedish/errmsg.OLD:
  update
sql/sql_base.cc:
  Fixed 'drop table' bug
sql/sql_parse.cc:
  Fixed bug in 'TRUNCATE'
sql/sql_show.cc:
  Don't lock keycache when you do 'show variables'

1 files changed, 17 insertions, 16 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 88b60ef92ad..810cd3e3b17 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -170,6 +170,7 @@ static struct rand_struct sql_rand;
 static int cleanup_done;
 static char **defaults_argv,time_zone[30];
 static const char *default_table_type_name;
+static char glob_hostname[FN_REFLEN];
 
 #ifdef HAVE_OPENSSL
 static bool opt_use_ssl = FALSE;
@@ -356,6 +357,7 @@ static void close_connections(void)
 #if defined(AIX_3_2) || defined(HAVE_DEC_3_2_THREADS)
     if (ip_sock != INVALID_SOCKET)
     {
+      DBUG_PRINT("error",("closing TCP/IP and socket files"));
       VOID(shutdown(ip_sock,2));
       VOID(closesocket(ip_sock));
       VOID(shutdown(unix_sock,2));
@@ -607,12 +609,15 @@ void clean_up(void)
   free_defaults(defaults_argv);
   my_free(mysql_tmpdir,MYF(0));
   x_free(opt_bin_logname);
+#ifndef __WIN__
   (void) my_delete(pidfile_name,MYF(0));	// This may not always exist
-  my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
+#endif
+  my_thread_end();
 
   /* Tell main we are ready */
   (void) pthread_mutex_lock(&LOCK_thread_count);
   ready_to_exit=1;
+  /* do the broadcast inside the lock to ensure that my_end() is not called */
   (void) pthread_cond_broadcast(&COND_thread_count);
   (void) pthread_mutex_unlock(&LOCK_thread_count);
 } /* clean_up */
@@ -926,8 +931,8 @@ void end_thread(THD *thd, bool put_in_cache)
   DBUG_PRINT("info", ("sending a broadcast"))
 
   /* Tell main we are ready */
-  (void) pthread_cond_broadcast(&COND_thread_count);
   (void) pthread_mutex_unlock(&LOCK_thread_count);
+  (void) pthread_cond_broadcast(&COND_thread_count);
   DBUG_PRINT("info", ("unlocked thread_count mutex"))
 #ifdef ONE_THREAD
   if (!(test_flags & TEST_NO_THREADS))	// For debugging under Linux
@@ -1308,7 +1313,6 @@ int main(int argc, char **argv)
 #endif
 {
   DEBUGGER_OFF;
-  char hostname[FN_REFLEN];
 
   my_umask=0660;		// Default umask for new files
   my_umask_dir=0700;		// Default umask for new directories
@@ -1332,9 +1336,9 @@ int main(int argc, char **argv)
 #endif
 #endif
 
-  if (gethostname(hostname,sizeof(hostname)-4) < 0)
-    strmov(hostname,"mysql");
-  strmov(pidfile_name,hostname);
+  if (gethostname(glob_hostname,sizeof(glob_hostname)-4) < 0)
+    strmov(glob_hostname,"mysql");
+  strmov(pidfile_name,glob_hostname);
   strmov(strcend(pidfile_name,'.'),".pid");	// Add extension
 #ifdef DEMO_VERSION
   strcat(server_version,"-demo");
@@ -1488,9 +1492,9 @@ int main(int argc, char **argv)
 
   /* Setup log files */
   if (opt_log)
-    open_log(&mysql_log, hostname, opt_logname, ".log", LOG_NORMAL);
+    open_log(&mysql_log, glob_hostname, opt_logname, ".log", LOG_NORMAL);
   if (opt_update_log)
-    open_log(&mysql_update_log, hostname, opt_update_logname, "",
+    open_log(&mysql_update_log, glob_hostname, opt_update_logname, "",
 	     LOG_NEW);
   if (opt_bin_log)
   {
@@ -1499,12 +1503,12 @@ int main(int argc, char **argv)
 	if (!opt_bin_logname)
 	  {
 	    char tmp[FN_REFLEN];
-	    strnmov(tmp,hostname,FN_REFLEN-5);
+	    strnmov(tmp,glob_hostname,FN_REFLEN-5);
 	    strmov(strcend(tmp,'.'),"-bin");
 	    opt_bin_logname=my_strdup(tmp,MYF(MY_WME));
 	  }
 	mysql_bin_log.set_index_file_name(opt_binlog_index_name);
-	open_log(&mysql_bin_log, hostname, opt_bin_logname, "-bin",
+	open_log(&mysql_bin_log, glob_hostname, opt_bin_logname, "-bin",
 		 LOG_BIN);
       }
     else
@@ -1512,7 +1516,7 @@ int main(int argc, char **argv)
   }
   
   if (opt_slow_log)
-    open_log(&mysql_slow_log, hostname, opt_slow_logname, "-slow.log",
+    open_log(&mysql_slow_log, glob_hostname, opt_slow_logname, "-slow.log",
 	     LOG_NORMAL);
   if (ha_init())
   {
@@ -1711,10 +1715,7 @@ int main(int argc, char **argv)
     pthread_cond_wait(&COND_thread_count,&LOCK_thread_count);
   }
   (void) pthread_mutex_unlock(&LOCK_thread_count);
-#ifndef __WIN__
-  (void) my_delete(pidfile_name,MYF(0));	// Not neaded anymore
-#endif
-  my_thread_end();
+  my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
   exit(0);
   return(0);					/* purecov: deadcode */
 }
@@ -2089,8 +2090,8 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused)))
 #ifdef __NT__
   pthread_mutex_lock(&LOCK_thread_count);
   handler_count--;
-  pthread_cond_signal(&COND_handler_count);
   pthread_mutex_unlock(&LOCK_thread_count);
+  pthread_cond_signal(&COND_handler_count);
 #endif
   DBUG_RETURN(0);
 }