List:Commits« Previous MessageNext Message »
From:Sergei Golubchik Date:January 7 2006 3:27pm
Subject:bk commit into 5.1 tree (serg:1.2022)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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.2022 06/01/07 16:27:40 serg@stripped +2 -0
  after merge fix

  sql/ha_ndbcluster.h
    1.101 06/01/07 16:27:26 serg@stripped +1 -1
    after merge fix

  sql/ha_ndbcluster.cc
    1.230 06/01/07 16:27:25 serg@stripped +1 -1
    after merge fix

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.1

--- 1.229/sql/ha_ndbcluster.cc	Fri Jan  6 19:42:54 2006
+++ 1.230/sql/ha_ndbcluster.cc	Sat Jan  7 16:27:25 2006
@@ -224,7 +224,7 @@ static int update_status_variables(Ndb_c
   return 0;
 }
 
-struct show_var_st ndb_status_variables[]= {
+SHOW_VAR ndb_status_variables[]= {
   {"cluster_node_id",        (char*) &ndb_cluster_node_id,         SHOW_LONG},
   {"connected_host",         (char*) &ndb_connected_host,      SHOW_CHAR_PTR},
   {"connected_port",         (char*) &ndb_connected_port,          SHOW_LONG},

--- 1.100/sql/ha_ndbcluster.h	Fri Nov 25 09:08:29 2005
+++ 1.101/sql/ha_ndbcluster.h	Sat Jan  7 16:27:26 2006
@@ -769,7 +769,7 @@ private:
   Ndb *get_ndb();
 };
 
-extern struct show_var_st ndb_status_variables[];
+extern SHOW_VAR ndb_status_variables[];
 
 bool ndbcluster_init(void);
 int ndbcluster_end(ha_panic_function flag);
Thread
bk commit into 5.1 tree (serg:1.2022)Sergei Golubchik7 Jan