diff options
author | unknown <monty@donna.mysql.com> | 2000-09-20 04:54:10 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-09-20 04:54:10 +0300 |
commit | 2144c32e2afafac56f3469329691b8d914ce39ee (patch) | |
tree | 9809b1ec91af01ed8cc76e542fe1a102e239d9b1 /myisam/mi_test2.c | |
parent | 87fdca2ecf7a8d3a6b7a3663e6a4cca71392d29b (diff) | |
download | mariadb-git-2144c32e2afafac56f3469329691b8d914ce39ee.tar.gz |
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
Diffstat (limited to 'myisam/mi_test2.c')
-rw-r--r-- | myisam/mi_test2.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/myisam/mi_test2.c b/myisam/mi_test2.c index 25bc1a4f844..746042554c8 100644 --- a/myisam/mi_test2.c +++ b/myisam/mi_test2.c @@ -44,7 +44,8 @@ static void copy_key(struct st_myisam_info *info,uint inx, static int verbose=0,testflag=0, first_key=0,async_io=0,key_cacheing=0,write_cacheing=0,locking=0, - rec_pointer_size=0,pack_fields=1,use_log=0,silent=0; + rec_pointer_size=0,pack_fields=1,use_log=0,silent=0, + opt_quick_mode=0; static int pack_seg=HA_SPACE_PACK,pack_type=HA_PACK_KEY,remove_count=-1, create_flag=0; static ulong key_cache_size=IO_SIZE*16; @@ -212,6 +213,8 @@ int main(int argc, char **argv) mi_lock_database(file,F_WRLCK); if (write_cacheing) mi_extra(file,HA_EXTRA_WRITE_CACHE); + if (opt_quick_mode) + mi_extra(file,HA_EXTRA_QUICK); for (i=0 ; i < recant ; i++) { @@ -778,6 +781,8 @@ end: puts("Key cacheing used"); if (write_cacheing) puts("Write cacheing used"); + if (write_cacheing) + puts("quick mode"); if (async_io && locking) puts("Asyncron io with locking used"); else if (locking) @@ -885,6 +890,9 @@ static void get_options(int argc, char **argv) case 't': testflag=atoi(++pos); /* testmod */ break; + case 'q': + opt_quick_mode=1; + break; case 'c': create_flag|= HA_CREATE_CHECKSUM; break; @@ -894,9 +902,9 @@ static void get_options(int argc, char **argv) case '?': case 'I': case 'V': - printf("%s Ver 1.1 for %s at %s\n",progname,SYSTEM_TYPE,MACHINE_TYPE); + printf("%s Ver 1.2 for %s at %s\n",progname,SYSTEM_TYPE,MACHINE_TYPE); puts("By Monty, for your professional use\n"); - printf("Usage: %s [-?AbBcDIKLPRSsVWltv] [-k#] [-f#] [-m#] [-t#]\n", + printf("Usage: %s [-?AbBcDIKLPRqSsVWltv] [-k#] [-f#] [-m#] [-t#]\n", progname); exit(0); case '#': |