summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-07-23 15:00:53 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-07-23 15:00:53 +0300
commit9d93f9dac4d144e8b08d2ba175c10b068daf9235 (patch)
tree10bad334bb3ea4f60cfd02229741a27d57ce6400
parent739f5239f12904247d2a61f9880ea1fafbedc332 (diff)
downloadmariadb-git-9d93f9dac4d144e8b08d2ba175c10b068daf9235.tar.gz
MDEV-8827: Fix the 32-bit build
Follow-up to 07ba5560da805c766da68811692272dd9eebdaf7: Use the correct 64-bit type name ulonglong instead of ulint, like in mysql/mysql-server@4e0100d86b1b46be0107ebd46a98a0c2dbb0fab4
-rw-r--r--storage/innobase/handler/ha_innodb.cc2
-rw-r--r--storage/xtradb/handler/ha_innodb.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 5b9c9dc9123..e0a47e1a5ea 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -10476,7 +10476,7 @@ ha_innobase::get_auto_increment(
if (increment > 1 && thd_sql_command(user_thd) != SQLCOM_ALTER_TABLE
&& autoinc < col_max_value) {
- ulint prev_auto_inc = autoinc;
+ ulonglong prev_auto_inc = autoinc;
autoinc = ((autoinc - 1) + increment - offset)/ increment;
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index 18d4bd5b4d5..23e3f2fd135 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -11745,7 +11745,7 @@ ha_innobase::get_auto_increment(
if (increment > 1 && thd_sql_command(user_thd) != SQLCOM_ALTER_TABLE
&& autoinc < col_max_value) {
- ulint prev_auto_inc = autoinc;
+ ulonglong prev_auto_inc = autoinc;
autoinc = ((autoinc - 1) + increment - offset)/ increment;