merge with 3.23.52

BitKeeper/etc/config:
  Auto merged
Docs/manual.texi:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged

2 files changed, 11 insertions, 4 deletions

diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index eaf09325124..ae787789a81 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -259,7 +259,7 @@ convert_error_code_to_mysql(
 extern "C" {
 /*****************************************************************
 Prints info of a THD object (== user session thread) to the
-standard output. NOTE that mysql/innobase/trx/trx0trx.c must contain
+standard output. NOTE that /mysql/innobase/trx/trx0trx.c must contain
 the prototype for this function! */
 
 void
@@ -404,6 +404,9 @@ ha_innobase::update_thd(
 	return(0);
 }
 
+#ifdef notdefined
+/* The code here appears for documentational purposes only. Not used
+or tested yet. Will be used in 4.1. */
 /*********************************************************************
 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
@@ -411,14 +414,15 @@ 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;
 
+	ut_a(0); /* the code has not been used or tested yet; to prevent
+		  inadvertent usage we assert an error here */
+
         /* 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
@@ -458,6 +462,7 @@ ha_innobase::init_table_handle_for_HANDLER(void)
 
         prebuilt->read_just_key = FALSE;
 }
+#endif
 
 /*************************************************************************
 Opens an InnoDB database. */
@@ -2509,6 +2514,7 @@ ha_innobase::rnd_pos(
 Stores a reference to the current row to 'ref' field of the handle. Note
 that in the case where we have generated the clustered index for the
 table, the function parameter is illogical: we MUST ASSUME that 'record'
+is the current 'position' of the handle, because if row ref is actually
 the row id internally generated in InnoDB, then 'record' does not contain
 it. We just guess that the row id must be for the record where the handle
 was positioned the last time. */
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
index cac00a2d83c..6df24140df5 100644
--- a/sql/ha_innodb.h
+++ b/sql/ha_innodb.h
@@ -164,7 +164,8 @@ 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!!! */
+	/* void init_table_handle_for_HANDLER(); Not tested or used yet, code
+	included for documentational purposes only */
 	longlong get_auto_increment();
 };