Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1 sql/table.cc: Auto merged
This commit is contained in:
commit
66e49dc5a0
@ -288,7 +288,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
|
||||
keynames=(char*) key_part;
|
||||
strpos+= (strmov(keynames, (char *) strpos) - keynames)+1;
|
||||
|
||||
share->null_bytes= (null_pos-(uchar*)outparam->null_flags + (null_bit_pos + 7) / 8);
|
||||
share->null_bytes= null_pos - (uchar*) outparam->null_flags + (null_bit_pos + 7) / 8;
|
||||
|
||||
share->reclength = uint2korr((head+16));
|
||||
if (*(head+26) == 1)
|
||||
|
Loading…
x
Reference in New Issue
Block a user