List:Commits« Previous MessageNext Message »
From:tomas Date:January 10 2006 2:04pm
Subject:bk commit into 5.1 tree (tomas:1.2025)
View as plain text  
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.2025 06/01/10 15:04:42 tomas@stripped +5 -0
  break out shared defines between mysqld and ndb_restore

  storage/ndb/tools/restore/consumer.hpp
    1.8 06/01/10 15:04:27 tomas@stripped +1 -4
    break out shared defines between mysqld and ndb_restore

  sql/ha_ndbcluster_binlog.cc
    1.5 06/01/10 15:04:27 tomas@stripped +1 -4
    break out shared defines between mysqld and ndb_restore

  sql/Makefile.am
    1.131 06/01/10 15:04:27 tomas@stripped +1 -0
    break out shared defines between mysqld and ndb_restore

  client/mysqltest.c
    1.171 06/01/10 15:04:27 tomas@stripped +2 -4
    merge

  sql/ha_ndbcluster_tables.h
    1.1 06/01/10 14:04:28 tomas@stripped +21 -0

  sql/ha_ndbcluster_tables.h
    1.0 06/01/10 14:04:28 tomas@stripped +0 -0
    BitKeeper file /home/tomas/mysql-5.1-wl2325-v6/sql/ha_ndbcluster_tables.h

# 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-v6

--- 1.130/sql/Makefile.am	2006-01-05 12:55:41 +01:00
+++ 1.131/sql/Makefile.am	2006-01-10 15:04:27 +01:00
@@ -106,6 +106,7 @@
 			ha_blackhole.cc ha_federated.cc ha_ndbcluster.cc \
 			ha_blackhole.h  ha_federated.h  ha_ndbcluster.h \
 			ha_ndbcluster_binlog.cc ha_ndbcluster_binlog.h \
+			ha_ndbcluster_tables.h \
 			ha_partition.cc ha_partition.h
 mysqld_DEPENDENCIES =	@mysql_se_objs@
 gen_lex_hash_SOURCES =	gen_lex_hash.cc

--- 1.170/client/mysqltest.c	2006-01-10 14:11:35 +01:00
+++ 1.171/client/mysqltest.c	2006-01-10 15:04:27 +01:00
@@ -1519,7 +1519,7 @@
     if (mysql_query(mysql, query= "show variables like 'have_ndbcluster'"))
       die("At line %u: failed in %s: %d: %s", start_lineno, query,
           mysql_errno(mysql), mysql_error(mysql));
-    if (!(last_result= res= mysql_store_result(mysql)))
+    if (!(res= mysql_store_result(mysql)))
       die("line %u: mysql_store_result() retuned NULL for '%s'", start_lineno,
           query);
     if (!(row= mysql_fetch_row(res)))
@@ -1527,7 +1527,6 @@
 
     have_ndbcluster= strcmp("YES", row[1]) == 0;
     mysql_free_result(res);
-    last_result= 0;
 
     if (have_ndbcluster)
     {
@@ -1546,7 +1545,7 @@
         if (mysql_query(mysql, query= "show engine ndb status"))
           die("At line %u: failed in '%s': %d: %s", start_lineno, query,
               mysql_errno(mysql), mysql_error(mysql));
-        if (!(last_result= res= mysql_store_result(mysql)))
+        if (!(res= mysql_store_result(mysql)))
           die("line %u: mysql_store_result() retuned NULL for '%s'",
               start_lineno, query);
         while ((row= mysql_fetch_row(res)))
@@ -1588,7 +1587,6 @@
         if (!row)
           die("line %u: result does not contain '%s' in '%s'",
               start_lineno, binlog, query);
-        last_result=0;
         count++;
       } while (tmp_epoch < epoch && count <= 3);
     }

--- 1.7/storage/ndb/tools/restore/consumer.hpp	2006-01-05 12:01:59 +01:00
+++ 1.8/storage/ndb/tools/restore/consumer.hpp	2006-01-10 15:04:27 +01:00
@@ -19,10 +19,7 @@
 
 #include "Restore.hpp"
 
-#define NDB_REP_DB      "cluster_replication"
-#define NDB_REP_TABLE   "binlog_index"
-#define NDB_APPLY_TABLE "apply_status"
-#define NDB_SCHEMA_TABLE "schema"
+#include "../../../../sql/ha_ndbcluster_tables.h"
 extern const char *Ndb_apply_table;
 
 class BackupConsumer {

--- 1.4/sql/ha_ndbcluster_binlog.cc	2006-01-05 17:07:01 +01:00
+++ 1.5/sql/ha_ndbcluster_binlog.cc	2006-01-10 15:04:27 +01:00
@@ -26,10 +26,7 @@
 /*
   defines for cluster replication table names
 */
-#define NDB_REP_DB      "cluster_replication"
-#define NDB_REP_TABLE   "binlog_index"
-#define NDB_APPLY_TABLE "apply_status"
-#define NDB_SCHEMA_TABLE "schema"
+#include "ha_ndbcluster_tables.h"
 #define NDB_APPLY_TABLE_FILE "./" NDB_REP_DB "/" NDB_APPLY_TABLE
 #define NDB_SCHEMA_TABLE_FILE "./" NDB_REP_DB "/" NDB_SCHEMA_TABLE
 
--- New file ---
+++ sql/ha_ndbcluster_tables.h	06/01/10 14:04:28
/* Copyright (C) 2000-2003 MySQL AB

  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.

  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.

  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/

#define NDB_REP_DB      "cluster_replication"
#define NDB_REP_TABLE   "binlog_index"
#define NDB_APPLY_TABLE "apply_status"
#define NDB_SCHEMA_TABLE "schema"

Thread
bk commit into 5.1 tree (tomas:1.2025)tomas10 Jan