diff options
| author | unknown <guilhem@gbichot4.local> | 2008-01-31 23:17:50 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2008-01-31 23:17:50 +0100 |
| commit | 7323df7885e9c50b4e6e7f4cc7251a845cad9630 (patch) | |
| tree | 2ca222e8dc5eac134bbd01fe93db02ddc4a9d75c /mysys/my_read.c | |
| parent | 8c5cd4f89d165665e8b6cebd2161c41d5ce6a77e (diff) | |
| download | mariadb-git-7323df7885e9c50b4e6e7f4cc7251a845cad9630.tar.gz | |
Minor changes. New description in SHOW ENGINES for Maria.
Test for BUG#34106 "auto_increment is reset to 1 when table is recovered from crash"
(fixed by Monty yesterday)
mysql-test/r/maria-recovery.result:
result, which is correct (before pulling Monty's fix for BUG#34106,
we got a warning about auto_increment in CHECK TABLE (done in
maria-verify-recovery.inc), no AUTO_INCREMENT clause in
SHOW CREATE TABLE, and a failure of the last INSERT.
mysql-test/r/maria.result:
result
mysql-test/t/maria-recovery.test:
Test for BUG#34106
mysql-test/t/maria.test:
look at what is reported in SHOW ENGINES
mysys/my_pread.c:
changed my mind: if Count argument is >4GB, we'll surely see a segfault
in the pread() call when it tries to read 4GB from memory, so no need
to print it in ulonglong format (saves a function call).
mysys/my_read.c:
changed my mind: if Count argument is >4GB, we'll surely see a segfault
in the pread() call when it tries to read 4GB from memory, so no need
to print it in ulonglong format (saves a function call).
mysys/my_write.c:
changed my mind: if Count argument is >4GB, we'll surely see a segfault
in the pread() call when it tries to read 4GB from memory, so no need
to print it in ulonglong format (saves a function call).
storage/maria/ha_maria.cc:
Description representing the current reality. This can be changed later
storage/maria/ma_page.c:
When reading the new key_del from a page on disk, if there is a bug
(like BUG#34062) this key_del could be wrong, we try to catch if it's
out of the key file.
storage/maria/ma_pagecache.c:
- no truncation of page's number in DBUG_PRINT (useful for BUG#34062)
- page_korr instead of uint5korr
storage/maria/ma_recovery.c:
page_korr instead of uint5korr
storage/maria/plug.in:
Description representing the current reality. This can be changed later.
Diffstat (limited to 'mysys/my_read.c')
| -rw-r--r-- | mysys/my_read.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mysys/my_read.c b/mysys/my_read.c index 64f2cf42b4c..375e0acc144 100644 --- a/mysys/my_read.c +++ b/mysys/my_read.c @@ -16,7 +16,6 @@ #include "mysys_priv.h" #include "mysys_err.h" #include <my_base.h> -#include <m_string.h> #include <errno.h> /* @@ -37,12 +36,9 @@ size_t my_read(File Filedes, uchar *Buffer, size_t Count, myf MyFlags) { size_t readbytes, save_count; -#ifndef DBUG_OFF - char llbuf[22]; DBUG_ENTER("my_read"); - DBUG_PRINT("my",("fd: %d Buffer: 0x%lx Count: %s MyFlags: %d", - Filedes, (long) Buffer, ullstr(Count, llbuf), MyFlags)); -#endif + DBUG_PRINT("my",("fd: %d Buffer: 0x%lx Count: %lu MyFlags: %d", + Filedes, (long) Buffer, (ulong) Count, MyFlags)); save_count= Count; for (;;) |