← Back to branch summary

~thomir-deactivatedaccount/drizzle/drizzle-fix-bug653747

« back to all changes in this revision

Viewing changes to storage/innobase/handler/ha_innodb.h

Merged from codestyle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.h
72
72
        int update_thd(THD* thd);
73
73
        int change_active_index(uint keynr);
74
74
        int general_fetch(uchar* buf, uint direction, uint match_mode);
75
 
        int innobase_read_and_init_auto_inc(longlong* ret);
 
75
        int innobase_read_and_init_auto_inc(int64_t* ret);
76
76
        ulong innobase_autoinc_lock();
77
 
        ulong innobase_set_max_autoinc(ulonglong auto_inc);
78
 
        ulong innobase_reset_autoinc(ulonglong auto_inc);
79
 
        ulong innobase_get_auto_increment(ulonglong* value);
 
77
        ulong innobase_set_max_autoinc(uint64_t auto_inc);
 
78
        ulong innobase_reset_autoinc(uint64_t auto_inc);
 
79
        ulong innobase_get_auto_increment(uint64_t* value);
80
80
        dict_index_t* innobase_get_index(uint keynr);
81
81
 
82
82
        /* Init values for the class: */
194
194
        THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
195
195
                                        enum thr_lock_type lock_type);
196
196
        void init_table_handle_for_HANDLER();
197
 
        virtual void get_auto_increment(ulonglong offset, ulonglong increment,
198
 
                                        ulonglong nb_desired_values,
199
 
                                        ulonglong *first_value,
200
 
                                        ulonglong *nb_reserved_values);
201
 
        int reset_auto_increment(ulonglong value);
 
197
        virtual void get_auto_increment(uint64_t offset, uint64_t increment,
 
198
                                        uint64_t nb_desired_values,
 
199
                                        uint64_t *first_value,
 
200
                                        uint64_t *nb_reserved_values);
 
201
        int reset_auto_increment(uint64_t value);
202
202
 
203
203
        virtual bool get_error_message(int error, String *buf);
204
204
 
209
209
        my_bool register_query_cache_table(THD *thd, char *table_key,
210
210
                                           uint key_length,
211
211
                                           qc_engine_callback *call_back,
212
 
                                           ulonglong *engine_data);
 
212
                                           uint64_t *engine_data);
213
213
        static char *get_mysql_bin_log_name();
214
 
        static ulonglong get_mysql_bin_log_pos();
 
214
        static uint64_t get_mysql_bin_log_pos();
215
215
        bool primary_key_is_clustered() { return true; }
216
216
        int cmp_ref(const uchar *ref1, const uchar *ref2);
217
217
        bool check_if_incompatible_data(HA_CREATE_INFO *info,
257
257
/** Get the current position of the MySQL binlog.
258
258
 * @return byte offset from the beginning of the binlog
259
259
 */
260
 
ulonglong mysql_bin_log_file_pos(void);
 
260
uint64_t mysql_bin_log_file_pos(void);
261
261
 
262
262
/**
263
263
  Check if a user thread is a replication slave thread