diff --git a/handler/ha_innodb.cc b/handler/ha_innodb.cc index d7b8133373a54ca698116caaa87018ab4c44ba06..7388f5af9db44ddb30e6f9ffe03ce403459c0455 100644 --- a/handler/ha_innodb.cc +++ b/handler/ha_innodb.cc @@ -2799,7 +2799,7 @@ normalize_table_name( Set the autoinc column max value. This should only be called once from ha_innobase::open(). Therefore there's no need for a covering lock. */ -ulong +ulint ha_innobase::innobase_initialize_autoinc() /*======================================*/ { @@ -3921,7 +3921,7 @@ INSERT ... SELECT type of statements, since MySQL binlog only stores the min value of the autoinc interval. Once that is fixed we can get rid of the special lock handling.*/ UNIV_INTERN -ulong +ulint ha_innobase::innobase_lock_autoinc(void) /*====================================*/ /* out: DB_SUCCESS if all OK else @@ -3978,7 +3978,7 @@ ha_innobase::innobase_lock_autoinc(void) /************************************************************************ Reset the autoinc value in the table.*/ UNIV_INTERN -ulong +ulint ha_innobase::innobase_reset_autoinc( /*================================*/ /* out: DB_SUCCESS if all went well @@ -4003,7 +4003,7 @@ ha_innobase::innobase_reset_autoinc( Store the autoinc value in the table. The autoinc value is only set if it's greater than the existing autoinc value in the table.*/ UNIV_INTERN -ulong +ulint ha_innobase::innobase_set_max_autoinc( /*==================================*/ /* out: DB_SUCCES if all went well @@ -8353,7 +8353,7 @@ Read the next autoinc value. Acquire the relevant locks before reading the AUTOINC value. If SUCCESS then the table AUTOINC mutex will be locked on return and all relevant locks acquired. */ UNIV_INTERN -ulong +ulint ha_innobase::innobase_get_autoinc( /*==============================*/ /* out: DB_SUCCESS or error code */ diff --git a/handler/ha_innodb.h b/handler/ha_innodb.h index 8db6dd820760b5ca9354f5da810ed9a995b1f2de..1a73ea3f53377d95f5ea7ad94cc5479d27d563c0 100644 --- a/handler/ha_innodb.h +++ b/handler/ha_innodb.h @@ -73,13 +73,13 @@ class ha_innobase: public handler void update_thd(); int change_active_index(uint keynr); int general_fetch(uchar* buf, uint direction, uint match_mode); - ulong innobase_lock_autoinc(); + ulint innobase_lock_autoinc(); ulonglong innobase_peek_autoinc(); - ulong innobase_set_max_autoinc(ulonglong auto_inc); - ulong innobase_reset_autoinc(ulonglong auto_inc); - ulong innobase_get_autoinc(ulonglong* value); - ulong innobase_update_autoinc(ulonglong auto_inc); - ulong innobase_initialize_autoinc(); + ulint innobase_set_max_autoinc(ulonglong auto_inc); + ulint innobase_reset_autoinc(ulonglong auto_inc); + ulint innobase_get_autoinc(ulonglong* value); + ulint innobase_update_autoinc(ulonglong auto_inc); + ulint innobase_initialize_autoinc(); dict_index_t* innobase_get_index(uint keynr); ulonglong innobase_get_int_col_max_value(const Field* field);