Commit c3423d0d authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
parents ddf89750 102c0281

sql/ha_ndbcluster.cc

+8 −6
Original line number Diff line number Diff line
@@ -3285,12 +3285,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) 
        DBUG_PRINT("info", ("Table schema version: %d", 

                            tab->getObjectVersion()));

      }

      if (m_table != (void *)tab)

      {

        m_table= (void *)tab;

        m_table_version = tab->getObjectVersion();

      }

      else if (m_table_version < tab->getObjectVersion())

      if (m_table_version < tab->getObjectVersion())

      {

        /*

          The table has been altered, caller has to retry
@@ -3298,6 +3293,13 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) 
        NdbError err= ndb->getNdbError(NDB_INVALID_SCHEMA_OBJECT);

        DBUG_RETURN(ndb_to_mysql_error(&err));

      }

      if (m_table != (void *)tab)

      {

        m_table= (void *)tab;

        m_table_version = tab->getObjectVersion();

        if (!(my_errno= build_index_list(ndb, table, ILBP_OPEN)))

          DBUG_RETURN(my_errno);

      }

      m_table_info= tab_info;

    }

    no_uncommitted_rows_init(thd);