bk commit into 5.0 tree (stewart:1.2005)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart 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.2005 05/12/28 00:57:18 stewart@stripped +7 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
  into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

  sql/mysqld.cc
    1.525 05/12/28 00:57:12 stewart@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.78 05/12/28 00:57:11 stewart@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.40 05/12/28 00:57:11 stewart@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.28 05/12/28 00:57:11 stewart@stripped +0 -0
    Auto merged

  mysql-test/r/fulltext2.result
    1.11 05/12/28 00:57:10 stewart@stripped +0 -0
    Auto merged

  mysql-test/r/fulltext2.result
    1.9.1.2 05/12/28 00:57:10 stewart@stripped +0 -0
    Change mode to -rw-rw-r--

  myisam/mi_delete.c
    1.37 05/12/28 00:56:46 stewart@stripped +0 -0
    Auto merged

  client/mysql.cc
    1.194 05/12/28 00:56:46 stewart@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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/main/RESYNC

--- 1.193/client/mysql.cc	2005-12-05 22:11:59 +11:00
+++ 1.194/client/mysql.cc	2005-12-28 00:56:46 +11:00
@@ -259,7 +259,7 @@
   { "quit",   'q', com_quit,   0, "Quit mysql." },
   { "rehash", '#', com_rehash, 0, "Rebuild completion hash." },
   { "source", '.', com_source, 1,
-    "Execute a SQL script file. Takes a file name as an argument."},
+    "Execute an SQL script file. Takes a file name as an argument."},
   { "status", 's', com_status, 0, "Get status information from the server."},
 #ifdef USE_POPEN
   { "system", '!', com_shell,  1, "Execute a system shell command."},

--- 1.36/myisam/mi_delete.c	2005-10-28 03:04:31 +10:00
+++ 1.37/myisam/mi_delete.c	2005-12-28 00:56:46 +11:00
@@ -170,7 +170,7 @@
     goto err;
   }
   if ((error=d_search(info,keyinfo,
-                      (keyinfo->flag & HA_FULLTEXT ? SEARCH_FIND
+                      (keyinfo->flag & HA_FULLTEXT ? SEARCH_FIND | SEARCH_UPDATE
                                                    : SEARCH_SAME),
                        key,key_length,old_root,root_buff)) >0)
   {

--- 1.524/sql/mysqld.cc	2005-12-25 00:32:39 +11:00
+++ 1.525/sql/mysqld.cc	2005-12-28 00:57:12 +11:00
@@ -4637,7 +4637,7 @@
   {"bootstrap", OPT_BOOTSTRAP, "Used by mysql installation scripts.", 0, 0, 0,
    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"character-set-client-handshake", OPT_CHARACTER_SET_CLIENT_HANDSHAKE,
-   "Don't use client side character set value sent during handshake.",
+   "Don't ignore client side character set value sent during handshake.",
    (gptr*) &opt_character_set_client_handshake,
    (gptr*) &opt_character_set_client_handshake,
     0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},

--- 1.39/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-12-19 19:01:14 +11:00
+++ 1.40/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-12-28 00:57:11 +11:00
@@ -11137,7 +11137,7 @@
   ndb_mgm_get_int_parameter(p, CFG_DB_NO_REPLICAS, &cnoReplicas);
   if (cnoReplicas > 4)
   {
-    progError(__LINE__, NDBD_EXIT_INVALID_CONFIG,
+    progError(__LINE__, ERR_INVALID_CONFIG,
 	      "Only up to four replicas are supported. Check NoOfReplicas.");
   }