diff options
| author | unknown <monty@donna.mysql.com> | 2000-09-22 01:46:26 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-09-22 01:46:26 +0300 |
| commit | 5f12486229fb578f2e170238ab2cdd7c9bf42a82 (patch) | |
| tree | 578e79cb989b0a5458b2f7b7cd27600813a79432 /myisam/mi_search.c | |
| parent | 5e955288bc695e2f7a92c5549c7753309b41bed7 (diff) | |
| download | mariadb-git-5f12486229fb578f2e170238ab2cdd7c9bf42a82.tar.gz | |
Fixes for MyISAM and packed keys + AIX
Docs/manual.texi:
Updated changelog
client/mysql.cc:
Free all memory, even if we can't connect to the server
include/config-win.h:
Ensure that we don't use SAFE_MUTEX on windows
include/my_pthread.h:
Optimze struct for Ia64
include/myisam.h:
Hack for debugging BIG tables
myisam/mi_check.c:
Hack for debugging BIG tables
myisam/mi_search.c:
Fixed bug in packed keys
myisam/myisamchk.c:
Hack for debugging BIG tables
mysys/thr_mutex.c:
Make safe_mutex safe for windows
scripts/safe_mysqld.sh:
Fix nice test and echo output
sql/share/Makefile.am:
Fix character sets
sql/sql_string.cc:
Fixes for AIX (which can't handle that the length argument is 0)
Diffstat (limited to 'myisam/mi_search.c')
| -rw-r--r-- | myisam/mi_search.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/mi_search.c b/myisam/mi_search.c index 8fb35f3af65..eead2a84c29 100644 --- a/myisam/mi_search.c +++ b/myisam/mi_search.c @@ -1407,7 +1407,7 @@ _mi_calc_var_key_length(MI_KEYDEF *keyinfo,uint nod_flag, Keys are compressed the following way: If the max length of first key segment <= 127 characters the prefix is - 1 byte else its 2 byte + 1 byte else it's 2 byte prefix byte The high bit is set if this is a prefix for the prev key length Packed length if the previous was a prefix byte @@ -1492,7 +1492,7 @@ _mi_calc_var_pack_key_length(MI_KEYDEF *keyinfo,uint nod_flag,uchar *next_key, if (new_key_length && new_key_length == org_key_length) same_length=1; else if (new_key_length > org_key_length) - end=key+ org_key_length+1; + end=key + org_key_length; if (sort_order) /* SerG */ { |