diff options
author | Michael Widenius <monty@askmonty.org> | 2010-10-13 18:15:43 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2010-10-13 18:15:43 +0300 |
commit | 01672cc026a60d434dc8276908517c9d4fed131d (patch) | |
tree | ef048da02ee5591649b6525d560a9c37b6e0a281 /dbug | |
parent | 236141d4f637ee993947270c74ee17a4d4311a2d (diff) | |
download | mariadb-git-01672cc026a60d434dc8276908517c9d4fed131d.tar.gz |
Fixes for bugs found by running test case for LP#608369 "Page: 1 Found wrong page type 0' on CHECK TABLE EXTENDED"
Fixed overflow when using long --debug=xxxxxx line.
Fixed that "mysqld --disable-debug --debug" works.
Ensure that MariaDB doesn't start if the Aria engine didn't start and we are using Aria for temporary tables.
More DBUG_ASSERT() and more info in debug log.
dbug/dbug.c:
Fixed crash in mysqld caused by an overflow when using long --debug=xxxxxx line
sql/mysqld.cc:
Fixed that "mysqld --disable-debug --debug" works.
Documented myisam-recover=OFF option
storage/maria/ha_maria.cc:
Ensure that MariaDB doesn't start if the Aria engine didn't start and we are using Aria for temporary tables.
storage/maria/ma_delete.c:
Added missing write of changed key on node page.
This could fix LP#608369 "Page: 1 Found wrong page type 0' on CHECK TABLE EXTENDED"
Changed so that we log page numbers (not positions)
Added KEY_OP_DEBUG_2 log entry to get more debug information into the log
storage/maria/ma_key_recover.c:
Changed so that we log page numbers (not positions)
In case of wrong page information after index_redo, dump pages to debug log
storage/maria/ma_loghandler.h:
Added KEY_OP_DEBUG_2
storage/maria/ma_search.c:
Changed so that we log page numbers (not positions)
storage/maria/ma_write.c:
Changed so that we log page numbers (not positions)
Diffstat (limited to 'dbug')
-rw-r--r-- | dbug/dbug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index cad7fbb3030..59f7f4e10c5 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -982,7 +982,7 @@ void _db_pop_() } while (0) #define str_to_buf(S) do { \ char_to_buf(','); \ - buf=strnmov(buf, (S), len+1); \ + buf=strnmov(buf, (S), (uint) (end-buf)); \ if (buf >= end) goto overflow; \ } while (0) #define list_to_buf(l, f) do { \ |