diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-05-16 22:39:43 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-05-16 22:39:43 -0700 |
| commit | 704f97035fed1a454ea3300d2ad5dda906dbce50 (patch) | |
| tree | 7204d0246b026782b99b8effe9a0ec682e90e209 /storage/myisam | |
| parent | 7b797fe66d7167a8f5cbb071a06a640a627f2186 (diff) | |
| parent | a8be09a9f26b43139ad84ead314898d23394f673 (diff) | |
| download | mariadb-git-704f97035fed1a454ea3300d2ad5dda906dbce50.tar.gz | |
Merged the code of MWL#106 into 5.3
Resolved all conflicts, bad merges and fixed a few minor bugs in the code.
Commented out the queries from multi_update, view, subselect_sj, func_str,
derived_view, view_grant that failed either with crashes in ps-protocol or
with wrong results.
The failures are clear indications of some bugs in the code and these bugs
are to be fixed.
Diffstat (limited to 'storage/myisam')
| -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 89bdd4597f8..ecdd609a1f9 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -1868,6 +1868,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) { |