summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-07-08 23:58:04 +0300
committerunknown <monty@mashka.mysql.fi>2003-07-08 23:58:04 +0300
commite13e857cae1ecaa322a0b4dec76e5b5dfb4f53a0 (patch)
tree469e4c68e8c5de015364504f40b14cec7177b355 /sql/table.cc
parent4c2d3b05547e137cf80f7b983d33927c6072799b (diff)
downloadmariadb-git-e13e857cae1ecaa322a0b4dec76e5b5dfb4f53a0.tar.gz
Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS
Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup myisam/mi_extra.c: Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS mysql-test/r/alter_table.result: Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS mysql-test/t/alter_table.test: Test DISABLE/ENABLE KEY sql/ha_myisam.cc: Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS sql/mysqld.cc: Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup sql/sql_table.cc: Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS sql/table.cc: Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS sql/table.h: Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index a26ab89bd97..e938757cf6c 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -422,7 +422,10 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
/* This has to be done after the above fulltext correction */
index_flags=outparam->file->index_flags(key);
if (!(index_flags & HA_KEY_READ_ONLY))
+ {
+ outparam->read_only_keys|= ((key_map) 1 << key);
outparam->keys_for_keyread&= ~((key_map) 1 << key);
+ }
if (primary_key >= MAX_KEY && (keyinfo->flags & HA_NOSAME))
{