diff options
| author | monty@hundin.mysql.fi <> | 2001-11-29 21:46:51 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-11-29 21:46:51 +0200 |
| commit | ce7a0a029364b688d84ef9860a39b0e89abbc001 (patch) | |
| tree | ca1de5e435dc38ba3f7f3b2ae2fb610b292baef0 /mysys | |
| parent | 7c3f8447c0972fce278ad92302f28af8ce2dee84 (diff) | |
| download | mariadb-git-ce7a0a029364b688d84ef9860a39b0e89abbc001.tar.gz | |
Fix not critical MyISAM bug in locking.
Free character sets properly (for embedded).
Add missing mutex in HANDLER CLOSE
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 2 | ||||
| -rw-r--r-- | mysys/my_seek.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index f39b3f0ed6d..87121f35bb3 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -125,6 +125,7 @@ void my_end(int infoflag) DBUG_PRINT("error",("%s",errbuff[0])); } } + free_charsets(); if (infoflag & MY_GIVE_INFO || info_file != stderr) { #ifdef HAVE_GETRUSAGE @@ -149,7 +150,6 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", #if defined(MSDOS) && !defined(__WIN__) fprintf(info_file,"\nRun time: %.1f\n",(double) clock()/CLOCKS_PER_SEC); #endif - free_charsets(); #if defined(SAFEMALLOC) TERMINATE(stderr); /* Give statistic on screen */ #elif defined(__WIN__) && defined(_MSC_VER) diff --git a/mysys/my_seek.c b/mysys/my_seek.c index 87da4d93cb7..5ee094c1be4 100644 --- a/mysys/my_seek.c +++ b/mysys/my_seek.c @@ -35,7 +35,7 @@ my_off_t my_seek(File fd, my_off_t pos, int whence, DBUG_PRINT("error",("lseek: %lu, errno: %d",newpos,errno)); DBUG_RETURN(MY_FILEPOS_ERROR); } - if (newpos != pos) + if ((my_off_t) newpos != pos) { DBUG_PRINT("exit",("pos: %lu", (ulong) newpos)); } |