diff options
author | monty@mysql.com <> | 2006-03-27 15:23:16 +0300 |
---|---|---|
committer | monty@mysql.com <> | 2006-03-27 15:23:16 +0300 |
commit | 25adcb6500e4d0a23a1c7c1cf2cb022b17411343 (patch) | |
tree | d7f59c9dd12c65d22f39009df666552fc492f4e3 | |
parent | aecd1502b12d972a9b6b63dab7bf5d89938db718 (diff) | |
parent | 5903a839c99b7db40681c727959e75008bec367a (diff) | |
download | mariadb-git-25adcb6500e4d0a23a1c7c1cf2cb022b17411343.tar.gz |
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
-rw-r--r-- | ndb/src/ndbapi/NdbDictionaryImpl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/ndb/src/ndbapi/NdbDictionaryImpl.cpp index 8f37c9fe4a0..da344dc6164 100644 --- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp +++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp @@ -1139,7 +1139,8 @@ NdbDictInterface::getTable(class NdbApiSignal * signal, m_error.code= parseTableInfo(&rt, (Uint32*)m_buffer.get_data(), m_buffer.length() / 4, fullyQualifiedNames); - rt->buildColumnHash(); + if (rt != 0) + rt->buildColumnHash(); return rt; } |