summaryrefslogtreecommitdiff
path: root/sql/ha_innodb.h
diff options
context:
space:
mode:
authorunknown <grog@mysql.com[grog]>2006-04-13 17:20:33 +0930
committerunknown <grog@mysql.com[grog]>2006-04-13 17:20:33 +0930
commitce33555014b52d43b1f6911b24abf6ac0da62550 (patch)
treeca3d3c0b551ab1d63e23423e71cec1cb2cd2be30 /sql/ha_innodb.h
parentc16b9dfcaa9928be8419ce16cbfba0efc8d1bfe4 (diff)
downloadmariadb-git-ce33555014b52d43b1f6911b24abf6ac0da62550.tar.gz
foo1
sql/ha_innodb.cc: Import patch foo1 sql/ha_innodb.h: Import patch foo1 sql/handler.cc: Import patch foo1 sql/handler.h: Import patch foo1 sql/mysqld.cc: Import patch foo1 sql/set_var.cc: Import patch foo1 sql/sql_class.h: Import patch foo1 sql/sql_repl.cc: Import patch foo1
Diffstat (limited to 'sql/ha_innodb.h')
-rw-r--r--sql/ha_innodb.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
index fb93b2abb0e..7ab252f97dd 100644
--- a/sql/ha_innodb.h
+++ b/sql/ha_innodb.h
@@ -165,15 +165,15 @@ class ha_innobase: public handler
int get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list);
bool can_switch_engines();
uint referenced_by_foreign_key();
- void free_foreign_key_create_info(char* str);
+ void free_foreign_key_create_info(char* str);
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
enum thr_lock_type lock_type);
- void init_table_handle_for_HANDLER();
+ void init_table_handle_for_HANDLER();
ulonglong get_auto_increment();
int reset_auto_increment(ulonglong value);
virtual bool get_error_message(int error, String *buf);
-
+
uint8 table_cache_type() { return HA_CACHE_TBL_ASKTRANSACT; }
/*
ask handler about permission to cache table during query registration
@@ -280,7 +280,7 @@ This function is used to recover X/Open XA distributed transactions */
int innobase_xa_recover(
/*====================*/
- /* out: number of prepared transactions
+ /* out: number of prepared transactions
stored in xid_list */
XID* xid_list, /* in/out: prepared transactions */
uint len); /* in: number of slots in xid_list */
@@ -309,7 +309,7 @@ int innobase_repl_report_sent_binlog(THD *thd, char *log_file_name,
/***********************************************************************
Create a consistent view for a cursor based on current transaction
which is created if the corresponding MySQL thread still lacks one.
-This consistent view is then used inside of MySQL when accessing records
+This consistent view is then used inside of MySQL when accessing records
using a cursor. */
void*
@@ -319,7 +319,7 @@ innobase_create_cursor_view(void);
/***********************************************************************
Close the given consistent cursor view of a transaction and restore
-global read view to a transaction read view. Transaction is created if the
+global read view to a transaction read view. Transaction is created if the
corresponding MySQL thread still lacks one. */
void
@@ -328,8 +328,8 @@ innobase_close_cursor_view(
void* curview); /* in: Consistent read view to be closed */
/***********************************************************************
-Set the given consistent cursor view to a transaction which is created
-if the corresponding MySQL thread still lacks one. If the given
+Set the given consistent cursor view to a transaction which is created
+if the corresponding MySQL thread still lacks one. If the given
consistent cursor view is NULL global read view of a transaction is
restored to a transaction read view. */