Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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/in...urce-tree.html

ChangeSet
1.1837 05/04/05 11:33:13 stewart (AT) mysql (DOT) com +1 -0
Further work on WL2325 - NDB Injector thread

fix up uses of injector in NDB injector thread

sql/ha_ndbcluster.cc
1.190 05/04/05 11:33:06 stewart (AT) mysql (DOT) com +13 -7
Minor fixes to use of injector.

add debug around result of nextEvent

# 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: stewart
# Host: kennedy.(none)
# Root: /home/stewart/Documents/MySQL/5.1/ndb-wl2325

--- 1.189/sql/ha_ndbcluster.cc 2005-04-04 17:45:18 +10:00
+++ 1.190/sql/ha_ndbcluster.cc 2005-04-05 11:33:06 +10:00
@@ -7376,7 +7376,6 @@
Ndb *ndb= 0;
longlong last_gci_in_binlog_index= 0;
injector *inj= injector::instance();
- injector::transaction::table *tbl;
bitvector *b;

pthread_mutex_lock(&injector_startup_mutex);
@@ -7451,8 +7450,11 @@
{
error= 0;
NdbEventOperation *pOp;
- while ((pOp= ndb->nextEvent(&error)) != NULL)
+ pOp= ndb->nextEvent(&error);
+ DBUG_PRINT("info",("1st pOp: %x",pOp));
+ for(;pOp!=NULL; pOp= ndb->nextEvent(&error))
{
+ DBUG_PRINT("info",("pOp: %x",pOp));
int overrun= pOp->isOverrun();
if (overrun)
{
@@ -7566,12 +7568,16 @@
switch(pOp->getEventType())
{
case NdbDictionary::Event::TE_INSERT:
+ {
+ int res;
DBUG_PRINT("info",("INSERT INTO %s (%s)",table->getName(),col_names.c_ptr()));
- tbl= new injector::transaction::table(share->table->s->db,table->getName());
- b= new bitvector(i);
- b->set_all();
- trans.write_row(::server_id, *tbl, *b,row_buf);
- delete b;
+ injector::transaction::table
+ tbl(share->table->s->db,table->getName());
+ bitvector b(i);
+ b.set_all();
+ res= trans.write_row(::server_id, tbl, b,row_buf);
+ DBUG_PRINT("info",("WRITE_ROW: %d",res));
+ }
break;
case NdbDictionary::Event::TE_DELETE:
DBUG_PRINT("info",("DELETE FROM %s",table->getName()));

--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw