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 | 5a2419eb89d2f617e94ebef64ffbef72417ec94c (patch) | |
tree | 9809b1ec91af01ed8cc76e542fe1a102e239d9b1 /mysys/mf_format.c | |
parent | 5a4aa474d879ac9598941665bef6f0938efc91e1 (diff) | |
download | mariadb-git-5a2419eb89d2f617e94ebef64ffbef72417ec94c.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 'mysys/mf_format.c')
-rw-r--r-- | mysys/mf_format.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/mf_format.c b/mysys/mf_format.c index 39084799563..0d7bb7b9d9f 100644 --- a/mysys/mf_format.c +++ b/mysys/mf_format.c @@ -95,13 +95,14 @@ my_string fn_format(my_string to, const char *name, const char *dsk, bmove(buff,(char*) name,length); /* Save name for last copy */ name=buff; } - (void) strmov(strnmov(strmov(to,dev),name,length),ext); + pos=strnmov(strmov(to,dev),name,length); #ifdef FN_UPPER_CASE caseup_str(to); #endif #ifdef FN_LOWER_CASE casedn_str(to); #endif + (void) strmov(pos,ext); /* Don't convert extension */ } /* Purify gives a lot of UMR errors when using realpath */ #if defined(HAVE_REALPATH) && !defined(HAVE_purify) |