mirror of
https://github.com/MariaDB/server.git
synced 2026-05-01 20:55:32 +02:00
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
This commit is contained in:
commit
6ae9e9a57c
12 changed files with 53 additions and 25 deletions
|
|
@ -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 -
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue