merging.

21ba22ac · Alexey Botchkov · 448a1117 · 9732380f · 21ba22ac
Commit 21ba22ac authored Feb 24, 2009 by Alexey Botchkov
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

storage/myisam/ha_myisam.cc storage/myisam/ha_myisam.cc +2 -0

No files found.
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -1789,6 +1789,8 @@ int ha_myisam::extra(enum ha_extra_function operation)
 {
  if ((specialflag & SPECIAL_SAFE_MODE) && operation == HA_EXTRA_KEYREAD)
    return 0;
+  if (operation == HA_EXTRA_MMAP && !opt_myisam_use_mmap)
+    return 0;
  return mi_extra(file, operation, 0);
 }