List:Commits« Previous MessageNext Message »
From:tomas Date:January 20 2006 11:55am
Subject:bk commit into 5.1 tree (tomas:1.2083)
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.2083 06/01/20 12:55:07 tomas@stripped +1 -0
  fix so that ndb builds --without-ndb-binlog

  sql/ha_ndbcluster_binlog.h
    1.2 06/01/20 12:54:56 tomas@stripped +6 -8
    fix so that ndb builds --without-ndb-binlog

# 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/mysql51

--- 1.1/sql/ha_ndbcluster_binlog.h	2006-01-12 19:50:48 +01:00
+++ 1.2/sql/ha_ndbcluster_binlog.h	2006-01-20 12:54:56 +01:00
@@ -27,8 +27,6 @@
 
 extern ulong ndb_extra_logging;
 
-#ifdef HAVE_NDB_BINLOG
-
 #define INJECTOR_EVENT_LEN 200
 
 enum SCHEMA_OP_TYPE
@@ -45,13 +43,14 @@
 
 const uint max_ndb_nodes= 64; /* multiple of 32 */
 
+static const char *ha_ndb_ext=".ndb";
+static const char share_prefix[]= "./";
+
+#ifdef HAVE_NDB_BINLOG
 extern pthread_t ndb_binlog_thread;
 extern pthread_mutex_t injector_mutex;
 extern pthread_cond_t  injector_cond;
 
-static const char *ha_ndb_ext=".ndb";
-static const char share_prefix[]= "./";
-
 extern unsigned char g_node_id_map[max_ndb_nodes];
 extern handlerton ndbcluster_hton;
 extern pthread_t ndb_util_thread;
@@ -114,6 +113,8 @@
   the ndb binlog code
 */
 int ndbcluster_find_all_files(THD *thd);
+#endif /* HAVE_NDB_BINLOG */
+
 void ndb_unpack_record(TABLE *table, NdbValue *value,
                        MY_BITMAP *defined, byte *buf);
 
@@ -157,6 +158,3 @@
 set_thd_ndb(THD *thd, Thd_ndb *thd_ndb) { thd->ha_data[ndbcluster_hton.slot]= thd_ndb; }
 
 Ndb* check_ndb_in_thd(THD* thd);
-
-
-#endif /* HAVE_NDB_BINLOG */
Thread
bk commit into 5.1 tree (tomas:1.2083)tomas20 Jan