bzr push into mysql-5.1 branch (tomas.ulin:2796 to 2797)

[Tomas Ulin]

 2797 Tomas Ulin	2008-12-15
      remove not needed ref usage
modified:
  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

 2796 Jonas Oreland	2008-12-12 [merge]
      merge 63-main
modified:
  storage/ndb/src/mgmclient/CommandInterpreter.cpp

=== modified file 'storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2008-05-16 13:10:18 +0000
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2008-12-15 09:59:56 +0000
@@ -2780,15 +2780,7 @@ NdbDictionaryImpl::optimizeTable(const N
                                  NdbOptimizeTableHandleImpl &h)
 {
   DBUG_ENTER("NdbDictionaryImpl::optimizeTableGlobal(const NdbTableImpl)");
-  /**
-   * make sure we get global table object here
-   */
-  NdbTableImpl *g_table = getTableGlobal(t.getName());
-  if (g_table == NULL) {
-    m_ndb.getNdbError(getNdbError().code);
-    DBUG_RETURN(-1);
-  }
-  DBUG_RETURN(h.init(&m_ndb, *g_table));
+  DBUG_RETURN(h.init(&m_ndb, t));
 }
 
 int
@@ -2796,16 +2788,7 @@ NdbDictionaryImpl::optimizeIndex(const N
                                  NdbOptimizeIndexHandleImpl &h)
 {
   DBUG_ENTER("NdbDictionaryImpl::optimizeIndexGlobal(const NdbIndexImpl)");
-  /**
-   * make sure we get global index object here
-   */
-  const NdbIndexImpl * g_index = getIndexGlobal(index.getName(),
-                                                index.getTable());
-  if (g_index == NULL) {
-    m_ndb.getNdbError(getNdbError().code);
-    DBUG_RETURN(-1);
-  }
-  DBUG_RETURN(h.init(&m_ndb, *g_index));
+  DBUG_RETURN(h.init(&m_ndb, index));
 }
 
 int