diff options
author | unknown <monty@donna.mysql.com> | 2000-09-16 04:27:21 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-09-16 04:27:21 +0300 |
commit | 19b678eefe59529761691ddebece604107dcb42b (patch) | |
tree | 6e20280a8abcc28d14385983250a3e1823639028 /mysys | |
parent | b35a18596c602e654b821ebef8e8a3147fae6dbf (diff) | |
download | mariadb-git-19b678eefe59529761691ddebece604107dcb42b.tar.gz |
Faster log::write() call, memory leak fix, flush master fix.
BUILD/compile-alpha-ccc:
remove deps to get things to compile better
Docs/manual.texi:
Small fixes
configure.in:
Fix for mlockmem()
include/my_sys.h:
Made key_cache_inited global
myisammrg/myrg_close.c:
Fixed memory leak
myisammrg/myrg_open.c:
Initialize queue to avoid memory leak bug
mysys/mf_format.c:
Added overflow check
mysys/mf_keycache.c:
Made key_cache_init more secure to use
mysys/my_static.h:
Make key_cache_inite global
sql/ChangeLog:
Changes
sql/lock.cc:
Added logging of locktime
sql/log.cc:
Added logging of locktime
sql/mysql_priv.h:
Added locked_in_memory
sql/mysqld.cc:
Added logging of locktime + locked in memory
sql/sql_acl.cc:
Added thd to log::write() for faster call
sql/sql_base.cc:
Use global key_cache variable
sql/sql_class.cc:
Added result row counting
sql/sql_class.h:
Added thd to log::write() for faster call
sql/sql_db.cc:
Added thd to log::write() for faster call
sql/sql_delete.cc:
Added thd to log::write() for faster call
sql/sql_insert.cc:
Added thd to log::write() for faster call
sql/sql_load.cc:
Added thd to log::write() for faster call
sql/sql_parse.cc:
Added thd to log::write() for faster call
sql/sql_rename.cc:
Added thd to log::write() for faster call
sql/sql_table.cc:
Added thd to log::write() for faster call
sql/sql_update.cc:
Added thd to log::write() for faster call
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/mf_format.c | 6 | ||||
-rw-r--r-- | mysys/mf_keycache.c | 3 | ||||
-rw-r--r-- | mysys/my_static.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/mysys/mf_format.c b/mysys/mf_format.c index 623f1dbd19e..39084799563 100644 --- a/mysys/mf_format.c +++ b/mysys/mf_format.c @@ -31,6 +31,7 @@ /* 8 Pack filename as short as possibly */ /* 16 Resolve symbolic links for filename */ /* 32 Resolve filename to full path */ + /* 64 Return NULL if too long path */ #ifdef MAXPATHLEN #define BUFF_LEN MAXPATHLEN @@ -80,7 +81,10 @@ my_string fn_format(my_string to, const char *name, const char *dsk, if (strlen(dev)+length+strlen(ext) >= FN_REFLEN || length >= FN_LEN ) { /* To long path, return original */ - uint tmp_length=strlength(startpos); + uint tmp_length; + if (flag & 64) + return 0; + tmp_length=strlength(startpos); DBUG_PRINT("error",("dev: '%s' ext: '%s' length: %d",dev,ext,length)); (void) strmake(to,startpos,min(tmp_length,FN_REFLEN-1)); } diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index db23c474564..72d0d4a5e10 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -85,7 +85,7 @@ int init_key_cache(ulong use_mem, if (key_cache_inited && _my_disk_blocks > 0) { - DBUG_PRINT("warning",("key cache allready in use")); /* purecov: inspected */ + DBUG_PRINT("warning",("key cache already in use")); /* purecov: inspected */ DBUG_RETURN(0); /* purecov: inspected */ } if (! key_cache_inited) @@ -161,6 +161,7 @@ void end_key_cache(void) _my_disk_blocks= -1; } } + key_cache_inited=0; DBUG_PRINT("status", ("used: %d changed: %d w_requests: %ld writes: %ld r_requests: %ld reads: %ld", _my_blocks_used,_my_blocks_changed,_my_cache_w_requests, diff --git a/mysys/my_static.h b/mysys/my_static.h index 5ab01dec9a9..e9d1a30b786 100644 --- a/mysys/my_static.h +++ b/mysys/my_static.h @@ -52,8 +52,6 @@ extern char NEAR curr_dir[FN_REFLEN],NEAR home_dir_buff[FN_REFLEN]; extern volatile int _my_signals; extern struct st_remember _my_sig_remember[MAX_SIGNALS]; -extern my_bool key_cache_inited; - extern const char *soundex_map; extern USED_MEM* my_once_root_block; |