bk commit into 5.1 tree (tomas:1.1995)

[tomas]

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.1995 05/07/14 16:29:25 tomas@stripped +2 -0
  merge

  sql/log_event.cc
    1.218 05/07/14 16:29:18 tomas@stripped +3 -1
    merge

  sql/ha_ndbcluster.cc
    1.289 05/07/14 16:29:18 tomas@stripped +1 -1
    merge

# 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-wl2325

--- 1.217/sql/log_event.cc	2005-07-13 15:11:16 +02:00
+++ 1.218/sql/log_event.cc	2005-07-14 16:29:18 +02:00
@@ -5701,6 +5701,7 @@
   The 'record_buf' will be used as buffer for records while locating the
   correct row.
  */
+
 static int find_and_fetch_row(TABLE* table, byte* key, byte* record_buf) 
 {
   DBUG_ENTER("find_and_fetch_row(TABLE* table, byte* key, byte* record)");
@@ -5904,6 +5905,7 @@
   DBUG_ASSERT(table != NULL);
 
   int error= find_and_fetch_row(table, m_key, m_search_record);
+
   if (error)
   {
     DBUG_PRINT("return", ("error: %d", error));
@@ -5911,7 +5913,7 @@
   }
     
   // Now we should have the right row to delete
-  error= table->file->ha_delete_row(m_search_record);
+  error= table->file->ha_delete_row(table->record[0]);
 
   DBUG_PRINT("return", ("error=%d", error));
   DBUG_RETURN(error);

--- 1.288/sql/ha_ndbcluster.cc	2005-07-13 15:53:56 +02:00
+++ 1.289/sql/ha_ndbcluster.cc	2005-07-14 16:29:18 +02:00
@@ -5001,7 +5001,7 @@
       {
 	// ToDo database needs to be created if missing
 	pthread_mutex_lock(&LOCK_open);
-	if (ha_create_table_from_engine(thd, t.database, t.name, TRUE))
+	if (ha_create_table_from_engine(thd, t.database, t.name))
 	{
 	  ; // ToDo handle error?
 	}