bzr commit into mysql-5.1-telco-6.3 branch (Martin.Skold:3036) Bug#36701 Bug#40428

[Martin Skold]

#At file:///home/marty/MySQL/mysql-5.1-telco-6.3/

 3036 Martin Skold	2009-09-08 [merge]
      Merge
      modified:
        mysql-test/suite/ndb/r/ndb_restore.result
        mysql-test/suite/ndb/t/ndb_restore.test
        sql/ha_ndbcluster.cc
        sql/ha_ndbcluster.h
        storage/ndb/include/ndbapi/NdbBlob.hpp
        storage/ndb/src/ndbapi/NdbBlob.cpp
        storage/ndb/tools/restore/Restore.cpp

=== modified file 'mysql-test/suite/ndb/r/ndb_restore.result'
--- a/mysql-test/suite/ndb/r/ndb_restore.result	2009-05-09 06:31:38 +0000
+++ b/mysql-test/suite/ndb/r/ndb_restore.result	2009-09-08 11:24:40 +0000
@@ -575,3 +575,239 @@ epoch
 select epoch > (1 << 32) from mysql.ndb_apply_status where server_id=0;
 epoch > (1 << 32)
 1
+Backup Id = 1
+Nodeid = 1
+backup path = /home/marty/MySQL/mysql-5.1-telco-6.2/mysql-test/std_data/ndb_backup50
+Opening file
'/home/marty/MySQL/mysql-5.1-telco-6.2/mysql-test/std_data/ndb_backup50/BACKUP-1.1.ctl'
+File size 7936 bytes
+Ndb version in backup files: ndb-5.1.2
+-- BANK/def/ACCOUNT_TYPE --
+Version: 1
+Fragment type: 5
+K Value: 6
+Min load factor: 78
+Max load factor: 80
+Temporary table: no
+Number of attributes: 2
+Number of primary keys: 1
+Length of frm data: 257
+Row Checksum: 1
+Row GCI: 1
+SingleUserMode: 0
+ForceVarPart: 0
+TableStatus: Retrieved
+-- Attributes -- 
+ACCOUNT_TYPE_ID Unsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+DESCRIPTION Char(64;latin1_bin) NOT NULL AT=FIXED ST=MEMORY
+
+Successfully printed table: -- BANK/def/SYSTEM_VALUES --
+Version: 1
+Fragment type: 5
+K Value: 6
+Min load factor: 78
+Max load factor: 80
+Temporary table: no
+Number of attributes: 2
+Number of primary keys: 1
+Length of frm data: 247
+Row Checksum: 1
+Row GCI: 1
+SingleUserMode: 0
+ForceVarPart: 0
+TableStatus: Retrieved
+-- Attributes -- 
+SYSTEM_VALUES_ID Unsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+VALUE Bigunsigned NOT NULL AT=FIXED ST=MEMORY
+
+Successfully printed table: -- BANK/def/TRANSACTION --
+Version: 1
+Fragment type: 5
+K Value: 6
+Min load factor: 78
+Max load factor: 80
+Temporary table: no
+Number of attributes: 7
+Number of primary keys: 2
+Length of frm data: 338
+Row Checksum: 1
+Row GCI: 1
+SingleUserMode: 0
+ForceVarPart: 0
+TableStatus: Retrieved
+-- Attributes -- 
+TRANSACTION_ID Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+ACCOUNT Unsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+ACCOUNT_TYPE Unsigned NOT NULL AT=FIXED ST=MEMORY
+OTHER_ACCOUNT Unsigned NOT NULL AT=FIXED ST=MEMORY
+TRANSACTION_TYPE Unsigned NOT NULL AT=FIXED ST=MEMORY
+TIME Bigunsigned NOT NULL AT=FIXED ST=MEMORY
+AMOUNT Unsigned NOT NULL AT=FIXED ST=MEMORY
+
+Successfully printed table: -- BANK/def/ACCOUNT --
+Version: 1
+Fragment type: 5
+K Value: 6
+Min load factor: 78
+Max load factor: 80
+Temporary table: no
+Number of attributes: 4
+Number of primary keys: 1
+Length of frm data: 274
+Row Checksum: 1
+Row GCI: 1
+SingleUserMode: 0
+ForceVarPart: 0
+TableStatus: Retrieved
+-- Attributes -- 
+ACCOUNT_ID Unsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+OWNER Unsigned NOT NULL AT=FIXED ST=MEMORY
+BALANCE Unsigned NOT NULL AT=FIXED ST=MEMORY
+ACCOUNT_TYPE Unsigned NOT NULL AT=FIXED ST=MEMORY
+
+Successfully printed table: -- BANK/def/GL --
+Version: 1
+Fragment type: 5
+K Value: 6
+Min load factor: 78
+Max load factor: 80
+Temporary table: no
+Number of attributes: 8
+Number of primary keys: 2
+Length of frm data: 359
+Row Checksum: 1
+Row GCI: 1
+SingleUserMode: 0
+ForceVarPart: 0
+TableStatus: Retrieved
+-- Attributes -- 
+TIME Bigunsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+ACCOUNT_TYPE Unsigned PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+BALANCE Unsigned NOT NULL AT=FIXED ST=MEMORY
+DEPOSIT_COUNT Unsigned NOT NULL AT=FIXED ST=MEMORY
+DEPOSIT_SUM Unsigned NOT NULL AT=FIXED ST=MEMORY
+WITHDRAWAL_COUNT Unsigned NOT NULL AT=FIXED ST=MEMORY
+WITHDRAWAL_SUM Unsigned NOT NULL AT=FIXED ST=MEMORY
+PURGED Unsigned NOT NULL AT=FIXED ST=MEMORY
+
+Successfully printed table: 
+NDBT_ProgramExit: 0 - OK
+
+Backup Id = 1
+Nodeid = 1
+backup path = /home/marty/MySQL/mysql-5.1-telco-6.2/mysql-test/std_data/ndb_backup50
+Opening file
'/home/marty/MySQL/mysql-5.1-telco-6.2/mysql-test/std_data/ndb_backup50/BACKUP-1.1.ctl'
+File size 7936 bytes
+Ndb version in backup files: ndb-5.1.2
+Opening file
'/home/marty/MySQL/mysql-5.1-telco-6.2/mysql-test/std_data/ndb_backup50/BACKUP-1.1.log'
+File size 7592 bytes
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2262
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=6, BALANCE=150072
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2263
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=9201
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2263, ACCOUNT=2, TRANSACTION_ID=2263,
ACCOUNT=2, ACCOUNT_TYPE=2, OTHER_ACCOUNT=3, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=914
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2264
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=16144
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2264, ACCOUNT=1, TRANSACTION_ID=2264,
ACCOUNT=1, ACCOUNT_TYPE=1, OTHER_ACCOUNT=3, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=6943
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2265
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=14774
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=7, BALANCE=131368
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2265, ACCOUNT=3, TRANSACTION_ID=2265,
ACCOUNT=3, ACCOUNT_TYPE=3, OTHER_ACCOUNT=7, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=1370
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2266
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=12175
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2266, ACCOUNT=4, TRANSACTION_ID=2266,
ACCOUNT=4, ACCOUNT_TYPE=4, OTHER_ACCOUNT=3, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=2599
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2267
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=9, BALANCE=7399
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2267, ACCOUNT=9, TRANSACTION_ID=2267,
ACCOUNT=9, ACCOUNT_TYPE=4, OTHER_ACCOUNT=5, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=2792
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2268
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=0, BALANCE=9689918
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=7, BALANCE=140735
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2268, ACCOUNT=0, TRANSACTION_ID=2268,
ACCOUNT=0, ACCOUNT_TYPE=0, OTHER_ACCOUNT=7, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=9367
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2269
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=0, BALANCE=9697012
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2269, ACCOUNT=1, TRANSACTION_ID=2269,
ACCOUNT=1, ACCOUNT_TYPE=1, OTHER_ACCOUNT=0, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=7094
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2270
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=7, BALANCE=141103
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2270, ACCOUNT=8, TRANSACTION_ID=2270,
ACCOUNT=8, ACCOUNT_TYPE=3, OTHER_ACCOUNT=7, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=368
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2271
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2271, ACCOUNT=5, TRANSACTION_ID=2271,
ACCOUNT=5, ACCOUNT_TYPE=1, OTHER_ACCOUNT=2, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=9179
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2272
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=7, BALANCE=135202
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2272, ACCOUNT=1, TRANSACTION_ID=2272,
ACCOUNT=1, ACCOUNT_TYPE=1, OTHER_ACCOUNT=7, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=5901
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2273
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2274
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=11419
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2275
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=0, BALANCE=9687229
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2275, ACCOUNT=5, TRANSACTION_ID=2275,
ACCOUNT=5, ACCOUNT_TYPE=1, OTHER_ACCOUNT=0, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=9783
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2276
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=7, BALANCE=139269
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2277
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=0, BALANCE=9686353
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=12295
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2277, ACCOUNT=0, TRANSACTION_ID=2277,
ACCOUNT=0, ACCOUNT_TYPE=0, OTHER_ACCOUNT=3, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=876
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2277, ACCOUNT=3, TRANSACTION_ID=2277,
ACCOUNT=3, ACCOUNT_TYPE=3, OTHER_ACCOUNT=0, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=876
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2278
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=6227
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2278, ACCOUNT=3, TRANSACTION_ID=2278,
ACCOUNT=3, ACCOUNT_TYPE=3, OTHER_ACCOUNT=5, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=6068
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2278, ACCOUNT=5, TRANSACTION_ID=2278,
ACCOUNT=5, ACCOUNT_TYPE=1, OTHER_ACCOUNT=3, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=6068
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2279
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=10393
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2279, ACCOUNT=2, TRANSACTION_ID=2279,
ACCOUNT=2, ACCOUNT_TYPE=2, OTHER_ACCOUNT=3, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=4166
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2279, ACCOUNT=3, TRANSACTION_ID=2279,
ACCOUNT=3, ACCOUNT_TYPE=3, OTHER_ACCOUNT=2, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=4166
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2280
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=0, BALANCE=9689868
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2280, ACCOUNT=2, TRANSACTION_ID=2280,
ACCOUNT=2, ACCOUNT_TYPE=2, OTHER_ACCOUNT=0, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=3515
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2280, ACCOUNT=0, TRANSACTION_ID=2280,
ACCOUNT=0, ACCOUNT_TYPE=0, OTHER_ACCOUNT=2, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=3515
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2281
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=6, BALANCE=140252
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=20213
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2282
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=0, BALANCE=9696176
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2283
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=19508
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2283, ACCOUNT=3, TRANSACTION_ID=2283,
ACCOUNT=3, ACCOUNT_TYPE=3, OTHER_ACCOUNT=1, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=705
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2283, ACCOUNT=1, TRANSACTION_ID=2283,
ACCOUNT=1, ACCOUNT_TYPE=1, OTHER_ACCOUNT=3, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=705
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2284
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=9, BALANCE=10191
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2285
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=0, BALANCE=9694350
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=21334
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2285, ACCOUNT=0, TRANSACTION_ID=2285,
ACCOUNT=0, ACCOUNT_TYPE=0, OTHER_ACCOUNT=3, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=1826
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2286
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=0, BALANCE=9686296
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=9, BALANCE=18245
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2287
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=6, BALANCE=144864
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2288
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=7, BALANCE=134906
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2288, ACCOUNT=5, TRANSACTION_ID=2288,
ACCOUNT=5, ACCOUNT_TYPE=1, OTHER_ACCOUNT=7, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=4363
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2289
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=6, BALANCE=136024
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=7, BALANCE=143746
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2289, ACCOUNT=6, TRANSACTION_ID=2289,
ACCOUNT=6, ACCOUNT_TYPE=1, OTHER_ACCOUNT=7, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=8840
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2289, ACCOUNT=7, TRANSACTION_ID=2289,
ACCOUNT=7, ACCOUNT_TYPE=2, OTHER_ACCOUNT=6, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=8840
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2290
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=0, BALANCE=9679579
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2291
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2292
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=7, BALANCE=135273
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=6, BALANCE=144497
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2293
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=7, BALANCE=130670
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2293, ACCOUNT=7, TRANSACTION_ID=2293,
ACCOUNT=7, ACCOUNT_TYPE=2, OTHER_ACCOUNT=8, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=4603
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2293, ACCOUNT=8, TRANSACTION_ID=2293,
ACCOUNT=8, ACCOUNT_TYPE=3, OTHER_ACCOUNT=7, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=4603
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2294
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=12508
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2294, ACCOUNT=3, TRANSACTION_ID=2294,
ACCOUNT=3, ACCOUNT_TYPE=3, OTHER_ACCOUNT=5, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=8826
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2294, ACCOUNT=5, TRANSACTION_ID=2294,
ACCOUNT=5, ACCOUNT_TYPE=1, OTHER_ACCOUNT=3, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=8826
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2295
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2295, ACCOUNT=4, TRANSACTION_ID=2295,
ACCOUNT=4, ACCOUNT_TYPE=4, OTHER_ACCOUNT=1, TRANSACTION_TYPE=2000, TIME=5, AMOUNT=5403
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2296
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=9, BALANCE=11442
+INSERT BANK/def/TRANSACTION TRANSACTION_ID=2296, ACCOUNT=1, TRANSACTION_ID=2296,
ACCOUNT=1, ACCOUNT_TYPE=1, OTHER_ACCOUNT=9, TRANSACTION_TYPE=3000, TIME=5, AMOUNT=6803
+UPDATE BANK/def/SYSTEM_VALUES SYSTEM_VALUES_ID=0, VALUE=2297
+UPDATE BANK/def/ACCOUNT ACCOUNT_ID=3, BALANCE=3049
+Printed 0 tuples and 107 log entries to stdout.
+
+NDBT_ProgramExit: 0 - OK
+

=== modified file 'mysql-test/suite/ndb/t/ndb_restore.test'
--- a/mysql-test/suite/ndb/t/ndb_restore.test	2009-04-08 13:48:55 +0000
+++ b/mysql-test/suite/ndb/t/ndb_restore.test	2009-09-08 11:24:40 +0000
@@ -477,3 +477,13 @@ select epoch from mysql.ndb_apply_status
 # should evaluate to true == 1
 select epoch > (1 << 32) from mysql.ndb_apply_status where server_id=0;
 
+#
+# Bug#40428 core dumped when restore backup log file(redo log)
+#
+--exec $NDB_TOOLS_DIR/ndb_restore --print --print_meta -b 1 -n 1
$MYSQL_TEST_DIR/std_data/ndb_backup50
+
+#
+# Bug #33040 ndb_restore crashes with --print_log
+#
+--exec $NDB_TOOLS_DIR/ndb_restore --print_log -b 1 -n 1
$MYSQL_TEST_DIR/std_data/ndb_backup50
+

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2009-09-04 10:36:34 +0000
+++ b/sql/ha_ndbcluster.cc	2009-09-08 11:24:40 +0000
@@ -1324,6 +1324,19 @@ bool ha_ndbcluster::uses_blob_value(cons
   return FALSE;
 }
 
+void ha_ndbcluster::release_blobs_buffer()
+{
+  DBUG_ENTER("releaseBlobsBuffer");
+  if (m_blob_total_size > 0)
+  {
+    DBUG_PRINT("info", ("Deleting blobs buffer, size %llu", m_blob_total_size));
+    my_free(m_blobs_buffer, MYF(MY_ALLOW_ZERO_PTR));
+    m_blobs_buffer= 0;
+    m_blob_total_size= 0;
+    m_blobs_buffer_size= 0;
+  }
+  DBUG_VOID_RETURN;
+}
 
 /**
   Get metadata for this table from NDB.
@@ -5654,6 +5667,7 @@ int ha_ndbcluster::init_handler_for_stat
   // Start of transaction
   m_rows_changed= 0;
   m_blobs_pending= FALSE;
+  release_blobs_buffer();
   m_slow_path= m_thd_ndb->m_slow_path;
 #ifdef HAVE_NDB_BINLOG
   if (unlikely(m_slow_path))
@@ -7813,6 +7827,7 @@ ha_ndbcluster::ha_ndbcluster(handlerton 
   m_update_cannot_batch(FALSE),
   m_skip_auto_increment(TRUE),
   m_blobs_pending(0),
+  m_blob_total_size(0),
   m_blobs_buffer(0),
   m_blobs_buffer_size(0),
   m_dupkey((uint) -1),
@@ -7865,8 +7880,7 @@ ha_ndbcluster::~ha_ndbcluster() 
     free_share(&m_share);
   }
   release_metadata(thd, ndb);
-  my_free(m_blobs_buffer, MYF(MY_ALLOW_ZERO_PTR));
-  m_blobs_buffer= 0;
+  release_blobs_buffer();
 
   // Check for open cursor/transaction
   DBUG_ASSERT(m_active_cursor == NULL);

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2009-05-27 12:11:46 +0000
+++ b/sql/ha_ndbcluster.h	2009-09-08 11:24:40 +0000
@@ -700,6 +700,7 @@ private:
   int set_blob_values(const NdbOperation *ndb_op, my_ptrdiff_t row_offset,
                       const MY_BITMAP *bitmap, uint *set_count, bool batch);
   friend int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg);
+  void release_blobs_buffer();
   Uint32 setup_get_hidden_fields(NdbOperation::GetValueSpec gets[2]);
   void get_hidden_fields_keyop(NdbOperation::OperationOptions *options,
                                NdbOperation::GetValueSpec gets[2]);

=== modified file 'storage/ndb/include/ndbapi/NdbBlob.hpp'
--- a/storage/ndb/include/ndbapi/NdbBlob.hpp	2009-06-15 07:42:02 +0000
+++ b/storage/ndb/include/ndbapi/NdbBlob.hpp	2009-09-08 11:24:40 +0000
@@ -369,6 +369,7 @@ private:
     Buf();
     ~Buf();
     void alloc(unsigned n);
+    void release();
     void zerorest();
     void copyfrom(const Buf& src);
   };

=== modified file 'storage/ndb/src/ndbapi/NdbBlob.cpp'
--- a/storage/ndb/src/ndbapi/NdbBlob.cpp	2009-05-27 12:11:46 +0000
+++ b/storage/ndb/src/ndbapi/NdbBlob.cpp	2009-09-08 11:24:40 +0000
@@ -358,6 +358,13 @@ NdbBlob::init()
 void
 NdbBlob::release()
 {
+  theKeyBuf.release();
+  theAccessKeyBuf.release();
+  thePackKeyBuf.release();
+  theHeadInlineBuf.release();
+  theHeadInlineCopyBuf.release();
+  thePartBuf.release();
+  theBlobEventDataBuf.release();
   setState(Idle);
 }
 
@@ -393,6 +400,16 @@ NdbBlob::Buf::alloc(unsigned n)
 }
 
 void
+NdbBlob::Buf::release()
+{
+  if (data)
+    delete [] data;
+  data = NULL;
+  size = 0;
+  maxsize = 0;
+}
+
+void
 NdbBlob::Buf::zerorest()
 {
   assert(size <= maxsize);

=== modified file 'storage/ndb/tools/restore/Restore.cpp'
--- a/storage/ndb/tools/restore/Restore.cpp	2009-08-18 13:02:20 +0000
+++ b/storage/ndb/tools/restore/Restore.cpp	2009-09-08 11:24:40 +0000
@@ -1795,7 +1795,9 @@ operator<<(NdbOut& ndbout, const Attribu
   
   NdbRecAttr tmprec(0);
   tmprec.setup(desc.m_column, 0);
-  tmprec.receive_data((Uint32*)data.void_value, data.size);
+  Uint32 length = (desc.size)/8 * (desc.arraySize);
+  tmprec.receive_data((Uint32*)data.void_value, length);
+
   ndbrecattr_print_formatted(ndbout, tmprec, g_ndbrecord_print_format);
 
   return ndbout;