diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-08 00:04:30 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-08 00:04:30 +0200 |
| commit | fc4a3ef7c11446ba1159e4873c3323d6fa2fcc60 (patch) | |
| tree | 500feaf42e43ee02e3822a280b03319bcd8f3abe /myisam/mi_delete.c | |
| parent | 92a3aedc05dd07e1d00986f237a2097af595e584 (diff) | |
| download | mariadb-git-fc4a3ef7c11446ba1159e4873c3323d6fa2fcc60.tar.gz | |
Fixed bug when having many binary log files
Fixed bug when deleting keys with possible NULL values
many changes to mysqltest
Docs/Makefile.am:
Don't print warnings when making ..dvi
Docs/manual.texi:
Documented changes
acinclude.m4:
Fixed bug in detecting BDB version 3.2.3g
client/mysqltest.c:
Added TODO
Cleanups
Free all memory and close all files on exit
configure.in:
New release
include/my_sys.h:
Added new function needed for mysqltest.c
myisam/mi_create.c:
Cleanup
myisam/mi_delete.c:
Fixed bug when deleting keys with NULL
myisam/mi_search.c:
cleanup
myisam/myisamchk.c:
Added info about fulltext to -D
mysql-test/mysql-test-run.sh:
Use less memory for mysqld
Don't remove timefile if only testing one test
Send option --debug to mysqltest
mysql-test/r/fulltext.result:
New tests
mysql-test/r/func_math.result:
Make test portable
mysql-test/t/fulltext.test:
New tests
mysql-test/t/func_math.test:
Make test portable
mysys/mf_iocache2.c:
Fixed bug when reading over buffers
mysys/string.c:
Added new function needed for mysqltest.c
mysys/typelib.c:
cleanup
scripts/make_binary_distribution.sh:
Added option suffix
Removed some warnings for missing files
scripts/mysql_install_db.sh:
Fixed type
scripts/safe_mysqld.sh:
Also read options from 'server' group
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/bench-init.pl.sh:
Added missing option '--silent'
sql/mysqld.cc:
Added warnings
Print backtraces even if 'current_thd' is not active
support-files/mysql.spec.sh:
Removed duplicate entry
Diffstat (limited to 'myisam/mi_delete.c')
| -rw-r--r-- | myisam/mi_delete.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c index f8bc37d8e20..445e745b07d 100644 --- a/myisam/mi_delete.c +++ b/myisam/mi_delete.c @@ -707,9 +707,10 @@ static uint remove_key(MI_KEYDEF *keyinfo, uint nod_flag, } else { - /* A variable length first key part */ - if (*keypos & 128) /* Next key is packed */ + /* Check if a variable length first key part */ + if ((keyinfo->seg->flag & HA_PACK_KEY) && *keypos & 128) { + /* Next key is packed against the current one */ uint next_length,prev_length,prev_pack_length,lastkey_length, rest_length; if (keyinfo->seg[0].length >= 127) |