bk commit into 5.1 tree (tomas:1.2119) BUG#17459

[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.2119 06/02/16 17:25:28 tomas@stripped +1 -0
  Bug #17459  	Cluster row based replication not setup if backup is ongoing
  - also accept setting up binlog for tables in stateBackup

  sql/ha_ndbcluster.cc
    1.271 06/02/16 17:25:20 tomas@stripped +6 -3
    Bug #17459  	Cluster row based replication not setup if backup is ongoing
    - also accept setting up binlog for tables in stateBackup

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

--- 1.270/sql/ha_ndbcluster.cc	2006-02-16 03:24:44 +01:00
+++ 1.271/sql/ha_ndbcluster.cc	2006-02-16 17:25:20 +01:00
@@ -5524,14 +5524,17 @@
     for (uint i= 0 ; i < list.count ; i++)
     {
       NDBDICT::List::Element& elmt= list.elements[i];
+      int do_handle_table= 0;
       if (IS_TMP_PREFIX(elmt.name))
       {
         DBUG_PRINT("info", ("Skipping %s.%s in NDB", elmt.database, elmt.name));
         continue;
       }
       DBUG_PRINT("info", ("Found %s.%s in NDB", elmt.database, elmt.name));
-      if (!(elmt.state == NDBOBJ::StateBuilding ||
-            elmt.state == NDBOBJ::StateOnline))
+      if (elmt.state == NDBOBJ::StateOnline ||
+          elmt.state == NDBOBJ::StateBackup)
+        do_handle_table= 1;
+      else if (!(elmt.state == NDBOBJ::StateBuilding))
       {
         sql_print_information("NDB: skipping setup table %s.%s, in state %d",
                               elmt.database, elmt.name, elmt.state);
@@ -5543,7 +5546,7 @@
 
       if (!(ndbtab= dict->getTable(elmt.name)))
       {
-        if (elmt.state == NDBOBJ::StateOnline)
+        if (do_handle_table)
           sql_print_error("NDB: failed to setup table %s.%s, error: %d, %s",
                           elmt.database, elmt.name,
                           dict->getNdbError().code,