diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
| commit | f03a3ee54fb8b5aeeba590677f48b54a57ab45cf (patch) | |
| tree | afb1235c5417019a563b1c1d64443f3b890d05df /storage/myisam/ha_myisam.cc | |
| parent | f0f2ec3086000a22e83ce9ca33d59a3347784e0c (diff) | |
| parent | 35c35858f859f23c23a414cdb21fdfe39d5de11c (diff) | |
| download | mariadb-git-f03a3ee54fb8b5aeeba590677f48b54a57ab45cf.tar.gz | |
Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.
Resolved all conflicts and failures.
Diffstat (limited to 'storage/myisam/ha_myisam.cc')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index ab6ce96da5c..8f3b05a7a51 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -1867,6 +1867,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) { |