summaryrefslogtreecommitdiff
path: root/sql/ha_myisam.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-11-20 22:06:25 +0200
committermonty@mysql.com <>2003-11-20 22:06:25 +0200
commit7c6113a39f56832da982cfb4ff191e9db49ca798 (patch)
tree685b3a2a60fc00121d338cb0b5f84b4cd028bfe1 /sql/ha_myisam.cc
parentba659679e7816cd9c992c866645f65b06e5f69de (diff)
downloadmariadb-git-7c6113a39f56832da982cfb4ff191e9db49ca798.tar.gz
Merge key cache structures to one
Fixed compiler warnings (IRIX C compiler and VC++)
Diffstat (limited to 'sql/ha_myisam.cc')
-rw-r--r--sql/ha_myisam.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index 0f22a83a2b4..3cdd923d085 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -226,7 +226,6 @@ err:
int ha_myisam::open(const char *name, int mode, uint test_if_locked)
{
- KEY_CACHE_VAR *key_cache;
if (!(file=mi_open(name, mode, test_if_locked)))
return (my_errno ? my_errno : -1);
@@ -698,7 +697,7 @@ int ha_myisam::repair(THD *thd, MI_CHECK &param, bool optimize)
int ha_myisam::assign_to_keycache(THD* thd, HA_CHECK_OPT *check_opt)
{
- KEY_CACHE_VAR *new_key_cache= check_opt->key_cache;
+ KEY_CACHE *new_key_cache= check_opt->key_cache;
const char *errmsg= 0;
int error= HA_ADMIN_OK;
ulonglong map= ~(ulonglong) 0;