Commit 6ba820f2 authored by unknown's avatar unknown
Browse files

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

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


storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
parents 2f370575 5a751742

storage/ndb/include/ndbapi/NdbDictionary.hpp

+8 −0
Original line number Diff line number Diff line
@@ -1597,6 +1597,14 @@ public: 
     */

    const Table * getTable(const char * name) const;



#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL

    /*

     * Save a table definition in dictionary cache

     * @param table Object to put into cache

     */

    void putTable(const Table * table);

#endif



    /**

     * Get index with given name, NULL if undefined

     * @param indexName  Name of index to get.

storage/ndb/include/ndbapi/NdbEventOperation.hpp

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ public: 


#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL

  /** these are subject to change at any time */

  const NdbDictionary::Table* getTable() const;

  const NdbDictionary::Event *getEvent() const;

  const NdbRecAttr *getFirstPkAttr() const;

  const NdbRecAttr *getFirstPkPreAttr() const;

storage/ndb/src/ndbapi/NdbDictionary.cpp

+7 −0
Original line number Diff line number Diff line
@@ -1349,6 +1349,13 @@ NdbDictionary::Dictionary::getTable(const char * name, void **data) const 
  return 0;

}



void NdbDictionary::Dictionary::putTable(const NdbDictionary::Table * table)

{

 NdbDictionary::Table  *copy_table = new NdbDictionary::Table;

  *copy_table = *table;

  m_impl.putTable(&NdbTableImpl::getImpl(*copy_table));

}



void NdbDictionary::Dictionary::set_local_table_data_size(unsigned sz)

{

  m_impl.m_local_table_data_size= sz;

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

+7 −0
Original line number Diff line number Diff line
@@ -1305,7 +1305,14 @@ NdbDictionaryImpl::fetchGlobalTableImpl(const BaseString& internalTableName) 
void

NdbDictionaryImpl::putTable(NdbTableImpl *impl)

{

  NdbTableImpl *old;



  m_globalHash->lock();

  if ((old= m_globalHash->get(impl->m_internalName.c_str())))

  {

    old->m_status = NdbDictionary::Object::Invalid;

    m_globalHash->drop(old);

  }

  m_globalHash->put(impl->m_internalName.c_str(), impl);

  m_globalHash->unlock();

  Ndb_local_table_info *info=

storage/ndb/src/ndbapi/NdbEventOperation.cpp

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ NdbEventOperation::print() 
/*

 * Internal for the mysql server

 */

const NdbDictionary::Table *NdbEventOperation::getTable() const

{

  return m_impl.m_eventImpl->m_tableImpl->m_facade;

}

const NdbDictionary::Event *NdbEventOperation::getEvent() const

{

  return m_impl.m_eventImpl->m_facade;