diff options
| author | aivanov@mysql.com <> | 2006-01-31 21:41:48 +0300 |
|---|---|---|
| committer | aivanov@mysql.com <> | 2006-01-31 21:41:48 +0300 |
| commit | 9296fb241d50199a60df7d9a0e93ac730432b82c (patch) | |
| tree | 9e475e84c7ce72ff8bc4402d9ee012a703984545 /sql/ha_innodb.h | |
| parent | 10036d354c7aaa2b6d137081fb780fe351387702 (diff) | |
| download | mariadb-git-9296fb241d50199a60df7d9a0e93ac730432b82c.tar.gz | |
Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582.
Applied innodb-5.0-ss149/162 snapshots.
Diffstat (limited to 'sql/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index aa8506abe6d..fb93b2abb0e 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -52,7 +52,6 @@ class ha_innobase: public handler THR_LOCK_DATA lock; INNOBASE_SHARE *share; - gptr alloc_ptr; byte* upd_buff; /* buffer used in updates */ byte* key_val_buff; /* buffer used in converting search key values from MySQL format @@ -62,7 +61,6 @@ class ha_innobase: public handler two buffers */ ulong int_table_flags; uint primary_key; - uint last_dup_key; ulong start_of_scan; /* this is set to 1 when we are starting a table scan but have not yet fetched any row, else 0 */ @@ -70,7 +68,6 @@ class ha_innobase: public handler ROW_SEL_EXACT, ROW_SEL_EXACT_PREFIX, or undefined */ uint num_write_row; /* number of write_row() calls */ - ulong max_supported_row_length(const byte *buf); uint store_key_val_for_row(uint keynr, char* buff, uint buff_len, const byte* record); @@ -199,11 +196,8 @@ class ha_innobase: public handler }; extern struct show_var_st innodb_status_variables[]; -extern uint innobase_init_flags, innobase_lock_type; -extern ulong innobase_cache_size, innobase_fast_shutdown; +extern ulong innobase_fast_shutdown; extern ulong innobase_large_page_size; -extern char *innobase_home, *innobase_tmpdir, *innobase_logdir; -extern long innobase_lock_scan_time; extern long innobase_mirrored_log_groups, innobase_log_files_in_group; extern longlong innobase_buffer_pool_size, innobase_log_file_size; extern long innobase_log_buffer_size; @@ -240,8 +234,6 @@ extern ulong srv_commit_concurrency; extern ulong srv_flush_log_at_trx_commit; } -extern TYPELIB innobase_lock_typelib; - bool innobase_init(void); bool innobase_end(void); bool innobase_flush_logs(void); @@ -311,9 +303,6 @@ int innobase_rollback_by_xid( XID *xid); /* in : X/Open XA Transaction Identification */ -int innobase_xa_end(THD *thd); - - int innobase_repl_report_sent_binlog(THD *thd, char *log_file_name, my_off_t end_offset); |