← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

trunk merge plus more pbms updates for drizzle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.h
85
85
        UNIV_INTERN uint store_key_val_for_row(uint keynr, char* buff, 
86
86
                                   uint buff_len, const unsigned char* record);
87
87
        UNIV_INTERN void update_session(Session* session);
88
 
        UNIV_INTERN void update_session();
89
88
        UNIV_INTERN int change_active_index(uint32_t keynr);
90
89
        UNIV_INTERN int general_fetch(unsigned char* buf, uint32_t direction, uint32_t match_mode);
91
90
        UNIV_INTERN ulint innobase_lock_autoinc();
188
187
        UNIV_INTERN int cmp_ref(const unsigned char *ref1, const unsigned char *ref2);
189
188
        /** Fast index creation (smart ALTER TABLE) @see handler0alter.cc @{ */
190
189
        // Don't use these, I have just left them in here as reference for
191
 
        // the future. -Brian
192
 
        UNIV_INTERN int add_index(TABLE *table_arg, KeyInfo *key_info, uint num_of_keys);
193
 
        UNIV_INTERN int prepare_drop_index(TABLE *table_arg, uint *key_num,
 
190
        // the future. -Brian 
 
191
#if 0
 
192
        UNIV_INTERN int add_index(Session *session, TABLE *table_arg, KeyInfo *key_info, uint num_of_keys);
 
193
        UNIV_INTERN int prepare_drop_index(Session *session,
 
194
                                           TABLE *table_arg,
 
195
                                           uint *key_num,
194
196
                                           uint num_of_keys);
195
 
        UNIV_INTERN int final_drop_index(TABLE *table_arg);
 
197
        UNIV_INTERN int final_drop_index(Session *session, TABLE *table_arg);
 
198
#endif
196
199
        /** @} */
197
200
public:
198
201
  int read_range_first(const key_range *start_key, const key_range *end_key,