diff options
author | Michael Widenius <monty@askmonty.org> | 2011-02-25 14:55:40 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-02-25 14:55:40 +0200 |
commit | 07b5d554ee62543cea0dc5bb36883446b9dcaa4a (patch) | |
tree | 78c8e57b16ab706ac478fe90a2bfa51e2cdf27e5 /mysys | |
parent | e6c45f5e1fc91e0ec0cffc97d5bcd1f77cec4de2 (diff) | |
download | mariadb-git-07b5d554ee62543cea0dc5bb36883446b9dcaa4a.tar.gz |
- maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testing
- Fixed mysql-test-run failures on window
- Fixed compiler warnings from my last push (sorry about that)
- Fixed that maria_chk --repair --extended works again
- Fixed compiler warnings about using not unitialized data
mysql-test/mysql-test-run.pl:
Better output
mysql-test/suite/parts/inc/partition_check_drop.inc:
Use remove_files_wildcard instead of rm
mysys/safemalloc.c:
Fixed argument to printf
storage/maria/ma_cache.c:
Don't give errors when running maria_chk
storage/maria/ma_dynrec.c:
Don't give errors when running maria_chk
storage/maria/ma_rt_test.c:
Added option --datadir for where to put logs and test data
storage/maria/ma_test1.c:
Added option --datadir for where to put logs and test data
storage/maria/ma_test2.c:
Added option --datadir for where to put logs and test data
storage/maria/maria_chk.c:
If --datadir is used but --logdir is not, set --logdir from --datadir
(this reflects how --help said how things should work)
storage/maria/maria_read_log.c:
Changed short option for 'maria-log-dir-path' from -l to -h to be same as mysqld, maria_chk, ma_test1 etc..
storage/maria/unittest/ma_test_all-t:
Allow one to specify --tmpdir for where to store logs and data
storage/xtradb/buf/buf0buf.c:
Fixed compiler warnings about using not unitialized data
storage/xtradb/row/row0upd.c:
Fixed compiler warnings about using not unitialized data
storage/xtradb/srv/srv0srv.c:
Fixed compiler warnings about using not unitialized data
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/safemalloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index 7067ebbe843..2a61b8edede 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -125,7 +125,7 @@ void *_mymalloc(size_t size, const char *filename, uint lineno, myf MyFlags) uchar *data; DBUG_ENTER("_mymalloc"); DBUG_PRINT("enter",("Size: %lu Total alloc: %lu", (ulong) size, - sf_malloc_cur_memory)); + (ulong) sf_malloc_cur_memory)); if (!sf_malloc_quick) (void) _sanity (filename, lineno); @@ -317,7 +317,7 @@ void _myfree(void *ptr, const char *filename, uint lineno, myf myflags) sf_malloc_cur_memory-= irem->datasize; sf_malloc_count--; pthread_mutex_unlock(&THR_LOCK_malloc); - DBUG_PRINT("info", ("bytes freed: %ld", irem->datasize)); + DBUG_PRINT("info", ("bytes freed: %ld", (ulong) irem->datasize)); #ifndef HAVE_valgrind /* Mark this data as free'ed */ |