mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

ALTER TABLE ... DISABLE/ENABLE KEYS, code cleanup

Browse source 
myisam/ft_boolean_search.c:
  qsort_cmp -> qsort_cmp2
myisam/mi_extra.c:
  ALTER TABLE ... ENABLE/DISABLE KEYS
  mi_extra(HA_EXTRA_NO_KEYS) disables only only non-unique keys
myisam/myisamlog.c:
  qsort_cmp -> qsort_cmp2
sql/ha_myisam.cc:
  ALTER TABLE ENABLE/DISABLE KEYS
  deactivate_non_unique_index(HA_POS_ERROR) to force deactivation
sql/ha_myisam.h:
  ALTER TABLE ... DISABLE/ENABLE KEYS
sql/sql_table.cc:
  ALTER TABLE ... DISABLE/ENABLE KEYS
This commit is contained in:
unknown 2001-05-24 13:14:25 +02:00
commit 1c8902e4ef
6 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
sql/ha_myisam.cc
View file

@ -637,8 +637,18 @@ int ha_myisam::repair(THD *thd, MI_CHECK &param, bool optimize)
void ha_myisam::deactivate_non_unique_index(ha_rows rows)
{
if (!(specialflag & SPECIAL_SAFE_MODE))
mi_disable_non_unique_index(file,rows);
MYISAM_SHARE* share = file->s;
if (share->state.key_map == ((ulonglong) 1L << share->base.keys)-1)
{
if (!(specialflag & SPECIAL_SAFE_MODE))
if (rows==HA_POS_ERROR)
mi_extra(file, HA_EXTRA_NO_KEYS);
else
mi_disable_non_unique_index(file,rows);
enable_activate_all_index=1;
}
else
enable_activate_all_index=0;
}
@ -648,7 +658,8 @@ bool ha_myisam::activate_all_index(THD *thd)
MI_CHECK param;
MYISAM_SHARE* share = file->s;
DBUG_ENTER("activate_all_index");
if (share->state.key_map != ((ulonglong) 1L << share->base.keys)-1)
if (enable_activate_all_index &&
share->state.key_map != ((ulonglong) 1L << share->base.keys)-1)
{
const char *save_proc_info=thd->proc_info;
thd->proc_info="Creating index";
@ -663,6 +674,8 @@ bool ha_myisam::activate_all_index(THD *thd)
error=repair(thd,param,0) != HA_ADMIN_OK;
thd->proc_info=save_proc_info;
}
else
enable_activate_all_index=1;
DBUG_RETURN(error);
}