bk commit into 4.1 tree (tim:1.2391)

[tim]

Below is the list of changes that have just been committed into a local
4.1 repository of tim. When tim does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2391 05/08/25 14:26:28 tim@stripped +3 -0
  Merge bk-internal:/home/bk/mysql-4.1
  into  siva.hindu.god:/opt/home/tim/m/41/a

  sql/set_var.cc
    1.170 05/08/25 14:26:22 tim@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.577 05/08/25 14:26:21 tim@stripped +0 -0
    Auto merged

  sql/mysql_priv.h
    1.357 05/08/25 14:26:21 tim@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tim
# Host:	siva.hindu.god
# Root:	/opt/home/tim/m/41/a/RESYNC

--- 1.576/sql/mysqld.cc	2005-08-11 15:53:15 +12:00
+++ 1.577/sql/mysqld.cc	2005-08-25 14:26:21 +12:00
@@ -152,6 +152,7 @@
 #define zVOLSTATE_MAINTENANCE 3
 
 #ifdef __NETWARE__
+#include <nks/netware.h>
 #include <nks/vm.h>
 #include <library.h>
 #include <monitor.h>
@@ -650,7 +651,6 @@
   }
 #endif
   end_thr_alarm(0);			 // Abort old alarms.
-  end_slave();
 
   /*
     First signal all threads that it's time to die
@@ -666,6 +666,9 @@
   {
     DBUG_PRINT("quit",("Informing thread %ld that it's time to die",
 		       tmp->thread_id));
+    /* We skip slave threads on this first loop through. */
+    if (tmp->slave_thread) continue;
+
     tmp->killed= 1;
     if (tmp->mysys_var)
     {
@@ -682,6 +685,8 @@
   }
   (void) pthread_mutex_unlock(&LOCK_thread_count); // For unlink from list
 
+  end_slave();
+
   if (thread_count)
     sleep(2);					// Give threads time to die
 
@@ -4324,7 +4329,7 @@
    (gptr*) &default_collation_name, (gptr*) &default_collation_name,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   {"default-storage-engine", OPT_STORAGE_ENGINE,
-   "Set the default storage engine (table tyoe) for tables.", 0, 0,
+   "Set the default storage engine (table type) for tables.", 0, 0,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"default-table-type", OPT_STORAGE_ENGINE,
    "(deprecated) Use --default-storage-engine.", 0, 0,

--- 1.169/sql/set_var.cc	2005-07-29 10:37:00 +12:00
+++ 1.170/sql/set_var.cc	2005-08-25 14:26:22 +12:00
@@ -2956,7 +2956,18 @@
 {
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (!user->host.str)
-    user->host.str= (char*) thd->host_or_ip;
+  {
+    if (thd->priv_host != 0)
+    {
+      user->host.str= (char *) thd->priv_host;
+      user->host.length= strlen(thd->priv_host);
+    }
+    else
+    {
+      user->host.str= (char *)"%";
+      user->host.length= 1;
+    }
+  }
   /* Returns 1 as the function sends error to client */
   return check_change_password(thd, user->host.str, user->user.str,
                                password, strlen(password)) ? 1 : 0;