summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <antony@pcg5ppc.xiphis.org>2007-09-12 18:16:50 -0700
committerunknown <antony@pcg5ppc.xiphis.org>2007-09-12 18:16:50 -0700
commitfa12674c09dffa3a1062ba99505ebc6902f7e5f1 (patch)
treead7aebd4326b202713f91093aca075f55e298df2 /storage
parent23227604be3835440494ecd940c47db93d443ffe (diff)
downloadmariadb-git-fa12674c09dffa3a1062ba99505ebc6902f7e5f1.tar.gz
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.
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/handler/ha_innodb.cc2
1 files changed, 1 insertions, 1 deletions
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; */