Commit 2e935591 authored by sunny's avatar sunny

branches/zip: Fix the handler class method return type. Change ulong to ulint

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