1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Small bug fixes + code for DELETE QUICK

Docs/manual.texi:
  Change log + bug fixes from the mailing list
configure.in:
  added mlockall
include/config-win.h:
  Fix to use SAFE_MUTEX
include/ft_global.h:
  Free memory
include/my_pthread.h:
  Fix for SAFE_MUTEX on windows
myisam/Makefile.am:
  Fix modes
myisam/ft_static.c:
  Fix language problem with fulltext
myisam/ft_stopwords.c:
  Free memory at end
myisam/mi_create.c:
  Fix language problem with fulltext
myisam/mi_delete.c:
  Added optimization to not join blocks when using delete with QUICK
myisam/mi_panic.c:
  Added freeing of memorty
myisam/mi_test2.c:
  Added quick mode
myisam/myisamchk.c:
  Fixed help text
myisam/myisamdef.h:
  Added optimization to not join blocks when using delete with QUICK
mysys/mf_format.c:
  Don't change case for extension
mysys/my_wincond.c:
  Fix for safe mutex
mysys/thr_mutex.c:
  Fix for safe mutex
sql-bench/test-insert.sh:
  Split delete test to get more information about the times
sql/ChangeLog:
  Changelog
sql/ha_myisam.cc:
  Better OPTIMIZE handling
sql/log.cc:
  Cleanup
sql/mysql_priv.h:
  Fix for safe mutex
sql/mysqld.cc:
  Added define for --one-thread option
sql/sql_class.h:
  Fixed lock_time in slow_log
sql/sql_delete.cc:
  Fix for safe mutex
sql/sql_parse.cc:
  Fix processlist message for new process
sql/sql_table.cc:
  Fix windows problem med CREATE INDEX
sql/sql_yacc.yy:
  Fix for safe mutex
sql/table.cc:
  Made code simpler
strings/bmove512.c:
  Small speed fix
support-files/mysql.server.sh:
  Fixed awk usage
This commit is contained in:
unknown
2000-09-20 04:54:10 +03:00
parent 5a4aa474d8
commit 5a2419eb89
31 changed files with 257 additions and 111 deletions

View File

@ -247,9 +247,9 @@ static int d_search(register MI_INFO *info, register MI_KEYDEF *keyinfo,
{ /* On leaf page */
if (_mi_write_keypage(info,keyinfo,page,anc_buff))
DBUG_RETURN(-1);
if (length <= (uint) keyinfo->underflow_block_length)
DBUG_RETURN(1); /* Page will be update later */
DBUG_RETURN(0);
/* Page will be update later if we return 1 */
DBUG_RETURN(test(length <= (info->quick_mode ? MI_MIN_KEYBLOCK_LENGTH :
(uint) keyinfo->underflow_block_length)));
}
save_flag=1;
ret_value=del(info,keyinfo,key,anc_buff,leaf_page,leaf_buff,keypos,
@ -385,7 +385,9 @@ static int del(register MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *key,
_mi_kpointer(info,keypos - share->base.key_reflength,next_block);
mi_putint(anc_buff,a_length+length,share->base.key_reflength);
DBUG_RETURN( mi_getint(leaf_buff) <= (uint) keyinfo->underflow_block_length);
DBUG_RETURN( mi_getint(leaf_buff) <=
(info->quick_mode ? MI_MIN_KEYBLOCK_LENGTH :
(uint) keyinfo->underflow_block_length));
err:
DBUG_RETURN(-1);
} /* del */
@ -537,7 +539,8 @@ static int underflow(register MI_INFO *info, register MI_KEYDEF *keyinfo,
}
if (_mi_write_keypage(info,keyinfo,leaf_page,leaf_buff))
goto err;
DBUG_RETURN(anc_length <= (uint) keyinfo->underflow_block_length);
DBUG_RETURN(anc_length <= ((info->quick_mode ? MI_MIN_BLOCK_LENGTH :
(uint) keyinfo->underflow_block_length)));
}
DBUG_PRINT("test",("use left page"));