summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2009-12-03 21:59:52 +0300
committerKonstantin Osipov <kostja@sun.com>2009-12-03 21:59:52 +0300
commit36897c862b2d46a13794fd305fa9a29fb2ac51b7 (patch)
treec209a443889edefd4af0c0272b119d68097e7dcf /sql/mysqld.cc
parentc43f894c51bb7b091dd668f069fb5e5e44dcb0b1 (diff)
downloadmariadb-git-36897c862b2d46a13794fd305fa9a29fb2ac51b7.tar.gz
Backport of:
----------------------------------------------------------- 2497.479.10 Sergei Golubchik 2008-08-27 proc_info_hook, mysys access to thd->proc_info This patch is necessary for backport of WL#4284 "Transactional DDL locking".
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ee341314cd6..1055d5fed8b 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3828,6 +3828,10 @@ static int init_server_components()
}
}
+ proc_info_hook= (const char *(*)(void *, const char *, const char *,
+ const char *, const unsigned int))
+ set_thd_proc_info;
+
if (xid_cache_init())
{
sql_print_error("Out of memory");