From 73fd262210c9ea27313ca203a1cb2afc1b5404ad Mon Sep 17 00:00:00 2001
From: sunny <Unknown>
Date: Sat, 8 Sep 2007 20:40:10 +0000
Subject: [PATCH] Fix two bugs:

Bug# 30907: We don't rely on *first_value to be 0 when checking whether
get_auto_increment() has been invoked for the first time in a multi-row
INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
inside ha_innobase::start_stmt() too.

Bug# 30888: While adding code for the low level read of the AUTOINC value
from the index, the case for MEDIUM ints which are 3 bytes was missed
triggering an assertion.
---
 handler/ha_innodb.cc | 43 ++++++++++++++++++++++---------------------
 row/row0sel.c        |  5 +++++
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/handler/ha_innodb.cc b/handler/ha_innodb.cc
index db7edf2af85..f0749af5b84 100644
--- a/handler/ha_innodb.cc
+++ b/handler/ha_innodb.cc
@@ -6314,6 +6314,9 @@ ha_innobase::start_stmt(
 
 	innobase_release_stat_resources(trx);
 
+	/* Reset the AUTOINC statement level counter for multi-row INSERTs. */
+	trx->n_autoinc_rows = 0;
+
 	prebuilt->sql_stat_start = TRUE;
 	prebuilt->hint_need_to_fetch_extra_cols = 0;
 	reset_template(prebuilt);
@@ -7291,6 +7294,7 @@ ha_innobase::get_auto_increment(
         ulonglong	*first_value,        /* out: the autoinc value */
         ulonglong	*nb_reserved_values) /* out: count of reserved values */
 {
+	trx_t*		trx;
 	ulint		error;
 	ulonglong	autoinc = 0;
 
@@ -7317,37 +7321,34 @@ ha_innobase::get_auto_increment(
 	this method for the same statement results in different values which
 	don't make sense. Therefore we store the value the first time we are
 	called and count down from that as rows are written (see write_row()).
+	*/
 
-	We make one exception, if the *first_value is precomputed by MySQL
-	we use that value. And set the number of reserved values to 1 if
-	this is the first time we were called for the SQL statement, this
-	will force MySQL to call us for the next value. If we are in the
-	middle of a multi-row insert we preserve the existing counter.*/
-	if (*first_value == 0) {
+	trx = prebuilt->trx;
 
-		/* Called for the first time ? */
-		if (prebuilt->trx->n_autoinc_rows == 0) {
+	/* Note: We can't rely on *first_value since some MySQL engines,
+	in particular the partition engine, don't initialize it to 0 when
+	invoking this method. So we are not sure if it's guaranteed to
+	be 0 or not. */
 
-			prebuilt->trx->n_autoinc_rows = nb_desired_values;
+	/* Called for the first time ? */
+	if (trx->n_autoinc_rows == 0) {
 
-			/* It's possible for nb_desired_values to be 0:
-			e.g., INSERT INTO T1(C) SELECT C FROM T2; */
-			if (nb_desired_values == 0) {
+		trx->n_autoinc_rows = nb_desired_values;
 
-				++prebuilt->trx->n_autoinc_rows;
-			}
+		/* It's possible for nb_desired_values to be 0:
+		e.g., INSERT INTO T1(C) SELECT C FROM T2; */
+		if (nb_desired_values == 0) {
+
+			trx->n_autoinc_rows = 1;
 		}
 
 		*first_value = autoinc;
-
-	} else if (prebuilt->trx->n_autoinc_rows == 0) {
-
-		prebuilt->trx->n_autoinc_rows = 1;
+	/* Not in the middle of a mult-row INSERT. */
+	} else if (prebuilt->last_value == 0) {
+		*first_value = autoinc;
 	}
 
-	ut_a(prebuilt->trx->n_autoinc_rows > 0);
-
-	*nb_reserved_values = prebuilt->trx->n_autoinc_rows;
+	*nb_reserved_values = trx->n_autoinc_rows;
 
 	/* With old style AUTOINC locking we only update the table's
 	AUTOINC counter after attempting to insert the row. */
diff --git a/row/row0sel.c b/row/row0sel.c
index 2d1b3f1ac1c..f423b1a4cbc 100644
--- a/row/row0sel.c
+++ b/row/row0sel.c
@@ -4572,6 +4572,11 @@ row_search_autoinc_read_column(
 		value = *(ib_uint32_t*) dest;
 		break;
 
+	case 3:
+		value = *(ib_uint32_t*) dest;
+		value &= 0xFFFFFF;
+		break;
+
 	case 2:
 		value = *(uint16 *) dest;
 		break;