bk commit into 5.1 tree (tomas:1.1929)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1929 05/10/07 14:55:11 tomas@stripped +5 -0
  merge

  sql/sql_yacc.yy
    1.409 05/10/07 14:55:00 tomas@stripped +0 -3
    merge

  sql/sql_parse.cc
    1.475 05/10/07 14:55:00 tomas@stripped +0 -4
    merge

  sql/sql_lex.h
    1.198 05/10/07 14:55:00 tomas@stripped +0 -1
    merge

  sql/ha_ndbcluster.cc
    1.227 05/10/07 14:54:59 tomas@stripped +7 -7
    merge

  configure.in
    1.299 05/10/07 14:54:59 tomas@stripped +2 -2
    merge

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-5.0

--- 1.298/configure.in	2005-10-07 10:57:26 +02:00
+++ 1.299/configure.in	2005-10-07 14:54:59 +02:00
@@ -7,7 +7,7 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # Don't forget to also update the NDB lines below.
-AM_INIT_AUTOMAKE(mysql, 5.1.2-a_drop5p4)
+AM_INIT_AUTOMAKE(mysql, 5.1.2-a_drop5p5)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=1
 NDB_VERSION_BUILD=2
-NDB_VERSION_STATUS="a_drop5p4"
+NDB_VERSION_STATUS="a_drop5p5"
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4

--- 1.197/sql/sql_lex.h	2005-10-07 10:57:46 +02:00
+++ 1.198/sql/sql_lex.h	2005-10-07 14:55:00 +02:00
@@ -91,7 +91,6 @@
   SQLCOM_CREATE_TRIGGER, SQLCOM_DROP_TRIGGER,
   SQLCOM_XA_START, SQLCOM_XA_END, SQLCOM_XA_PREPARE,
   SQLCOM_XA_COMMIT, SQLCOM_XA_ROLLBACK, SQLCOM_XA_RECOVER,
-  SQLCOM_SHOW_NDBCLUSTER_STATUS,
   /* This should be the last !!! */
 
   SQLCOM_END

--- 1.474/sql/sql_parse.cc	2005-10-07 10:57:47 +02:00
+++ 1.475/sql/sql_parse.cc	2005-10-07 14:55:00 +02:00
@@ -22,10 +22,6 @@
 #include <myisam.h>
 #include <my_dir.h>
 
-#ifdef HAVE_NDBCLUSTER_DB
-#include "ha_ndbcluster.h"
-#endif
-
 #ifdef HAVE_INNOBASE_DB
 #include "ha_innodb.h"
 #endif

--- 1.408/sql/sql_yacc.yy	2005-10-07 10:57:55 +02:00
+++ 1.409/sql/sql_yacc.yy	2005-10-07 14:55:00 +02:00
@@ -7267,9 +7267,6 @@
 	    case DB_TYPE_INNODB:
 	      Lex->sql_command = SQLCOM_SHOW_INNODB_STATUS;
 	      break;
-	    case DB_TYPE_NDBCLUSTER:
-	      Lex->sql_command = SQLCOM_SHOW_NDBCLUSTER_STATUS;
-	      break;
 	    default:
 	      my_error(ER_NOT_SUPPORTED_YET, MYF(0), "STATUS");
 	      YYABORT;

--- 1.226/sql/ha_ndbcluster.cc	2005-10-07 11:05:52 +02:00
+++ 1.227/sql/ha_ndbcluster.cc	2005-10-07 14:54:59 +02:00
@@ -7081,11 +7081,11 @@
   thd->init_for_queries();
   thd->version=refresh_version;
   thd->set_time();
-  thd->host_or_ip= "";
+  thd->main_security_ctx.host_or_ip= "";
   thd->client_capabilities = 0;
   my_net_init(&thd->net, 0);
-  thd->master_access= ~0;
-  thd->priv_user = 0;
+  thd->main_security_ctx.master_access= ~0;
+  thd->main_security_ctx.priv_user = 0;
 
   /*
     wait for mysql server to start
@@ -8654,7 +8654,7 @@
 /*
   Implements the SHOW NDB STATUS command.
 */
-bool ndbcluster_show_status(THD *thd)
+int ndbcluster_show_status(THD *thd)
 {
   Protocol *protocol= thd->protocol;
   ulonglong ndb_latest_epoch= 0;
@@ -9902,11 +9902,11 @@
   thd->system_thread= SYSTEM_THREAD_NDBCLUSTER_BINLOG;
   thd->version= refresh_version;
   thd->set_time();
-  thd->host_or_ip= "";
+  thd->main_security_ctx.host_or_ip= "";
   thd->client_capabilities= 0;
   my_net_init(&thd->net, 0);
-  thd->master_access= ~0;
-  thd->priv_user= 0;
+  thd->main_security_ctx.master_access= ~0;
+  thd->main_security_ctx.priv_user= 0;
 
   thd->proc_info= "Waiting for ndbcluster to start";