diff options
author | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-11-29 17:25:23 +0200 |
---|---|---|
committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-11-29 17:25:23 +0200 |
commit | 6ae9e9a57c7db29c5bc7214592fc27e901c8206d (patch) | |
tree | ff98751356d1d8efd5d39454189c006ce366502d /sql/table.cc | |
parent | ea7559ceab379e15eb259043ad5effb292c294cf (diff) | |
parent | 129a48b0b94e95e1a5750b496469a2089d14dc8b (diff) | |
download | mariadb-git-6ae9e9a57c7db29c5bc7214592fc27e901c8206d.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/item_sum.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index e63db72a02d..4c1705b6b7a 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -730,6 +730,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, if (key_part->fieldnr) { // Should always be true ! Field *field=key_part->field=outparam->field[key_part->fieldnr-1]; + key_part->type= field->key_type(); if (field->null_ptr) { key_part->null_offset=(uint) ((byte*) field->null_ptr - |