diff options
author | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-11 01:47:52 +0200 |
---|---|---|
committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-11 01:47:52 +0200 |
commit | 266fde77b283237fa2dd6db0f97fb68289fe0c21 (patch) | |
tree | 168dfb22329c2c89f90b021e60d0462b5a739d2d /mysys/my_uuid.c | |
parent | 674f0198c3c099a2e9ea899b46d9592d8844d499 (diff) | |
download | mariadb-git-266fde77b283237fa2dd6db0f97fb68289fe0c21.tar.gz |
Added --loose-skip-maria to MYSQLD_BOOTSTRAP_CMD to get bootstrap.test to work
Allow one to run bootstrap even if --skip-maria is used (needed for bootstrap.test)
Fixed lots of compiler warnings
NOTE:
maria-big and maria-recover tests failes becasue of bugs in transaction log handling.
Sanja knows about this and is working on it!
mysql-test/mysql-test-run.pl:
Added --loose-skip-maria to MYSQLD_BOOTSTRAP_CMD to get bootstrap.test to work
mysql-test/r/maria-recovery.result:
Updated results
mysql-test/t/bootstrap.test:
Removed not needed empty line
mysql-test/t/change_user.test:
Fixed results for 32 bit systems
mysql-test/t/maria-big.test:
Only run this when you use --big
mysql-test/t/maria-recovery.test:
Added test case for recovery with big blobs
mysys/my_uuid.c:
Fixed compiler warning
sql/mysqld.cc:
Allow one to run bootstrap even if --skip-maria is used (needed for bootstrap.test)
sql/set_var.cc:
Compare max_join_size with ULONG_MAX instead of HA_POS_ERROR as we set max_join_size to ULONG_MAX by default
storage/maria/ma_bitmap.c:
Added __attribute((unused)) to fix compiler warning
storage/maria/ma_blockrec.c:
Added casts to remove compiler warnings
Change variable types to avoid compiler warnings
storage/maria/ma_check.c:
Added casts to remove compiler warnings
storage/maria/ma_checkpoint.c:
Change variable types to avoid compiler warnings
storage/maria/ma_create.c:
Change variable types to avoid compiler warnings
storage/maria/ma_delete.c:
Added casts to remove compiler warnings
storage/maria/ma_key_recover.c:
Added casts to remove compiler warnings
storage/maria/ma_loghandler.c:
Moved initiazation of prev_buffer first as this could otherwise not be set in case of errors
storage/maria/ma_page.c:
Added casts to remove compiler warnings
storage/maria/ma_pagecache.c:
Added __attribute((unused)) to fix compiler warning
storage/maria/ma_pagecrc.c:
Added #ifndef DBUG_OFF to remove compiler warning
storage/maria/ma_recovery.c:
Added casts to remove compiler warnings
storage/maria/ma_write.c:
Added casts to remove compiler warnings
storage/maria/maria_chk.c:
Split long string into two to avoid compiler warnings
storage/myisam/ft_boolean_search.c:
Added LINT_INIT() to remove compiler warning
support-files/compiler_warnings.supp:
Suppress wrong compiler warning
unittest/mytap/tap.c:
Fixed declaration to match prototypes to remove compiler warnings
Diffstat (limited to 'mysys/my_uuid.c')
-rw-r--r-- | mysys/my_uuid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_uuid.c b/mysys/my_uuid.c index 1ebc394cafa..d6a4946954a 100644 --- a/mysys/my_uuid.c +++ b/mysys/my_uuid.c @@ -106,7 +106,7 @@ void my_uuid_init(ulong seed1, ulong seed2) randominit() here. */ /* purecov: begin inspected */ - my_rnd_init(&uuid_rand, (ulong) (seed2+ now/2), now+rand()); + my_rnd_init(&uuid_rand, (ulong) (seed2+ now/2), (ulong) (now+rand())); for (i=0; i < sizeof(mac); i++) mac[i]= (uchar)(my_rnd(&uuid_rand)*255); /* purecov: end */ |