summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <tulin@dl145c.mysql.com>2005-09-14 13:27:57 +0200
committerunknown <tulin@dl145c.mysql.com>2005-09-14 13:27:57 +0200
commit258c9e9dc7d7aa35a4f56d182761fb356946e5d0 (patch)
tree8dfab6c4b7596f2918da9a04f05d8f3724f0ec1f /sql
parent0b318fd64f1da2c658f90073f12e7349e3e4bac4 (diff)
parente2b72d815f7a66412000fd22bca898fb0406dfdb (diff)
downloadmariadb-git-258c9e9dc7d7aa35a4f56d182761fb356946e5d0.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
Diffstat (limited to 'sql')
-rw-r--r--sql/table.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 6ac5e07daf1..be89081af8c 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -287,6 +287,8 @@ 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->reclength = uint2korr((head+16));
if (*(head+26) == 1)
share->system= 1; /* one-record-database */