Commit fa12674c authored by unknown's avatar unknown

Changes for pushbuild test runs and VSC compile warnings


mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  Fix test results for pushbuild
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
  Fix test results for pushbuild
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
  Fix test results for pushbuild
storage/innobase/handler/ha_innodb.cc:
  resolve a VSC++ typecast compile warning.
parent 23227604
...@@ -118,7 +118,7 @@ show slave status; ...@@ -118,7 +118,7 @@ show slave status;
Slave_IO_State Waiting for master to send event Slave_IO_State Waiting for master to send event
Master_Host 127.0.0.1 Master_Host 127.0.0.1
Master_User root Master_User root
Master_Port 12000 Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 945470 Read_Master_Log_Pos 945470
......
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_binlog_format_mixed_or_row.inc
--source include/master-slave.inc --source include/master-slave.inc
# Set the default connection to 'master' # Set the default connection to 'master'
...@@ -134,6 +135,7 @@ SELECT count(*) as "Master byrange" FROM test.byrange_tbl; ...@@ -134,6 +135,7 @@ SELECT count(*) as "Master byrange" FROM test.byrange_tbl;
--sync_slave_with_master --sync_slave_with_master
connection slave; connection slave;
show create table test.byrange_tbl; show create table test.byrange_tbl;
--replace_column 4 MASTER_PORT
show slave status; show slave status;
SELECT count(*) "Slave norm" FROM test.regular_tbl; SELECT count(*) "Slave norm" FROM test.regular_tbl;
SELECT count(*) "Slave bykey" FROM test.bykey_tbl; SELECT count(*) "Slave bykey" FROM test.bykey_tbl;
......
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_binlog_format_mixed_or_row.inc
--source include/master-slave.inc --source include/master-slave.inc
# Set the default connection to 'master' # Set the default connection to 'master'
......
...@@ -7314,7 +7314,7 @@ ha_innobase::get_auto_increment( ...@@ -7314,7 +7314,7 @@ ha_innobase::get_auto_increment(
/* Called for the first time ? */ /* Called for the first time ? */
if (trx->n_autoinc_rows == 0) { 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: /* It's possible for nb_desired_values to be 0:
e.g., INSERT INTO T1(C) SELECT C FROM T2; */ e.g., INSERT INTO T1(C) SELECT C FROM T2; */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment