Fixes during review of pushed code

Added back missing return in mysql_delete()


mysql-test/my_manage.c:
  Cleanup: Remove some #ifdef
mysql-test/r/drop_temp_table.result:
  Delete database that may be left from other test
mysql-test/t/drop_temp_table.test:
  Delete database that may be left from other test
sql/log.cc:
  false -> FALSE
  true -> TRUE
  Wait until readers_count is 0 (not just for a signal)
  
  NOTE: it's very likely that the way to handle readers_count is wrong.
  (We are in pthread_cond_wait freeing a mutex that is not the innermost mutex,
  which can lead to deadlocks)
  
  I will talk with Guilhem about this ASAP
sql/log_event.h:
  Remove number from last even to help future merges
  (all compilers I know of can handle this properly)
sql/sql_delete.cc:
  Add back missing RETURN (was lost in a merge)
  Indentation fixes

1 files changed, 10 insertions, 13 deletions

diff --git a/mysql-test/my_manage.c b/mysql-test/my_manage.c
index 919d3bd0529..e5d1be42f95 100644
--- a/mysql-test/my_manage.c
+++ b/mysql-test/my_manage.c
@@ -231,9 +231,6 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)),
 {
   arg_list_t al;
   int err= 0;
-#ifndef __WIN__
-  int i;
-#endif
   char trash[FN_REFLEN];
 
   /* mysqladmin file */
@@ -247,16 +244,11 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)),
   add_arg(&al, "--user=%s", user);
   add_arg(&al, "--password=%s", password);
   add_arg(&al, "--silent");
+  add_arg(&al, "--host=localhost");
 
-/* #ifdef NOT_USED */
 #ifndef __NETWARE__
-  add_arg(&al, "-O");
-  add_arg(&al, "connect_timeout=10");
+  add_arg(&al, "--connect_timeout=10");
   add_arg(&al, "-w");
-#endif
-
-  add_arg(&al, "--host=localhost");
-#ifndef __NETWARE__
   add_arg(&al, "--protocol=tcp");
 #endif
   add_arg(&al, "ping");
@@ -266,9 +258,14 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)),
     -- we will try the ping multiple times
   */
 #ifndef __WIN__
-  for (i= 0; (i < TRY_MAX)
-         && (err= spawn(mysqladmin_file, &al, TRUE, NULL,
-                        trash, NULL, NULL)); i++) sleep(1);
+  {
+    int i;
+    for (i= 0;
+         (i < TRY_MAX) && (err= spawn(mysqladmin_file, &al, TRUE, NULL,
+                                      trash, NULL, NULL));
+         i++)
+      sleep(1);
+  }
 #else
   err= spawn(mysqladmin_file, &al, TRUE, NULL,trash, NULL, NULL);
 #endif