bk commit into 5.1 tree (pekka:1.2361) BUG#19201

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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.2361 06/04/26 21:55:20 pekka@stripped +1 -0
  ndb - bug#19201 : make TRUNCATE transactional (also fixes blobs)

  sql/ha_ndbcluster.cc
    1.297 06/04/26 21:52:53 pekka@stripped +11 -2
    make truncate transactional

# 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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51-ndb

--- 1.296/sql/ha_ndbcluster.cc	2006-04-25 12:42:14 +02:00
+++ 1.297/sql/ha_ndbcluster.cc	2006-04-26 21:52:53 +02:00
@@ -36,6 +36,7 @@
 #include "ha_ndbcluster_binlog.h"
 #include "ha_ndbcluster_tables.h"
 
+#define ndb_dynamite
 #ifdef ndb_dynamite
 #undef assert
 #define assert(x) do { if(x) break; ::printf("%s %d: assert failed: %s\n", __FILE__,
__LINE__, #x); ::fflush(stdout); ::signal(SIGABRT,SIG_DFL); ::abort();
::kill(::getpid(),6); ::kill(::getpid(),9); } while (0)
@@ -3920,8 +3921,16 @@
 
   if (lock_type != F_UNLCK)
   {
-    DBUG_PRINT("info", ("lock_type != F_UNLCK"));
-    if (!thd->transaction.on)
+    DBUG_PRINT("info", ("lock_type != F_UNLCK [ tx.on=%d ]",
+                        thd->transaction.on));
+    if (!thd->transaction.on
+        /*
+         * This 1) makes truncate a transaction 2) avoids commit
+         * across open cursor which breaks on tables with blobs.
+         * XXX access to sql_command is probably illegal
+         * TODO implement NDB truncate and set HTON_CAN_RECREATE
+         */
+        && thd->main_lex.sql_command != SQLCOM_TRUNCATE)
       m_transaction_on= FALSE;
     else
       m_transaction_on= thd->variables.ndb_use_transactions;