diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-05-20 12:47:39 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-05-20 12:47:39 -0700 |
| commit | 89cf840cd9709c875bb6494398970624c85e4ab0 (patch) | |
| tree | b6926318d94f0bcd733468587a4bed4101c81612 /storage | |
| parent | be6d6e1b3eb0d243dfa9f1d0de108069df5774e4 (diff) | |
| parent | d015b8fa0ad2bfb853da174c1c959374a24a5063 (diff) | |
| download | mariadb-git-89cf840cd9709c875bb6494398970624c85e4ab0.tar.gz | |
Merge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/heap/ha_heap.cc | 4 | ||||
| -rw-r--r-- | storage/maria/ha_maria.cc | 2 | ||||
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index 17c7b4f741b..0297451871f 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -383,6 +383,10 @@ void ha_heap::position(const uchar *record) int ha_heap::info(uint flag) { HEAPINFO hp_info; + + if (!table) + return 1; + (void) heap_info(file,&hp_info,flag); errkey= hp_info.errkey; 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) diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index d1fbcbd81ea..f5fff07e9a9 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -1865,6 +1865,9 @@ int ha_myisam::info(uint flag) MI_ISAMINFO misam_info; char name_buff[FN_REFLEN]; + if (!table) + return 1; + (void) mi_status(file,&misam_info,flag); if (flag & HA_STATUS_VARIABLE) { |