From c6216b12f3497d705b0e23f0e5835cd57d441271 Mon Sep 17 00:00:00 2001
From: unknown <tomas@poseidon.(none)>
Date: Tue, 24 Aug 2004 23:31:47 +0000
Subject: [PATCH] minor fixes

mysql-test/r/ndb_blob.result:
  fixed result for ndb_blob.test
ndb/src/ndbapi/Ndb.cpp:
  added some debug calls
---
 mysql-test/r/ndb_blob.result | 35 +++++++++++++++++++++++++++++++++++
 ndb/src/ndbapi/Ndb.cpp       |  8 ++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/ndb_blob.result b/mysql-test/r/ndb_blob.result
index 0e99c939ea7..d0148d214dd 100644
--- a/mysql-test/r/ndb_blob.result
+++ b/mysql-test/r/ndb_blob.result
@@ -270,6 +270,41 @@ a	b	c	d	a	b	c
 2	2xb2	222	2xdd2	2	2	2
 drop table t2;
 use test;
+select * from t1 order by a;
+a	b	c	d
+1	1xb1	111	1xdd1
+2	2xb2	222	2xdd2
+3	3xb3	333	3xdd3
+4	4xb4	444	4xdd4
+5	5xb5	555	5xdd5
+6	6xb6	666	6xdd6
+7	7xb7	777	7xdd7
+8	8xb8	888	8xdd8
+9	9xb9	999	9xdd9
+alter table t1 add x int;
+select * from t1 order by a;
+a	b	c	d	x
+1	1xb1	111	1xdd1	NULL
+2	2xb2	222	2xdd2	NULL
+3	3xb3	333	3xdd3	NULL
+4	4xb4	444	4xdd4	NULL
+5	5xb5	555	5xdd5	NULL
+6	6xb6	666	6xdd6	NULL
+7	7xb7	777	7xdd7	NULL
+8	8xb8	888	8xdd8	NULL
+9	9xb9	999	9xdd9	NULL
+alter table t1 drop x;
+select * from t1 order by a;
+a	b	c	d
+1	1xb1	111	1xdd1
+2	2xb2	222	2xdd2
+3	3xb3	333	3xdd3
+4	4xb4	444	4xdd4
+5	5xb5	555	5xdd5
+6	6xb6	666	6xdd6
+7	7xb7	777	7xdd7
+8	8xb8	888	8xdd8
+9	9xb9	999	9xdd9
 delete from t1 where c >= 100;
 commit;
 select count(*) from t1;
diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp
index bece12d6731..0c91fcb178b 100644
--- a/ndb/src/ndbapi/Ndb.cpp
+++ b/ndb/src/ndbapi/Ndb.cpp
@@ -407,11 +407,14 @@ Ndb::startTransactionLocal(Uint32 aPriority, Uint32 nodeId)
   }
 #endif
 
+  DBUG_ENTER("Ndb::startTransactionLocal");
+  DBUG_PRINT("enter", ("nodeid: %d", nodeId));
+
   NdbConnection* tConnection;
   Uint64 tFirstTransId = theFirstTransId;
   tConnection = doConnect(nodeId);
   if (tConnection == NULL) {
-    return NULL;
+    DBUG_RETURN(NULL);
   }//if
   NdbConnection* tConNext = theTransactionList;
   tConnection->init();
@@ -434,7 +437,8 @@ Ndb::startTransactionLocal(Uint32 aPriority, Uint32 nodeId)
     abort();
   }
 #endif
-  return tConnection;
+  DBUG_PRINT("exit", ("transaction id: %d", tConnection->getTransactionId()));
+  DBUG_RETURN(tConnection);
 }//Ndb::startTransactionLocal()
 
 /*****************************************************************************