summaryrefslogtreecommitdiff
path: root/include/mysql.h.pp
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2015-08-31 12:57:46 +0300
committerMonty <monty@mariadb.org>2015-09-01 18:42:02 +0300
commit56aa19989f5800df8a398173727558bfb3ea1251 (patch)
treef87dbcca91d699cbc2539a344d6dabd6b71c2131 /include/mysql.h.pp
parent8ea9b8c0b168b3e5aad08886477d8726531abcd5 (diff)
downloadmariadb-git-56aa19989f5800df8a398173727558bfb3ea1251.tar.gz
MDEV-6152: Remove calls to current_thd while creating Item
Part 5: Removing calls to current_thd in net_read calls, creating fields, query_cache, acl and some other places where thd was available
Diffstat (limited to 'include/mysql.h.pp')
-rw-r--r--include/mysql.h.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index 8bd5aa61209..ea4a3ee9c02 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -29,7 +29,7 @@ typedef struct st_net {
my_bool thread_specific_malloc;
my_bool compress;
my_bool unused3;
- unsigned char *unused;
+ void *thd;
unsigned int last_errno;
unsigned char error;
my_bool unused4;
@@ -81,7 +81,7 @@ enum enum_mysql_set_option
MYSQL_OPTION_MULTI_STATEMENTS_ON,
MYSQL_OPTION_MULTI_STATEMENTS_OFF
};
-my_bool my_net_init(NET *net, Vio* vio, unsigned int my_flags);
+my_bool my_net_init(NET *net, Vio* vio, void *thd, unsigned int my_flags);
void my_net_local_init(NET *net);
void net_end(NET *net);
void net_clear(NET *net, my_bool clear_buffer);