Portability fixes.

Changed mysql-test-run.sh to test for files to get shorter, more reliable timeouts.

Docs/manual.texi

@@ -13636,7 +13636,6 @@ connection between a MySQL server and a MySQL client.
 If you are using MySQL 4.0, you can also use internal openssl support.
 @xref{Secure connections}.
 
-
 To make a MySQL system secure, you should strongly consider the
 following suggestions:
 
@@ -13652,8 +13651,7 @@ this:
 
 @example
 shell> mysql -u root mysql
-mysql> UPDATE user SET Password=PASSWORD('new_password')
-           WHERE user='root';
+mysql> UPDATE user SET Password=PASSWORD('new_password') WHERE user='root';
 mysql> FLUSH PRIVILEGES;
 @end example
 
@@ -15395,17 +15393,17 @@ password using the @code{PASSWORD()} function):
 
 @example
 shell> mysql -u root mysql
-mysql> UPDATE user SET Password=PASSWORD('new_password')
-           WHERE user='root';
-mysql> FLUSH PRIVILEGES;
+mysql> SET PASSWORD FOR root@@localhost=PASSWORD('new_password');
 @end example
 
-You can, in MySQL Version 3.22 and above, use the @code{SET PASSWORD}
-statement:
+If you know what you are doing, you can also directly manipulate the
+privilege tables:
 
 @example
 shell> mysql -u root mysql
-mysql> SET PASSWORD FOR root=PASSWORD('new_password');
+mysql> UPDATE user SET Password=PASSWORD('new_password')
+           WHERE user='root';
+mysql> FLUSH PRIVILEGES;
 @end example
 
 Another way to set the password is by using the @code{mysqladmin} command:

client/mysqltest.c

@@ -75,17 +75,21 @@
 #define MAX_EXPECTED_ERRORS 10
 #define QUERY_SEND  1
 #define QUERY_REAP  2
-#define CON_RETRY_SLEEP 1 /* how long to sleep before trying to connect again*/
-#define MAX_CON_TRIES   2 /* sometimes in a test the client starts before
-			   * the server - to solve the problem, we try again
-			   * after some sleep if connection fails the first
-			   * time */
 #ifndef MYSQL_MANAGER_PORT
 #define MYSQL_MANAGER_PORT 23546
 #endif
 
+/*
+  Sometimes in a test the client starts before
+  the server - to solve the problem, we try again
+  after some sleep if connection fails the first
+  time
+*/
+#define CON_RETRY_SLEEP 2
+#define MAX_CON_TRIES   5
+
 enum {OPT_MANAGER_USER=256,OPT_MANAGER_HOST,OPT_MANAGER_PASSWD,
- OPT_MANAGER_PORT,OPT_MANAGER_WAIT_TIMEOUT};
+      OPT_MANAGER_PORT,OPT_MANAGER_WAIT_TIMEOUT};
 
 static int record = 0, verbose = 0, silent = 0, opt_sleep=0;
 static char *db = 0, *pass=0;

mysql-test/r/query_cache.result

@@ -291,10 +291,4 @@ show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	2
 reset query cache;
-show variables like "query_cache_size";
-Variable_name	Value
-query_cache_size	1039700
-show status like "Qcache_free_memory";
-Variable_name	Value
-Qcache_free_memory	1039700
 drop table t1;

mysql-test/t/query_cache.test

@@ -178,6 +178,9 @@ enable_result_log;
 show status like "Qcache_hits";
 show status like "Qcache_queries_in_cache";
 reset query cache;
-show variables like "query_cache_size";
-show status like "Qcache_free_memory";
 drop table t1;
+
+# The following tests can't be done as the values differen on 32 and 64 bit
+#  machines :(
+#show variables like "query_cache_size";
+#show status like "Qcache_free_memory";

sql/sql_cache.cc

@@ -2672,6 +2672,7 @@ uint Query_cache::filename_2_table_key (char *key, const char *path)
 
 void Query_cache::wreck(uint line, const char *message)
 {
+  THD *thd=current_thd;
   DBUG_ENTER("Query_cache::wreck");
   query_cache_size = 0;
   if (*message)
@@ -2679,7 +2680,8 @@ void Query_cache::wreck(uint line, const char *message)
   DBUG_PRINT("warning", ("=================================="));
   DBUG_PRINT("warning", ("%5d QUERY CACHE WRECK => DISABLED",line));
   DBUG_PRINT("warning", ("=================================="));
-  current_thd->killed = 1;
+  if (thd)
+    thd->killed = 1;
   bins_dump();
   cache_dump();
   DBUG_VOID_RETURN;