1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changes for pushbuild test runs and VSC compile warnings

Browse Source
This commit is contained in:
antony@pcg5ppc.xiphis.org 2007-09-12 18:16:50 -07:00
parent 421d2d2a4a
commit 3d75d36e1f
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
View File

@ -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

2
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
View File

@ -1,4 +1,5 @@
--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;
--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;

1
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test
View File

@ -1,4 +1,5 @@
--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'

2
storage/innobase/handler/ha_innodb.cc
View File

@ -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; */