summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-01-16 06:02:05 +0200
committerunknown <monty@donna.mysql.com>2001-01-16 06:02:05 +0200
commit0365e2d3dceccb1dc3727336e1596869e3c1a180 (patch)
treed2fb03ef30e8182ca60cf1262a5a9db0e97a08a5 /myisam
parent9e67d0bec4c5d697c76ce05f12d424210ea0b656 (diff)
downloadmariadb-git-0365e2d3dceccb1dc3727336e1596869e3c1a180.tar.gz
Removed not used variable 'last_ref'
Fixed problem with negative DECIMAL() keys Fixed some bugs with NULL keys in BDB More mysql-test tests Docs/manual.texi: Changelog client/mysqltest.c: Added syntax: -- error #,#,... heap/hp_info.c: cleanup include/thr_lock.h: cleanup isam/pack_isam.c: cleanup myisam/mi_check.c: cleanup myisam/mi_extra.c: cleanup myisammrg/myrg_rkey.c: cleanup mysql-test/mysql-test-run.sh: Change to run test as root mysql-test/r/bdb.result: Many new tests mysql-test/r/func_system.result: Change to root user mysql-test/t/bdb.test: many more tests mysql-test/t/create.test: Change to work by test and root user sql/field.cc: Fixed problem with negative DECIMAL() keys sql/filesort.cc: cleanup sql/ha_berkeley.cc: Added purecoverage notes Fixed some bugs with NULL keys sql/init.cc: cleanup sql/mysql_priv.h: cleanup sql/mysqld.cc: cleanup sql/records.cc: cleanup sql/unireg.h: cleanup
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_check.c2
-rw-r--r--myisam/mi_extra.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 67503bd4f6c..ee9e3387119 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -1182,7 +1182,7 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
That is the next line for... (serg)
*/
- share->state.key_map= (((ulonglong) 1L << share->base.keys)-1 &
+ share->state.key_map= ((((ulonglong) 1L << share->base.keys)-1) &
param->keys_in_use);
info->state->key_file_length=share->base.keystart;
diff --git a/myisam/mi_extra.c b/myisam/mi_extra.c
index eaf9400babe..fe95c60931c 100644
--- a/myisam/mi_extra.c
+++ b/myisam/mi_extra.c
@@ -151,6 +151,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function)
{
info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
error=end_io_cache(&info->rec_cache);
+ /* Sergei will insert full text index caching here */
}
#if defined(HAVE_MMAP) && defined(HAVE_MADVICE)
if (info->opt_flag & MEMMAP_USED)