wl#3023 clean up

- enabling some new tests

2 files changed, 24 insertions, 14 deletions

diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
index 5c19bd54d9b..7b35063eb97 100644
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@@ -2690,7 +2690,7 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp,
   {
   case NDBEVENT::TE_INSERT:
     row.n_inserts++;
-    DBUG_PRINT("info", ("INSERT INTO %s", share->key));
+    DBUG_PRINT("info", ("INSERT INTO %s.%s", table_s->db.str, table_s->table_name.str));
     {
       if (share->flags & NSF_BLOB_FLAG)
       {
@@ -2701,13 +2701,14 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp,
         DBUG_ASSERT(ret == 0);
       }
       ndb_unpack_record(table, share->ndb_value[0], &b, table->record[0]);
-      trans.write_row(::server_id, injector::transaction::table(table, true),
-                      &b, n_fields, table->record[0]);
+      int ret= trans.write_row(::server_id, injector::transaction::table(table, true),
+                               &b, n_fields, table->record[0]);
+      DBUG_ASSERT(ret == 0);
     }
     break;
   case NDBEVENT::TE_DELETE:
     row.n_deletes++;
-    DBUG_PRINT("info",("DELETE FROM %s", share->key));
+    DBUG_PRINT("info",("DELETE FROM %s.%s", table_s->db.str, table_s->table_name.str));
     {
       /*
         table->record[0] contains only the primary key in this case
@@ -2736,13 +2737,14 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp,
       }
       ndb_unpack_record(table, share->ndb_value[n], &b, table->record[n]);
       DBUG_EXECUTE("info", print_records(table, table->record[n]););
-      trans.delete_row(::server_id, injector::transaction::table(table, true),
-                       &b, n_fields, table->record[n]);
+      int ret= trans.delete_row(::server_id, injector::transaction::table(table, true),
+                                &b, n_fields, table->record[n]);
+      DBUG_ASSERT(ret == 0);
     }
     break;
   case NDBEVENT::TE_UPDATE:
     row.n_updates++;
-    DBUG_PRINT("info", ("UPDATE %s", share->key));
+    DBUG_PRINT("info", ("UPDATE %s.%s", table_s->db.str, table_s->table_name.str));
     {
       if (share->flags & NSF_BLOB_FLAG)
       {
@@ -2780,11 +2782,12 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp,
         }
         ndb_unpack_record(table, share->ndb_value[1], &b, table->record[1]);
         DBUG_EXECUTE("info", print_records(table, table->record[1]););
-        trans.update_row(::server_id,
-                         injector::transaction::table(table, true),
-                         &b, n_fields,
-                         table->record[1], // before values
-                         table->record[0]);// after values
+        int ret= trans.update_row(::server_id,
+                                  injector::transaction::table(table, true),
+                                  &b, n_fields,
+                                  table->record[1], // before values
+                                  table->record[0]);// after values
+        DBUG_ASSERT(ret == 0);
       }
     }
     break;
@@ -3122,7 +3125,8 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
             }
             DBUG_PRINT("info", ("use_table: %.*s", name.length, name.str));
             injector::transaction::table tbl(table, true);
-            trans.use_table(::server_id, tbl);
+            int ret= trans.use_table(::server_id, tbl);
+            DBUG_ASSERT(ret == 0);
           }
         }
         if (trans.good())
@@ -3134,7 +3138,8 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
             const LEX_STRING& name=table->s->table_name;
             DBUG_PRINT("info", ("use_table: %.*s", name.length, name.str));
             injector::transaction::table tbl(table, true);
-            trans.use_table(::server_id, tbl);
+            int ret= trans.use_table(::server_id, tbl);
+            DBUG_ASSERT(ret == 0);
 
             MY_BITMAP b;
             uint32 bitbuf;
diff --git a/sql/rpl_injector.h b/sql/rpl_injector.h
index 50a0a56dd9b..14d5cca9b6c 100644
--- a/sql/rpl_injector.h
+++ b/sql/rpl_injector.h
@@ -235,6 +235,11 @@ public:
           m_thd= o.m_thd;
           o.m_thd= tmp;
         }
+        {
+          enum_state const tmp= m_state;
+          m_state= o.m_state;
+          o.m_state= tmp;
+        }
       }
 
       enum enum_state