bzr push into mysql-5.1-innodb branch (marko.makela:3415 to 3416)

[marko.makela]

 3416 Marko Mäkelä	2010-04-26
      btr_page_split_and_insert(): Silence a compiler warning
      about possibly uninitialized variable insert_left.

    modified:
      storage/innodb_plugin/btr/btr0btr.c
 3415 Calvin Sun	2010-04-22
      mysql-5.1-innodb: add error codes to innodb_bug51920.test
      kill of active connection yields different error code
      depending on platform.

    modified:
      mysql-test/suite/innodb/r/innodb_bug51920.result
      mysql-test/suite/innodb/t/innodb_bug51920.test
      mysql-test/suite/innodb_plugin/r/innodb_bug51920.result
      mysql-test/suite/innodb_plugin/t/innodb_bug51920.test
=== modified file 'storage/innodb_plugin/btr/btr0btr.c'
--- a/storage/innodb_plugin/btr/btr0btr.c	2010-04-21 18:53:59 +0000
+++ b/storage/innodb_plugin/btr/btr0btr.c	2010-04-26 07:39:49 +0000
@@ -1932,6 +1932,7 @@ func_start:
 	/* 1. Decide the split record; split_rec == NULL means that the
 	tuple to be inserted should be the first record on the upper
 	half-page */
+	insert_left = FALSE;
 
 	if (n_iterations > 0) {
 		direction = FSP_UP;
@@ -1945,7 +1946,6 @@ func_start:
 	} else if (btr_page_get_split_rec_to_right(cursor, &split_rec)) {
 		direction = FSP_UP;
 		hint_page_no = page_no + 1;
-		insert_left = FALSE;
 
 	} else if (btr_page_get_split_rec_to_left(cursor, &split_rec)) {
 		direction = FSP_DOWN;
@@ -1968,13 +1968,9 @@ func_start:
 				page_get_infimum_rec(page));
 		} else {
 			split_rec = NULL;
-			insert_left = FALSE;
 		}
 	}
 
-	/* At this point, insert_left is initialized if split_rec == NULL
-	and may be uninitialized otherwise. */
-
 	/* 2. Allocate a new page to the index */
 	new_block = btr_page_alloc(cursor->index, hint_page_no, direction,
 				   btr_page_get_level(page, mtr), mtr);

Attachment: [text/bzr-bundle] bzr/[e-mail]