bk commit into 5.1 tree (jonas:1.2597)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas.  When jonas 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@stripped, 2008-05-19 07:49:38+02:00, jonas@stripped +1 -0
  merge

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2008-05-19 07:49:36+02:00,
jonas@stripped +18 -12
    merge

diff -Nrup a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-05-19 07:22:55 +02:00
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-05-19 07:49:36 +02:00
@@ -8503,6 +8503,13 @@ void Dbdict::sendOLD_LIST_TABLES_CONF(Si
       if(DictTabInfo::isTable(type)){
 	switch (tablePtr.p->tabState) {
 	case TableRecord::DEFINING:
+          conf->setTableState(pos, DictTabInfo::StateBuilding);          
+	  break;
+	case TableRecord::PREPARE_DROPPING:
+	case TableRecord::DROPPING:
+	  conf->setTableState(pos, DictTabInfo::StateDropping);
+	  break;
+	case TableRecord::DEFINED:
           if (tablePtr.p->m_read_locked)
           {
             jam();
@@ -8511,16 +8518,9 @@ void Dbdict::sendOLD_LIST_TABLES_CONF(Si
           else
           {
             jam();
-            conf->setTableState(pos, DictTabInfo::StateBuilding);
+            conf->setTableState(pos, DictTabInfo::StateOnline);
           }
 	  break;
-	case TableRecord::PREPARE_DROPPING:
-	case TableRecord::DROPPING:
-	  conf->setTableState(pos, DictTabInfo::StateDropping);
-	  break;
-	case TableRecord::DEFINED:
-	  conf->setTableState(pos, DictTabInfo::StateOnline);
-	  break;
 	default:
 	  conf->setTableState(pos, DictTabInfo::StateBroken);
 	  break;
@@ -8724,10 +8724,16 @@ void Dbdict::sendLIST_TABLES_CONF(Signal
 	  ltd.setTableState(DictTabInfo::StateDropping);
 	  break;
 	case TableRecord::DEFINED:
-	  ltd.setTableState(DictTabInfo::StateOnline);
-	  break;
-	case TableRecord::BACKUP_ONGOING:
-	  ltd.setTableState(DictTabInfo::StateBackup);
+          if (tablePtr.p->m_read_locked)
+          {
+            jam();
+            ltd.setTableState(DictTabInfo::StateBackup);
+          }
+          else
+          {
+            jam();
+            ltd.setTableState(DictTabInfo::StateOnline);
+          }
 	  break;
 	default:
 	  ltd.setTableState(DictTabInfo::StateBroken);