summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorserg@sergbook.mysql.com <>2002-08-12 15:11:58 +0200
committerserg@sergbook.mysql.com <>2002-08-12 15:11:58 +0200
commitefe85086c6648b426d58eaae069c640a0f7e18c4 (patch)
tree38fc18efc8699b1e8515c0d6c7b9d672ade0aa0a /sql
parentce61cb54c84a6c101fa917aeffacbcf251874250 (diff)
downloadmariadb-git-efe85086c6648b426d58eaae069c640a0f7e18c4.tar.gz
undo InnoDB HANDLER patch as it should not go into 3.23 tree
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_innobase.cc55
-rw-r--r--sql/ha_innobase.h1
2 files changed, 0 insertions, 56 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index 69d539fc061..878f8855b07 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -398,61 +398,6 @@ ha_innobase::update_thd(
return(0);
}
-/*********************************************************************
-Call this when you have opened a new table handle in HANDLER, before you
-call index_read_idx() etc. Actually, we can let the cursor stay open even
-over a transaction commit! Then you should call this before every operation,
-fecth next etc. This function inits the necessary things even after a
-transaction commit. */
-
-/* TODO: THIS CODE HAS NOT BEEN TESTED!!! */
-
-void
-ha_innobase::init_table_handle_for_HANDLER(void)
-/*============================================*/
-{
- row_prebuilt_t* prebuilt;
-
- /* If current thd does not yet have a trx struct, create one.
- If the current handle does not yet have a prebuilt struct, create
- one. Update the trx pointers in the prebuilt struct. Normally
- this operation is done in external_lock. */
-
- update_thd(current_thd);
-
- /* Initialize the prebuilt struct much like it would be inited in
- external_lock */
-
- prebuilt = (row_prebuilt_t*)innobase_prebuilt;
-
- /* If the transaction is not started yet, start it */
-
- trx_start_if_not_started_noninline(prebuilt->trx);
-
- /* Assign a read view if the transaction does not have it yet */
-
- trx_assign_read_view(prebuilt->trx);
-
- /* We did the necessary inits in this function, no need to repeat them
- in row_search_for_mysql */
-
- prebuilt->sql_stat_start = FALSE;
-
- /* We let HANDLER always to do the reads as consistent reads, even
- if the trx isolation level would have been specified as SERIALIZABLE */
-
- prebuilt->select_lock_type = LOCK_NONE;
-
- /* Always fetch all columns in the index record */
-
- prebuilt->hint_no_need_to_fetch_extra_cols = FALSE;
-
- /* We want always to fetch all columns in the whole row? Or do
- we???? */
-
- prebuilt->read_just_key = FALSE;
-}
-
/*************************************************************************
Opens an InnoDB database. */
diff --git a/sql/ha_innobase.h b/sql/ha_innobase.h
index 2c69018ed38..abb6ade79f7 100644
--- a/sql/ha_innobase.h
+++ b/sql/ha_innobase.h
@@ -157,7 +157,6 @@ class ha_innobase: public handler
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(); /* TODO: NOT TESTED!!! */
longlong get_auto_increment();
};