bk commit into 5.1 tree (vtkachenko:1.2192)

[Vadim Tkachenko]

Below is the list of changes that have just been committed into a local
5.1 repository of root. When root does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2192 06/05/26 10:48:12 vtkachenko@stripped +2 -0
  mysql_priv.h, sql_class.cc:
    Added accessor to handler data.

  sql/mysql_priv.h
    1.405 06/05/26 10:47:59 vtkachenko@stripped +1 -0
    Added accessor to handler data.

  sql/sql_class.cc
    1.261 06/05/26 10:47:25 vtkachenko@stripped +5 -0
    Added accessor to handler data.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	vtkachenko
# Host:	vadima.volia.com
# Root:	/root/mysql-5.1-new1

--- 1.404/sql/mysql_priv.h	2006-05-23 21:25:02 +03:00
+++ 1.405/sql/mysql_priv.h	2006-05-26 10:47:59 +03:00
@@ -489,6 +489,7 @@
 my_bool thd_in_lock_tables(const THD *thd);
 my_bool thd_tablespace_op(const THD *thd);
 const char *thd_proc_info(THD *thd, const char *info);
+void **thd_ha_data(THD *thd, struct handlerton *hton);
 
 /*
   External variables

--- 1.260/sql/sql_class.cc	2006-05-22 22:54:52 +03:00
+++ 1.261/sql/sql_class.cc	2006-05-26 10:47:25 +03:00
@@ -186,6 +186,11 @@
   return old_info;
 }
 
+void **thd_ha_data(THD *thd, struct handlerton *hton)
+{
+  return (void **) thd->ha_data + hton->slot;
+}
+
 
 /*
   Pass nominal parameters to Statement constructor only to ensure that