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@stripped, 2007-11-22 10:55:30+01:00, tomas@stripped +5 -0
correct manual merge
mysql-test/suite/ndb/t/ndb_bulk_delete.test@stripped, 2007-11-22 10:55:27+01:00, tomas@stripped +0 -1
correct manual merge
sql/ha_ndbcluster.cc@stripped, 2007-11-22 10:55:28+01:00, tomas@stripped +4 -2
correct manual merge
sql/ha_ndbcluster.h@stripped, 2007-11-22 10:55:28+01:00, tomas@stripped +4 -0
correct manual merge
sql/ha_ndbcluster_binlog.cc@stripped, 2007-11-22 10:55:28+01:00, tomas@stripped +17 -8
correct manual merge
sql/ha_ndbcluster_binlog.h@stripped, 2007-11-22 10:55:28+01:00, tomas@stripped +2 -0
correct manual merge
diff -Nrup a/mysql-test/suite/ndb/t/ndb_bulk_delete.test b/mysql-test/suite/ndb/t/ndb_bulk_delete.test
--- a/mysql-test/suite/ndb/t/ndb_bulk_delete.test 2007-11-15 18:39:39 +01:00
+++ b/mysql-test/suite/ndb/t/ndb_bulk_delete.test 2007-11-22 10:55:27 +01:00
@@ -3,7 +3,6 @@
# as measurement of numbre of round trips to kernel.
#
-- source include/have_ndb.inc
--- source include/not_embedded.inc
--disable_warnings
DROP TABLE IF EXISTS t1;
diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc 2007-11-22 09:09:39 +01:00
+++ b/sql/ha_ndbcluster.cc 2007-11-22 10:55:28 +01:00
@@ -6842,9 +6842,11 @@ int ha_ndbcluster::create(const char *na
while (!IS_TMP_PREFIX(m_tabname))
{
+#ifdef HAVE_NDB_BINLOG
if (share)
ndbcluster_read_binlog_replication(thd, ndb, share, m_table,
::server_id, form, TRUE);
+#endif
String event_name(INJECTOR_EVENT_LEN);
ndb_rep_event_name(&event_name, m_dbname, m_tabname,
get_binlog_full(share));
@@ -7232,11 +7234,11 @@ int ha_ndbcluster::rename_table(const ch
{
Ndb_table_guard ndbtab_g2(dict, new_tabname);
const NDBTAB *ndbtab= ndbtab_g2.get_table();
-
+#ifdef HAVE_NDB_BINLOG
if (share)
ndbcluster_read_binlog_replication(thd, ndb, share, ndbtab,
::server_id, NULL, TRUE);
-
+#endif
/* always create an event for the table */
String event_name(INJECTOR_EVENT_LEN);
ndb_rep_event_name(&event_name, to + sizeof(share_prefix) - 1, 0,
diff -Nrup a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
--- a/sql/ha_ndbcluster.h 2007-11-22 09:07:21 +01:00
+++ b/sql/ha_ndbcluster.h 2007-11-22 10:55:28 +01:00
@@ -125,6 +125,7 @@ typedef enum {
NSS_ALTERED
} NDB_SHARE_STATE;
+#ifdef HAVE_NDB_BINLOG
enum enum_conflict_fn_type
{
CFT_NDB_UNDEF = 0
@@ -151,6 +152,7 @@ typedef struct st_ndbcluster_conflict_fn
const NdbDictionary::Table *m_ex_tab;
uint32 m_count;
} NDB_CONFLICT_FN_SHARE;
+#endif
/*
Stats that can be retrieved from ndb
@@ -179,7 +181,9 @@ typedef struct st_ndbcluster_share {
struct Ndb_statistics stat;
uint32 connect_count;
uint32 flags;
+#ifdef HAVE_NDB_BINLOG
NDB_CONFLICT_FN_SHARE *m_cfn_share;
+#endif
Ndb_event_data *event_data; // Place holder before NdbEventOperation is created
NdbEventOperation *op;
char *old_names; // for rename table
diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc 2007-11-22 09:07:21 +01:00
+++ b/sql/ha_ndbcluster_binlog.cc 2007-11-22 10:55:28 +01:00
@@ -388,7 +388,9 @@ int ndbcluster_binlog_init_share(THD *th
DBUG_ENTER("ndbcluster_binlog_init_share");
share->connect_count= g_ndb_cluster_connection->get_connect_count();
+#ifdef HAVE_NDB_BINLOG
share->m_cfn_share= NULL;
+#endif
share->op= 0;
share->new_op= 0;
@@ -2669,6 +2671,7 @@ ndb_rep_event_name(String *event_name,co
DBUG_PRINT("info", ("ndb_rep_event_name: %s", event_name->c_ptr()));
}
+#ifdef HAVE_NDB_BINLOG
static void
set_binlog_flags(NDB_SHARE *share,
Ndb_binlog_type ndb_binlog_type)
@@ -3264,6 +3267,7 @@ err:
}
DBUG_RETURN(ndberror.code);
}
+#endif /* HAVE_NDB_BINLOG */
bool
ndbcluster_check_if_local_table(const char *dbname, const char *tabname)
@@ -3423,12 +3427,12 @@ int ndbcluster_create_binlog_setup(THD *
dict->getNdbError().code);
break; // error
}
-
+#ifdef HAVE_NDB_BINLOG
/*
*/
ndbcluster_read_binlog_replication(thd, ndb, share, ndbtab,
::server_id, NULL, TRUE);
-
+#endif
/*
check if logging turned off for this table
*/
@@ -3683,19 +3687,24 @@ ndbcluster_create_event_ops(THD *thd, ND
Ndb_event_data *event_data= share->event_data;
int do_ndb_schema_share= 0, do_ndb_apply_status_share= 0;
+#ifdef HAVE_NDB_BINLOG
uint len= strlen(share->table_name);
+#endif
if (!ndb_schema_share && strcmp(share->db, NDB_REP_DB) == 0 &&
strcmp(share->table_name, NDB_SCHEMA_TABLE) == 0)
do_ndb_schema_share= 1;
else if (!ndb_apply_status_share && strcmp(share->db, NDB_REP_DB) == 0 &&
strcmp(share->table_name, NDB_APPLY_TABLE) == 0)
do_ndb_apply_status_share= 1;
- else if (!binlog_filter->db_ok(share->db) ||
- !ndb_binlog_running ||
- (len >= sizeof(NDB_EXCEPTIONS_TABLE_SUFFIX) &&
- strcmp(share->table_name+len-sizeof(NDB_EXCEPTIONS_TABLE_SUFFIX)+1,
- lower_case_table_names ? NDB_EXCEPTIONS_TABLE_SUFFIX_LOWER :
- NDB_EXCEPTIONS_TABLE_SUFFIX) == 0))
+ else
+#ifdef HAVE_NDB_BINLOG
+ if (!binlog_filter->db_ok(share->db) ||
+ !ndb_binlog_running ||
+ (len >= sizeof(NDB_EXCEPTIONS_TABLE_SUFFIX) &&
+ strcmp(share->table_name+len-sizeof(NDB_EXCEPTIONS_TABLE_SUFFIX)+1,
+ lower_case_table_names ? NDB_EXCEPTIONS_TABLE_SUFFIX_LOWER :
+ NDB_EXCEPTIONS_TABLE_SUFFIX) == 0))
+#endif
{
share->flags|= NSF_NO_BINLOG;
DBUG_RETURN(0);
diff -Nrup a/sql/ha_ndbcluster_binlog.h b/sql/ha_ndbcluster_binlog.h
--- a/sql/ha_ndbcluster_binlog.h 2007-11-22 09:07:21 +01:00
+++ b/sql/ha_ndbcluster_binlog.h 2007-11-22 10:55:28 +01:00
@@ -202,6 +202,7 @@ int ndbcluster_handle_drop_table(THD *th
const char *event_name_prefix);
void ndb_rep_event_name(String *event_name,
const char *db, const char *tbl, my_bool full);
+#ifdef HAVE_NDB_BINLOG
int
ndbcluster_read_binlog_replication(THD *thd, Ndb *ndb,
NDB_SHARE *share,
@@ -209,6 +210,7 @@ ndbcluster_read_binlog_replication(THD *
uint server_id,
TABLE *table,
bool do_set_binlog_flags);
+#endif
int ndb_create_table_from_engine(THD *thd, const char *db,
const char *table_name);
int ndbcluster_binlog_start();
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2745) | tomas | 22 Nov |
