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_select.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_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index abe239e7d4d..5db4a0042ea 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000-2004 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 @@ -5549,6 +5549,8 @@ bool create_myisam_from_heap(THD *thd, TABLE *table, TMP_TABLE_PARAM *param, goto err2; if (open_tmp_table(&new_table)) goto err1; + if (table->file->indexes_are_disabled()) + new_table.file->disable_indexes(HA_KEY_SWITCH_ALL); table->file->index_end(); table->file->rnd_init(); if (table->no_rows) |