diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-12 13:16:55 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-12 13:16:55 +0200 |
| commit | 978f3e3c3b2646a1f5328dffdb342c739a80b169 (patch) | |
| tree | 6a941607536091e967bfaf7487e16803c7826d95 /storage/maria/ma_loghandler.c | |
| parent | e689fbc4582de1b5f81cb69d98f5fe54b7064db1 (diff) | |
| download | mariadb-git-978f3e3c3b2646a1f5328dffdb342c739a80b169.tar.gz | |
Fixes to bugs and compiler warnings detected by pushbuild
Don't compare uuid's on maria_open() if table is not transactional
Fixed that my_microtime() works on windows (patch added from 5.1)
mysql-test/r/create.result:
Portability fix
mysql-test/t/create.test:
Portability fix
mysql-test/t/maria.test:
Remove warnings, to make test portable to windows
mysys/my_getsystime.c:
Add missed merge from 5.1
This fixes that timing works on windows and fixes that that failed becasuse slow_query_log didn't get any queries
storage/maria/ma_check.c:
Removed not needed setting of variable
storage/maria/ma_loghandler.c:
Fixed compiler warnings
storage/maria/ma_open.c:
Don't compare uuid's if table is not transactional
KNOWN_BUGS.txt:
New BitKeeper file ``KNOWN_BUGS.txt''
Diffstat (limited to 'storage/maria/ma_loghandler.c')
| -rw-r--r-- | storage/maria/ma_loghandler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 5b91ca9fa4a..090202ffebb 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -2235,7 +2235,7 @@ static uint16 translog_get_total_chunk_length(uchar *page, uint16 offset) DBUG_PRINT("info", ("TRANSLOG_CHUNK_LSN")); rec_len= translog_variable_record_1group_decode_len(&ptr); chunk_len= uint2korr(ptr); - header_len= (ptr -start) + 2; + header_len= (uint16) (ptr -start) + 2; DBUG_PRINT("info", ("rec len: %lu chunk len: %u header len: %u", (ulong) rec_len, (uint) chunk_len, (uint) header_len)); if (chunk_len) @@ -2998,7 +2998,7 @@ static uint16 translog_get_chunk_header_length(uchar *chunk) DBUG_PRINT("info", ("TRANSLOG_CHUNK_LSN")); rec_len= translog_variable_record_1group_decode_len(&ptr); chunk_len= uint2korr(ptr); - header_len= (ptr - start) +2; + header_len= (uint16) (ptr - start) +2; DBUG_PRINT("info", ("rec len: %lu chunk len: %u header len: %u", (ulong) rec_len, (uint) chunk_len, (uint) header_len)); if (chunk_len) |