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

[Jonas Oreland]

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

 3261 Jonas Oreland	2009-02-17 [merge]
      merge 63 to 64
modified:
  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

=== modified file 'storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2009-01-21 14:37:35 +0000
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2009-02-17 07:44:46 +0000
@@ -506,7 +506,7 @@ NdbTableImpl::init(){
   m_min_rows = 0;
   m_max_rows = 0;
   m_tablespace_name.clear();
-  m_tablespace_id = ~0;
+  m_tablespace_id = RNIL;
   m_tablespace_version = ~0;
   m_single_user_mode = 0;
   m_hash_map_id = RNIL;
@@ -645,11 +645,9 @@ NdbTableImpl::equal(const NdbTableImpl& 
 
   if(m_tablespace_id != obj.m_tablespace_id)
   {
-#if wl3600_todo // diff for no ts, check later
     DBUG_PRINT("info",("m_tablespace_id %d != %d",m_tablespace_id,
                         obj.m_tablespace_id));
     DBUG_RETURN(false);
-#endif
   }
 
   if(m_tablespace_version != obj.m_tablespace_version)