diff options
| author | unknown <monty@donna.mysql.com> | 2000-10-25 01:50:46 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-10-25 01:50:46 +0300 |
| commit | 5aacf92e2215cc40a8d8934fe7376180fe30ee10 (patch) | |
| tree | e2752fa618359db15b27254ae137517f9bd19779 /sql/field.h | |
| parent | 08dc21df3ad57f782bce0b7277900e880415a0a5 (diff) | |
| download | mariadb-git-5aacf92e2215cc40a8d8934fe7376180fe30ee10.tar.gz | |
Added bdb_lock_max and fixed bug in BDB tables when using key parts
Docs/Makefile.am:
Don't try to get the manual from SCCS
Docs/manual.texi:
Added bdb_lock_max + some information about Linux and big files
myisam/myisamchk.c:
Code cleanup
mysql.proj:
updated
sql/field.cc:
Added compare of packed BDB key
sql/field.h:
Added compare of packed BDB key
sql/ha_berkeley.cc:
Added compare of packed BDB keys and bdb_lock_max variable
sql/ha_berkeley.h:
Added bdb_lock_max variable
sql/key.cc:
cleanup
sql/mysqld.cc:
Added bdb_lock_max
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index f8ba329375b..4af7c17486a 100644 --- a/sql/field.h +++ b/sql/field.h @@ -177,6 +177,8 @@ public: virtual int pack_cmp(const char *a,const char *b, uint key_length_arg) { return cmp(a,b); } + virtual int pack_cmp(const char *b, uint key_length_arg) + { return cmp(ptr,b); } uint offset(); // Should be inline ... void copy_from_tmp(int offset); uint fill_cache_field(struct st_cache_field *copy); @@ -726,6 +728,7 @@ public: char *pack(char *to, const char *from, uint max_length=~(uint) 0); const char *unpack(char* to, const char *from); int pack_cmp(const char *a,const char *b,uint key_length); + int pack_cmp(const char *b,uint key_length); uint packed_col_length(const char *to); uint max_packed_col_length(uint max_length); uint size_of() const { return sizeof(*this); } @@ -777,6 +780,7 @@ public: char *pack(char *to, const char *from, uint max_length=~(uint) 0); const char *unpack(char* to, const char *from); int pack_cmp(const char *a, const char *b, uint key_length); + int pack_cmp(const char *b, uint key_length); uint packed_col_length(const char *to); uint max_packed_col_length(uint max_length); uint size_of() const { return sizeof(*this); } @@ -891,6 +895,7 @@ public: } char *pack_key(char *to, const char *from, uint max_length=~(uint) 0); int pack_cmp(const char *a, const char *b, uint key_length); + int pack_cmp(const char *b, uint key_length); uint packed_col_length(const char *col_ptr) { return get_length(col_ptr)+packlength;} virtual uint max_packed_col_length(uint max_length) |