diff options
| author | ingo@mysql.com <> | 2004-05-07 11:13:58 +0200 |
|---|---|---|
| committer | ingo@mysql.com <> | 2004-05-07 11:13:58 +0200 |
| commit | 5c4f83bbd9387d45636e16a14ae4284166a0e675 (patch) | |
| tree | 894bc06e8d2d979cd1ce5d96299358c3af896009 /sql/sql_table.cc | |
| parent | df8e3eac456b14b420f724e658eee175d2ee5e57 (diff) | |
| parent | 784c9526ecb1f19216bdbb7a24fd85d71529ad5f (diff) | |
| download | mariadb-git-5c4f83bbd9387d45636e16a14ae4284166a0e675.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1687
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index abf773b345f..d1a2e0e20d6 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright (C) 2000-2004 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -2556,14 +2556,14 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, VOID(pthread_mutex_lock(&LOCK_open)); wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN); VOID(pthread_mutex_unlock(&LOCK_open)); - error= table->file->enable_indexes(); + error= table->file->enable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE); /* COND_refresh will be signaled in close_thread_tables() */ break; case DISABLE: VOID(pthread_mutex_lock(&LOCK_open)); wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN); VOID(pthread_mutex_unlock(&LOCK_open)); - error=table->file->disable_indexes(0, 1); + error=table->file->disable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE); /* COND_refresh will be signaled in close_thread_tables() */ break; } |