diff options
| author | unknown <monty@donna.mysql.com> | 2000-11-18 23:13:48 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-11-18 23:13:48 +0200 |
| commit | 5dae19b394e3385c0e48d896fec1174437f2308a (patch) | |
| tree | 287897ebd815b64a05c0ca7076beccd5245a2f8d /myisam | |
| parent | 469fce643c6f71c3bcaaa62454604fbb30bcbacc (diff) | |
| download | mariadb-git-5dae19b394e3385c0e48d896fec1174437f2308a.tar.gz | |
Fixed some reported bugs
BUILD/compile-alpha-cxx:
Building on Alpha with Compaq C and C+++
Docs/manual.texi:
Changelogs and update of links
myisam/mi_key.c:
Fixed multi_part keys where first part where of TEXT/BLOB type
mysys/Makefile.am:
Makefile.am now works with Compaq make
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/test-select.sh:
Made the count_distinct_big test a bit smaller
sql/log.cc:
Changed the slow log format to have more information by default
sql/mysqld.cc:
false->FALSE
sql/share/german/errmsg.sys:
Update of messages
sql/share/german/errmsg.txt:
Update of messages
sql/sql_base.cc:
Fixed SELECT DISTINCT *
sql/sql_insert.cc:
Cleanup
sql/sql_table.cc:
Added logging of DROP of temporary tables
vio/VioFd.cc:
false -> FALSE
vio/VioSSL.cc:
false -> FALSE
vio/VioSSLFactoriesFd.cc:
false -> FALSE
vio/VioSocket.cc:
false -> FALSE
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_key.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/myisam/mi_key.c b/myisam/mi_key.c index d64a02ea5f5..bf2f5c292dd 100644 --- a/myisam/mi_key.c +++ b/myisam/mi_key.c @@ -181,10 +181,14 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old, } else if (keyseg->flag & (HA_VAR_LENGTH | HA_BLOB_PART)) { - uint tmp_length=uint2korr(pos); pos+=2; + /* Length of key-part used with mi_rkey() always 2 */ + uint tmp_length=uint2korr(pos); + k_length-= 2+length; set_if_smaller(length,tmp_length); store_key_length_inc(key,length); - k_length-=2; + memcpy((byte*) key, pos+2,(size_t) length); + key+= length; + continue; } else if (keyseg->flag & HA_SWAP_KEY) { /* Numerical column */ |