bk commit into 5.1 tree (stewart:1.1805)

[Stewart Smith]

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/installing-source-tree.html

ChangeSet
  1.1805 05/03/17 17:27:07 stewart@stripped +1 -0
  WL2325 NDB Injector thread
  
  some additional debug info. nothing too interesting, or that reliable. Will be changed later.

  sql/ha_ndbcluster.cc
    1.170 05/03/17 17:27:00 stewart@stripped +21 -3
    Injector thread:
    - Some debug output about what data came with the event

# 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.169/sql/ha_ndbcluster.cc	2005-03-15 21:57:54 +11:00
+++ 1.170/sql/ha_ndbcluster.cc	2005-03-17 17:27:00 +11:00
@@ -7187,21 +7187,39 @@
 
 	const NdbDictionary::Table *table= pOp->getTable();
 	String col_names(100);
+	String col_data(100);
 
-	const NdbRecAttr *data= pOp->getFirstDataAttr();
+	const NdbRecAttr *data= pOp->getFirstPkAttr();
 	do
 	{
 	  col_names.append(data->getColumn()->getName());
 	  col_names.append(',');
-	  
+
+	  col_data.append("'");
+	  col_data.append(data->aRef(),data->arraySize()*data->attrSize());
+	  col_data.append("',");
+	  DBUG_PRINT("info",("Col:%s ref:%x attrSize:%d arraySize:%d",data->getColumn()->getName(),data->aRef(),data->attrSize(),data->arraySize()));
+	} while((data= data->next())!=NULL);
+
+	data= pOp->getFirstDataAttr();
+	do
+	{
+	  col_names.append(data->getColumn()->getName());
+	  col_names.append(',');
+
+	  col_data.append("'");
+	  col_data.append(data->aRef(),data->arraySize());
+	  col_data.append("',");
+	  DBUG_PRINT("info",("Col:%s ref:%x attrSize:%d arraySize:%d",data->getColumn()->getName(),data->aRef(),data->attrSize(),data->arraySize()));
 	} while((data= data->next())!=NULL);
 
 	col_names.chop();
+	col_data.chop();
 
 	switch(pOp->getEventType())
 	{
 	case NdbDictionary::Event::TE_INSERT:
-	  DBUG_PRINT("info",("INSERT INTO %s (%s)",table->getName(),col_names.c_ptr()));
+	  DBUG_PRINT("info",("INSERT INTO %s (%s) values (%s)",table->getName(),col_names.c_ptr(),col_data.c_ptr()));
 	  break;
 	case NdbDictionary::Event::TE_DELETE:
 	  DBUG_PRINT("info",("DELETE FROM %s",table->getName()));