diff options
author | unknown <mskold@mysql.com> | 2005-01-13 10:49:01 +0100 |
---|---|---|
committer | unknown <mskold@mysql.com> | 2005-01-13 10:49:01 +0100 |
commit | 6cacf67b90bdace849ccf25e48392867ca672e0a (patch) | |
tree | 947ccdddaea0b34f06538eb9b0da2620d2d9d58b /ndb/src/ndbapi/NdbDictionaryImpl.hpp | |
parent | 48a98eb1239261f3b6d8a5792410d453d32a54b8 (diff) | |
parent | 12040a9deaf8fc47f448123ab2e24c8f10f39e03 (diff) | |
download | mariadb-git-6cacf67b90bdace849ccf25e48392867ca672e0a.tar.gz |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/NdbDictionaryImpl.hpp')
-rw-r--r-- | ndb/src/ndbapi/NdbDictionaryImpl.hpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.hpp b/ndb/src/ndbapi/NdbDictionaryImpl.hpp index 9bbc254cf0d..b42c5416d83 100644 --- a/ndb/src/ndbapi/NdbDictionaryImpl.hpp +++ b/ndb/src/ndbapi/NdbDictionaryImpl.hpp @@ -183,7 +183,6 @@ public: void setTable(const char * table); const char * getTable() const; const NdbTableImpl * getIndexTable() const; - const NdbTableImpl * getBaseTable() const; Uint32 m_indexId; BaseString m_internalName; |