From 3d75d36e1f695af0144c157463b1693a004f4b53 Mon Sep 17 00:00:00 2001
From: "antony@pcg5ppc.xiphis.org" <>
Date: Wed, 12 Sep 2007 18:16:50 -0700
Subject: [PATCH] Changes for pushbuild test runs and VSC compile warnings

---
 mysql-test/suite/rpl/r/rpl_innodb_bug28430.result | 2 +-
 mysql-test/suite/rpl/t/rpl_innodb_bug28430.test   | 2 ++
 mysql-test/suite/rpl/t/rpl_innodb_bug30888.test   | 1 +
 storage/innobase/handler/ha_innodb.cc             | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
index 1d92a729059..c0f8416a12e 100644
--- a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
+++ b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
@@ -118,7 +118,7 @@ show slave status;
 Slave_IO_State	Waiting for master to send event
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	12000
+Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
 Read_Master_Log_Pos	945470
diff --git a/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test b/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
index 10e4ed33321..054668e45ef 100644
--- a/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/master-slave.inc
 
 # Set the default connection to 'master'
@@ -134,6 +135,7 @@ SELECT count(*) as "Master byrange" FROM test.byrange_tbl;
 --sync_slave_with_master
 connection slave;
 show create table test.byrange_tbl;
+--replace_column 4 MASTER_PORT
 show slave status;
 SELECT count(*) "Slave norm" FROM test.regular_tbl;
 SELECT count(*) "Slave bykey" FROM test.bykey_tbl;
diff --git a/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test b/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test
index 617888aedb7..4311328b064 100644
--- a/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/master-slave.inc
 
 # Set the default connection to 'master'
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 494f6ff233b..ce9dcb20e7d 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -7314,7 +7314,7 @@ ha_innobase::get_auto_increment(
 	/* Called for the first time ? */
 	if (trx->n_autoinc_rows == 0) {
 
-		trx->n_autoinc_rows = nb_desired_values;
+		trx->n_autoinc_rows = (ulint) nb_desired_values;
 
 		/* It's possible for nb_desired_values to be 0:
 		e.g., INSERT INTO T1(C) SELECT C FROM T2; */