diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-05-07 16:01:47 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-05-07 16:01:47 +0300 |
| commit | be45b615842fffb67d2149093d26be435ba42a11 (patch) | |
| tree | e8b5b44001332deef4ecbe4798a45d3572d16553 /sql/sql_table.cc | |
| parent | 6b313c6998c7db489d5e6eabb11c6951a908b6fc (diff) | |
| parent | c207325aaf0cbb3781d72891c9ae95e18c6ea355 (diff) | |
| download | mariadb-git-be45b615842fffb67d2149093d26be435ba42a11.tar.gz | |
Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
sql/sql_table.cc:
Auto merged
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 057c06d6ad3..55b726293c2 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 @@ -2581,14 +2581,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; } |