diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-12 16:40:27 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-12 16:40:27 +0200 |
| commit | 686faae582dad736ac85144ecb4e50c1b1fe579e (patch) | |
| tree | 45e50c85db22ef0250d8f91f77ab26192bf97098 /sql/ha_berkeley.cc | |
| parent | 72b3120dcca706f5f4d78f766dba691c473243d0 (diff) | |
| download | mariadb-git-686faae582dad736ac85144ecb4e50c1b1fe579e.tar.gz | |
Added test for innobase
Fixed problem with NULL keys in BDB
BitKeeper/deleted/.del-select.res~1295456b93948768:
***MISSING WEAVE***
mysql-test/r/join_outer.result:
Fix results
sql/ha_berkeley.cc:
Fixed problem with NULL keys
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 981526910af..0cf789056c9 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -770,10 +770,8 @@ DBT *ha_berkeley::pack_key(DBT *key, uint keynr, char *buff, for (; key_part != end && (int) key_length > 0 ; key_part++) { - uint offset=0; if (key_part->null_bit) { - offset=1; if (!(*buff++ = (*key_ptr == 0))) // Store 0 if NULL { key_length-= key_part->store_length; @@ -783,7 +781,7 @@ DBT *ha_berkeley::pack_key(DBT *key, uint keynr, char *buff, } key_ptr++; } - buff=key_part->field->keypack(buff,key_ptr+offset,key_part->length); + buff=key_part->field->keypack(buff,key_ptr,key_part->length); key_ptr+=key_part->store_length; key_length-=key_part->store_length; } |