bzr commit into mysql-5.1-telco-6.4 branch (jonas:2632)

[jonas]

#At file:///home/jonas/src/telco-6.4/

 2632 jonas@stripped	2008-06-05
      ndb - 
        Fix new LIST_TABLESCONF to set Building on Trigger::DEFINING
        (added in 6.4) (merge problem)
modified:
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

per-file comments:
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    Fix new LIST_TABLESCONF to set Building on Trigger::DEFINING
    (added in 6.4)
=== modified file 'storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-06-02 13:27:27 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-06-05 10:13:21 +0000
@@ -8293,6 +8293,9 @@ void Dbdict::sendLIST_TABLES_CONF(Signal
       ltd.setTableId(triggerPtr.i);
       ltd.setTableType(type);
       switch (triggerPtr.p->triggerState) {
+      case TriggerRecord::TS_DEFINING:
+	ltd.setTableState(DictTabInfo::StateBuilding);
+	break;
       case TriggerRecord::TS_OFFLINE:
 	ltd.setTableState(DictTabInfo::StateOffline);
 	break;