From fe4cccd6a43496395ec52e9043cd4350e5eac69d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 12 Sep 2000 03:02:33 +0300 Subject: Update to new root alloc, OPTIMIZE TABLE and some other changes Docs/manual.texi: Added chapter for binary log, updated the changelog, linux section, OPTIMIZE TABLE... client/mysqladmin.c: Fixed bug with pid-file handling. client/mysqldump.c: Version change configure.in: Version change include/Makefile.am: Fix for SCO to get sched.h removed. include/global.h: Increased MY_NFILE; Added thread_safe_increment include/my_sys.h: Better root_alloc include/mysql.h: Better root_alloc include/mysys_err.h: Fix for PREAD/PWRITE on windows libmysql/libmysql.c: Better root_alloc myisam/mi_locking.c: Fix for PREAD/PWRITE on windows myisam/mi_static.c: Fix for PREAD/PWRITE on windows mysys/default.c: Better root_alloc mysys/errors.c: Fix for PREAD/PWRITE on windows mysys/my_alloc.c: Better root_alloc mysys/my_create.c: Fix for PREAD/PWRITE on windows mysys/my_fopen.c: Fix for PREAD/PWRITE on windows mysys/my_open.c: Fix for PREAD/PWRITE on windows mysys/my_pread.c: Fix for PREAD/PWRITE on windows mysys/tree.c: Better root_alloc readline/bind.c: Removed compiler warning readline/isearch.c: Removed compiler warning scripts/safe_mysqld.sh: Allow use of MYSQL_UNIX_PORT and MYSQL_TCP_PORT sql-bench/crash-me.sh: Version change sql-bench/limits/mysql-3.23.cfg: Update to latest MySQL version sql/filesort.cc: Added more statistics sql/ha_berkeley.h: Fixed bug with ORDER BY sql/ha_myisam.cc: Added OPTIMIZE TABLE and cleaned up the repair code sql/ha_myisam.h: Added OPTIMIZE TABLE and cleaned up the repair code sql/handler.cc: Added OPTIMIZE TABLE and cleaned up the repair code sql/handler.h: Added OPTIMIZE TABLE and cleaned up the repair code sql/item_func.cc: Fixed comment sql/item_timefunc.cc: Fixed possible month bug sql/mini_client.cc: Use of new root_alloc sql/mysql_priv.h: Added OPTIMIZE TABLE and cleaned up the repair code sql/mysqld.cc: Added more statistics sql/opt_range.cc: Use of new root_alloc sql/slave.cc: Use of new root_alloc sql/sql_acl.cc: Use of new root_alloc sql/sql_class.cc: Use of new root_alloc sql/sql_parse.cc: Use of new root_alloc sql/sql_select.cc: Added more statistics sql/sql_table.cc: Added OPTIMIZE TABLE and cleaned up the repair code sql/sql_udf.cc: Use of new root_alloc sql/sql_yacc.yy: Fixed that OPTIMIZE TABLE can take many tables as arguments sql/table.cc: Use of new root_alloc sql/thr_malloc.cc: Use of new root_alloc support-files/mysql.server.sh: Removed usage of AWK --- myisam/mi_locking.c | 9 --------- myisam/mi_static.c | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'myisam') diff --git a/myisam/mi_locking.c b/myisam/mi_locking.c index c6fc8736145..f34497fc0b6 100644 --- a/myisam/mi_locking.c +++ b/myisam/mi_locking.c @@ -24,9 +24,6 @@ #include "myisamdef.h" #ifdef __WIN__ #include -#endif -#if !defined(HAVE_PREAD) && defined(THREAD) -pthread_mutex_t THR_LOCK_keycache; #endif /* lock table by F_UNLCK, F_RDLCK or F_WRLCK */ @@ -73,14 +70,8 @@ int mi_lock_database(MI_INFO *info, int lock_type) { share->state.process= share->last_process=share->this_process; share->state.unique= info->last_unique= info->this_unique; -#ifndef HAVE_PREAD - pthread_mutex_lock(&THR_LOCK_keycache); /* QQ; Has to be removed! */ -#endif if (mi_state_info_write(share->kfile, &share->state, 1)) error=my_errno; -#ifndef HAVE_PREAD - pthread_mutex_unlock(&THR_LOCK_keycache);/* QQ; Has to be removed! */ -#endif share->changed=0; if (myisam_flush) { diff --git a/myisam/mi_static.c b/myisam/mi_static.c index 4cc831e3f78..035526f525d 100644 --- a/myisam/mi_static.c +++ b/myisam/mi_static.c @@ -33,7 +33,7 @@ File myisam_log_file= -1; uint myisam_quick_table_bits=9; uint myisam_block_size=MI_KEY_BLOCK_LENGTH; /* Best by test */ my_bool myisam_flush=0,myisam_delay_key_write=0; -#if defined(THREAD) && !defined(DONT_USE_RW_LOCKS) && defined(HAVE_PREAD) +#if defined(THREAD) && !defined(DONT_USE_RW_LOCKS) my_bool myisam_concurrent_insert=1; #else my_bool myisam_concurrent_insert=0; -- cgit v1.2.1