List:Maria Storage Engine« Previous MessageNext Message »
From:Michael Widenius Date:September 5 2008 1:52pm
Subject:bzr commit into MySQL/Maria:mysql-maria branch (monty:2667)
View as plain text  
#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/

 2667 Michael Widenius	2008-09-05
      Fixed bug in underflow handling of page during delete found by running sql_bench
modified:
  storage/maria/ma_delete.c
  storage/maria/maria_chk.c

per-file messages:
  storage/maria/ma_delete.c
    Remove wrong optimization (first_key is not related to keypos value at this point)
  storage/maria/maria_chk.c
    Added printing of forgotten option
=== modified file 'storage/maria/ma_delete.c'
--- a/storage/maria/ma_delete.c	2008-08-25 11:49:47 +0000
+++ b/storage/maria/ma_delete.c	2008-09-05 13:52:21 +0000
@@ -1112,7 +1112,7 @@ static int underflow(register MARIA_HA *
     MARIA_KEY_PARAM anc_key_inserted;
     size_t tmp_length;
 
-    if (first_key)
+    if (keypos == anc_buff + share->keypage_header + key_reflength)
       anc_pos= 0;				/* First key */
     else
     {

=== modified file 'storage/maria/maria_chk.c'
--- a/storage/maria/maria_chk.c	2008-07-09 09:02:27 +0000
+++ b/storage/maria/maria_chk.c	2008-09-05 13:52:21 +0000
@@ -443,6 +443,8 @@ static void usage(void)
 #endif
                       printf(", they will be used\n\
                       in a round-robin fashion.\n\
+  --require-control-file  Abort if we can't find/read the maria_log_control\n\
+                          file\n\
   -s, --silent	      Only print errors.  One can use two -s to make\n\
 		      maria_chk very silent.\n\
   -v, --verbose       Print more information. This can be used with\n\

Thread
bzr commit into MySQL/Maria:mysql-maria branch (monty:2667) Michael Widenius5 Sep