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.2114 06/02/16 03:24:55 tomas@stripped +2 -0
Merge tulin@stripped:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
sql/ha_ndbcluster_binlog.cc
1.17 06/02/16 03:24:44 tomas@stripped +0 -0
Auto merged
sql/ha_ndbcluster.cc
1.270 06/02/16 03:24:44 tomas@stripped +0 -0
Auto merged
# 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-new/RESYNC
--- 1.269/sql/ha_ndbcluster.cc 2006-02-15 14:04:30 +01:00
+++ 1.270/sql/ha_ndbcluster.cc 2006-02-16 03:24:44 +01:00
@@ -34,6 +34,7 @@
#include <ndbapi/NdbIndexStat.hpp>
#include "ha_ndbcluster_binlog.h"
+#include "ha_ndbcluster_tables.h"
#ifdef ndb_dynamite
#undef assert
@@ -476,8 +477,7 @@
#ifdef HAVE_NDB_BINLOG
char key[FN_REFLEN];
- strxnmov(key, FN_LEN-1, mysql_data_home, "/",
- dbname, "/", tabname, NullS);
+ build_table_filename(key, sizeof(key), dbname, tabname, "");
DBUG_PRINT("info", ("Getting ndbcluster mutex"));
pthread_mutex_lock(&ndbcluster_mutex);
NDB_SHARE *ndb_share= (NDB_SHARE*)hash_search(&ndbcluster_open_tables,
@@ -4230,16 +4230,14 @@
NDBCOL col;
uint pack_length, length, i, pk_length= 0;
const void *data, *pack_data;
- char name2[FN_HEADLEN];
bool create_from_engine= (info->table_options & HA_OPTION_CREATE_FROM_ENGINE);
DBUG_ENTER("ha_ndbcluster::create");
DBUG_PRINT("enter", ("name: %s", name));
- strcpy(name2, name);
- DBUG_ASSERT(*fn_rext((char*)name2) == 0);
- set_dbname(name2);
- set_tabname(name2);
+ DBUG_ASSERT(*fn_rext((char*)name) == 0);
+ set_dbname(name);
+ set_tabname(name);
table= form;
if (create_from_engine)
@@ -4252,7 +4250,7 @@
if ((my_errno= write_ndb_file(name)))
DBUG_RETURN(my_errno);
#ifdef HAVE_NDB_BINLOG
- ndbcluster_create_binlog_setup(get_ndb(), name2, strlen(name2),
+ ndbcluster_create_binlog_setup(get_ndb(), name, strlen(name),
m_dbname, m_tabname, FALSE);
#endif /* HAVE_NDB_BINLOG */
DBUG_RETURN(my_errno);
@@ -4400,18 +4398,18 @@
First make sure we get a "fresh" share here, not an old trailing one...
*/
{
- const char *key= name2;
- uint length= (uint) strlen(key);
+ uint length= (uint) strlen(name);
if ((share= (NDB_SHARE*) hash_search(&ndbcluster_open_tables,
- (byte*) key, length)))
+ (byte*) name, length)))
handle_trailing_share(share);
}
/*
get a new share
*/
- if (!(share= get_share(name2, form, true, true)))
+
+ if (!(share= get_share(name, form, true, true)))
{
- sql_print_error("NDB: allocating table share for %s failed", name2);
+ sql_print_error("NDB: allocating table share for %s failed", name);
/* my_errno is set */
}
pthread_mutex_unlock(&ndbcluster_mutex);
@@ -4421,6 +4419,12 @@
const NDBTAB *t= dict->getTable(m_tabname);
String event_name(INJECTOR_EVENT_LEN);
ndb_rep_event_name(&event_name,m_dbname,m_tabname);
+ int do_event_op= ndb_binlog_running;
+
+ if (!schema_share &&
+ strcmp(share->db, NDB_REP_DB) == 0 &&
+ strcmp(share->table_name, NDB_SCHEMA_TABLE) == 0)
+ do_event_op= 1;
/*
Always create an event for the table, as other mysql servers
@@ -4429,7 +4433,7 @@
if (ndbcluster_create_event(ndb, t, event_name.c_ptr(), share) < 0)
{
/* this is only a serious error if the binlog is on */
- if (share && ndb_binlog_running)
+ if (share && do_event_op)
{
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
ER_GET_ERRMSG, ER(ER_GET_ERRMSG),
@@ -4442,14 +4446,14 @@
sql_print_information("NDB Binlog: CREATE TABLE Event: %s",
event_name.c_ptr());
- if (share && ndb_binlog_running &&
+ if (share && do_event_op &&
ndbcluster_create_event_ops(share, t, event_name.c_ptr()) < 0)
{
sql_print_error("NDB Binlog: FAILED CREATE TABLE event operations."
- " Event: %s", name2);
+ " Event: %s", name);
/* a warning has been issued to the client */
}
- if (share && !ndb_binlog_running)
+ if (share && !do_event_op)
share->flags|= NSF_NO_BINLOG;
ndbcluster_log_schema_op(current_thd, share,
current_thd->query, current_thd->query_length,
@@ -4732,9 +4736,8 @@
ERR_RETURN(dict->getNdbError());
}
#ifdef HAVE_NDB_BINLOG
- NDB_SHARE *share= 0;
- if (ndb_binlog_running &&
- (share= get_share(from, 0, false)))
+ NDB_SHARE *share= get_share(from, 0, false);
+ if (share)
{
int r= rename_share(share, to);
DBUG_ASSERT(r == 0);
@@ -4795,7 +4798,7 @@
if (ndb_extra_logging)
sql_print_information("NDB Binlog: RENAME Event: %s",
event_name.c_ptr());
- if (share)
+ if (share && ndb_binlog_running)
{
if (ndbcluster_create_event_ops(share, ndbtab,
event_name.c_ptr()) < 0)
@@ -5319,7 +5322,7 @@
NDBDICT* dict= ndb->getDictionary();
dict->set_local_table_data_size(sizeof(Ndb_local_table_statistics));
dict->invalidateTable(name);
- strxnmov(key, FN_LEN-1, mysql_data_home, "/", db, "/", name, NullS);
+ build_table_filename(key, sizeof(key), db, name, "");
NDB_SHARE *share= get_share(key, 0, false);
if (share && get_ndb_share_state(share) == NSS_ALTERED)
{
@@ -5453,13 +5456,14 @@
}
// Drop any tables belonging to database
char full_path[FN_REFLEN];
- char *tmp= strxnmov(full_path, FN_REFLEN-1, share_prefix, dbname, "/",
- NullS);
+ char *tmp= full_path +
+ build_table_filename(full_path, sizeof(full_path), dbname, "", "");
+
ndb->setDatabaseName(dbname);
List_iterator_fast<char> it(drop_list);
while ((tabname=it++))
{
- strxnmov(tmp, FN_REFLEN - (tmp - full_path)-1, tabname, NullS);
+ tablename_to_filename(tabname, tmp, FN_REFLEN - (tmp - full_path)-1);
if (ha_ndbcluster::delete_table(0, ndb, full_path, dbname, tabname))
{
const NdbError err= dict->getNdbError();
@@ -5552,14 +5556,16 @@
continue;
/* check if database exists */
- char *end= strxnmov(key, FN_LEN-1, mysql_data_home, "/",
- elmt.database, NullS);
+ char *end= key +
+ build_table_filename(key, sizeof(key), elmt.database, "", "");
if (my_access(key, F_OK))
{
/* no such database defined, skip table */
continue;
}
- end= strxnmov(end, FN_LEN-1-(end-key), "/", elmt.name, NullS);
+ /* finalize construction of path */
+ end+= tablename_to_filename(elmt.name, end,
+ sizeof(key)-(end-key));
const void *data= 0, *pack_data= 0;
uint length, pack_length;
int discover= 0;
@@ -5694,10 +5700,9 @@
}
// File is not in NDB, check for .ndb file with this name
- (void)strxnmov(name, FN_REFLEN-1,
- mysql_data_home,"/",db,"/",file_name,ha_ndb_ext,NullS);
+ build_table_filename(name, sizeof(name), db, file_name, ha_ndb_ext);
DBUG_PRINT("info", ("Check access for %s", name));
- if (access(name, F_OK))
+ if (my_access(name, F_OK))
{
DBUG_PRINT("info", ("%s did not exist on disk", name));
// .ndb file did not exist on disk, another table type
@@ -5719,12 +5724,13 @@
#ifdef HAVE_NDB_BINLOG
/* setup logging to binlog for all discovered tables */
{
- char *end, *end1=
- strxnmov(name, sizeof(name), mysql_data_home, "/", db, "/", NullS);
+ char *end, *end1= name +
+ build_table_filename(name, sizeof(name), db, "", "");
for (i= 0; i < ok_tables.records; i++)
{
file_name= (char*)hash_element(&ok_tables, i);
- end= strxnmov(end1, sizeof(name) - (end1 - name), file_name, NullS);
+ end= end1 +
+ tablename_to_filename(file_name, end1, sizeof(name) - (end1 - name));
pthread_mutex_lock(&LOCK_open);
ndbcluster_create_binlog_setup(ndb, name, end-name,
db, file_name, TRUE);
@@ -5741,9 +5747,8 @@
file_name= hash_element(&ndb_tables, i);
if (!hash_search(&ok_tables, file_name, strlen(file_name)))
{
- strxnmov(name, sizeof(name)-1,
- mysql_data_home, "/", db, "/", file_name, reg_ext, NullS);
- if (access(name, F_OK))
+ build_table_filename(name, sizeof(name), db, file_name, reg_ext);
+ if (my_access(name, F_OK))
{
DBUG_PRINT("info", ("%s must be discovered", file_name));
// File is in list of ndb tables and not in ok_tables
@@ -6277,7 +6282,7 @@
NDB_SHARE *share;
DBUG_ENTER("ndb_get_commitcount");
- (void)strxnmov(name, FN_REFLEN-1, share_prefix, dbname, "/", tabname, NullS);
+ build_table_filename(name, sizeof(name), dbname, tabname, "");
DBUG_PRINT("enter", ("name: %s", name));
pthread_mutex_lock(&ndbcluster_mutex);
if (!(share=(NDB_SHARE*) hash_search(&ndbcluster_open_tables,
@@ -6655,16 +6660,19 @@
("db.tablename: %s.%s use_count: %d commit_count: %d",
share->db, share->table_name,
share->use_count, share->commit_count));
- DBUG_PRINT("rename_share",
- ("table->s->db.table_name: %s.%s",
- share->table->s->db.str, share->table->s->table_name.str));
-
- if (share->op == 0)
+ if (share->table)
{
- share->table->s->db.str= share->db;
- share->table->s->db.length= strlen(share->db);
- share->table->s->table_name.str= share->table_name;
- share->table->s->table_name.length= strlen(share->table_name);
+ DBUG_PRINT("rename_share",
+ ("table->s->db.table_name: %s.%s",
+ share->table->s->db.str, share->table->s->table_name.str));
+
+ if (share->op == 0)
+ {
+ share->table->s->db.str= share->db;
+ share->table->s->db.length= strlen(share->db);
+ share->table->s->table_name.str= share->table_name;
+ share->table->s->table_name.length= strlen(share->table_name);
+ }
}
/* else rename will be handled when the ALTER event comes */
share->old_names= old_key;
--- 1.16/sql/ha_ndbcluster_binlog.cc 2006-02-15 00:01:25 +01:00
+++ 1.17/sql/ha_ndbcluster_binlog.cc 2006-02-16 03:24:44 +01:00
@@ -237,10 +237,33 @@
{
THD *thd= current_thd;
MEM_ROOT *mem_root= &share->mem_root;
+ int do_event_op= ndb_binlog_running;
share->op= 0;
share->table= 0;
- if (!ndb_binlog_running)
+
+ if (!schema_share &&
+ strcmp(share->db, NDB_REP_DB) == 0 &&
+ strcmp(share->table_name, NDB_SCHEMA_TABLE) == 0)
+ do_event_op= 1;
+
+ {
+ int i, no_nodes= g_ndb_cluster_connection->no_db_nodes();
+ share->subscriber_bitmap= (MY_BITMAP*)
+ alloc_root(mem_root, no_nodes * sizeof(MY_BITMAP));
+ for (i= 0; i < no_nodes; i++)
+ {
+ bitmap_init(&share->subscriber_bitmap[i],
+ (Uint32*)alloc_root(mem_root, max_ndb_nodes/8),
+ max_ndb_nodes, false);
+ bitmap_clear_all(&share->subscriber_bitmap[i]);
+ }
+ bitmap_init(&share->slock_bitmap, share->slock,
+ sizeof(share->slock)*8, false);
+ bitmap_clear_all(&share->slock_bitmap);
+ }
+
+ if (!do_event_op)
{
if (_table)
{
@@ -315,21 +338,6 @@
share->ndb_value[1]= (NdbValue*)
alloc_root(mem_root, sizeof(NdbValue) * table->s->fields
+1 /*extra for hidden key*/);
- {
- int i, no_nodes= g_ndb_cluster_connection->no_db_nodes();
- share->subscriber_bitmap= (MY_BITMAP*)
- alloc_root(mem_root, no_nodes * sizeof(MY_BITMAP));
- for (i= 0; i < no_nodes; i++)
- {
- bitmap_init(&share->subscriber_bitmap[i],
- (Uint32*)alloc_root(mem_root, max_ndb_nodes/8),
- max_ndb_nodes, false);
- bitmap_clear_all(&share->subscriber_bitmap[i]);
- }
- bitmap_init(&share->slock_bitmap, share->slock,
- sizeof(share->slock)*8, false);
- bitmap_clear_all(&share->slock_bitmap);
- }
if (table->s->primary_key == MAX_KEY)
share->flags|= NSF_HIDDEN_PK;
if (table->s->blob_fields != 0)
@@ -648,11 +656,8 @@
if so, remove it since there is none in Ndb
*/
{
- strxnmov(buf, sizeof(buf),
- mysql_data_home,
- "/" NDB_REP_DB "/" NDB_APPLY_TABLE,
- reg_ext, NullS);
- unpack_filename(buf,buf);
+ build_table_filename(buf, sizeof(buf),
+ NDB_REP_DB, NDB_APPLY_TABLE, reg_ext);
my_delete(buf, MYF(0));
}
@@ -700,11 +705,8 @@
if so, remove it since there is none in Ndb
*/
{
- strxnmov(buf, sizeof(buf),
- mysql_data_home,
- "/" NDB_REP_DB "/" NDB_SCHEMA_TABLE,
- reg_ext, NullS);
- unpack_filename(buf,buf);
+ build_table_filename(buf, sizeof(buf),
+ NDB_REP_DB, NDB_SCHEMA_TABLE, reg_ext);
my_delete(buf, MYF(0));
}
@@ -929,8 +931,7 @@
if (get_a_share)
{
char key[FN_REFLEN];
- (void)strxnmov(key, FN_REFLEN, share_prefix, db,
- "/", table_name, NullS);
+ build_table_filename(key, sizeof(key), db, table_name, "");
share= get_share(key, 0, false, false);
}
@@ -1358,6 +1359,7 @@
switch (ev_type)
{
case NDBEVENT::TE_UPDATE:
+ /* fall through */
case NDBEVENT::TE_INSERT:
{
Cluster_replication_schema *schema= (Cluster_replication_schema *)
@@ -1375,21 +1377,20 @@
{
case SOT_DROP_TABLE:
/* binlog dropping table after any table operations */
- post_epoch_log_list->push_back(schema, mem_root);
+ if (ndb_binlog_running)
+ post_epoch_log_list->push_back(schema, mem_root);
log_query= 0;
break;
case SOT_RENAME_TABLE:
/* fall through */
case SOT_ALTER_TABLE:
- /* fall through */
- if (!ndb_binlog_running)
+ if (ndb_binlog_running)
{
log_query= 1;
break; /* discovery will be handled by binlog */
}
/* fall through */
case SOT_CREATE_TABLE:
- /* fall through */
pthread_mutex_lock(&LOCK_open);
if (ndb_create_table_from_engine(thd, schema->db, schema->name))
{
@@ -1407,7 +1408,8 @@
TRUE, /* print error */
TRUE); /* don't binlog the query */
/* binlog dropping database after any table operations */
- post_epoch_log_list->push_back(schema, mem_root);
+ if (ndb_binlog_running)
+ post_epoch_log_list->push_back(schema, mem_root);
log_query= 0;
break;
case SOT_CREATE_DB:
@@ -1422,8 +1424,8 @@
case SOT_CLEAR_SLOCK:
{
char key[FN_REFLEN];
- (void)strxnmov(key, FN_REFLEN, share_prefix, schema->db,
- "/", schema->name, NullS);
+ build_table_filename(key, sizeof(key),
+ schema->db, schema->name, "");
NDB_SHARE *share= get_share(key, 0, false, false);
if (share)
{
@@ -1463,7 +1465,7 @@
}
}
- if (log_query)
+ if (log_query && ndb_binlog_running)
{
char *thd_db_save= thd->db;
thd->db= schema->db;
@@ -1752,6 +1754,7 @@
const char *table_name,
my_bool share_may_exist)
{
+ int do_event_op= ndb_binlog_running;
DBUG_ENTER("ndbcluster_create_binlog_setup");
DBUG_PRINT("enter",("key: %s key_len: %d %s.%s share_may_exist: %d",
key, key_len, db, table_name, share_may_exist));
@@ -1792,7 +1795,12 @@
"allocating table share for %s failed", key);
}
- if (!ndb_binlog_running)
+ if (!schema_share &&
+ strcmp(share->db, NDB_REP_DB) == 0 &&
+ strcmp(share->table_name, NDB_SCHEMA_TABLE) == 0)
+ do_event_op= 1;
+
+ if (!do_event_op)
{
share->flags|= NSF_NO_BINLOG;
pthread_mutex_unlock(&ndbcluster_mutex);
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2114) | tomas | 16 Feb |
