summaryrefslogtreecommitdiff
path: root/storage/maria
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-05-20 12:47:39 -0700
committerIgor Babaev <igor@askmonty.org>2011-05-20 12:47:39 -0700
commit89cf840cd9709c875bb6494398970624c85e4ab0 (patch)
treeb6926318d94f0bcd733468587a4bed4101c81612 /storage/maria
parentbe6d6e1b3eb0d243dfa9f1d0de108069df5774e4 (diff)
parentd015b8fa0ad2bfb853da174c1c959374a24a5063 (diff)
downloadmariadb-git-89cf840cd9709c875bb6494398970624c85e4ab0.tar.gz
Merge
Diffstat (limited to 'storage/maria')
-rw-r--r--storage/maria/ha_maria.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 69de73a7f9e..a353bc4cbf5 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -2355,7 +2355,7 @@ void ha_maria::position(const uchar *record)
int ha_maria::info(uint flag)
{
- return info(flag, table->s->tmp_table == NO_TMP_TABLE);
+ return (!table ? 1 : info(flag, table->s->tmp_table == NO_TMP_TABLE));
}
int ha_maria::info(uint flag, my_bool lock_table_share)