branches/zip:

Fix Mantis issue#103 mysql_addons.c depends on THD internals - please remove it

Use MySQL's thd_get_thread_id() instead of our own ib_thd_get_thread_id()
since MySQL implemented the former, see http://bugs.mysql.com/30930.

Approved by:	Marko (https://svn.innodb.com/rb/r/40, rb://40)

handler/mysql_addons.cc

@@ -24,19 +24,6 @@ Created November 07, 2007 Vasil Dimov
 #include "mysql_addons.h"
 #include "univ.i"
 
-/***********************************************************************
-Retrieve THD::thread_id
-http://bugs.mysql.com/30930 */
-extern "C" UNIV_INTERN
-unsigned long
-ib_thd_get_thread_id(
-/*=================*/
-				/* out: THD::thread_id */
-	const void*	thd)	/* in: THD */
-{
-	return((unsigned long) ((THD*) thd)->thread_id);
-}
-
 /* http://bugs.mysql.com/40360 */
 /* http://lists.mysql.com/commits/57450 */
 /**

trx/trx0i_s.c

@@ -393,7 +393,7 @@ fill_trx_row(
 
 	if (trx->mysql_thd != NULL) {
 		row->trx_mysql_thread_id
-			= ib_thd_get_thread_id(trx->mysql_thd);
+			= thd_get_thread_id(trx->mysql_thd);
 	} else {
 		/* For internal transactions e.g., purge and transactions
 		being recovered at startup there is no associated MySQL

win-plugin/win-plugin.diff

@@ -37,7 +37,7 @@ diff -Nur sql/CMakeLists.txt.orig sql/CMakeLists.txt
 diff -Nur sql/mysqld.def.orig sql/mysqld.def
 --- sql/mysqld.def.orig	1969-12-31 18:00:00 -06:00
 +++ sql/mysqld.def	2008-10-31 02:20:32 -05:00
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,100 @@
 +EXPORTS
 +	?use_hidden_primary_key@handler@@UAEXXZ
 +	?get_dynamic_partition_info@handler@@UAEXPAUPARTITION_INFO@@I@Z
@@ -87,6 +87,7 @@ diff -Nur sql/mysqld.def.orig sql/mysqld.def
 +	mysql_query_cache_invalidate4
 +	thd_query
 +	thd_sql_command
++	thd_get_thread_id
 +	thd_get_xid
 +	thd_slave_thread
 +	thd_non_transactional_update
@@ -191,6 +192,7 @@ diff -Nur sql/mysqld_x64.def.orig sql/mysqld_x64.def
 +	mysql_query_cache_invalidate4
 +	thd_query
 +	thd_sql_command
++	thd_get_thread_id
 +	thd_get_xid
 +	thd_slave_thread
 +	thd_non_transactional_update