Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
5cc8f58c · tulin@dl145c.mysql.com · 80da104e · ee392534 · 5cc8f58c
Commit 5cc8f58c authored Sep 14, 2005 by tulin@dl145c.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/table.cc sql/table.cc +1 -1

No files found.
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -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)