diff options
| author | Monty <monty@mariadb.org> | 2015-08-31 12:57:46 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-09-01 18:42:02 +0300 |
| commit | 56aa19989f5800df8a398173727558bfb3ea1251 (patch) | |
| tree | f87dbcca91d699cbc2539a344d6dabd6b71c2131 /include/mysql_com.h | |
| parent | 8ea9b8c0b168b3e5aad08886477d8726531abcd5 (diff) | |
| download | mariadb-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_com.h')
| -rw-r--r-- | include/mysql_com.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index fe014233dc7..88dc57a9a39 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -386,10 +386,7 @@ typedef struct st_net { queries in cache that have not stored its results yet */ #endif - /* - Unused, please remove with the next incompatible ABI change. - */ - unsigned char *unused; + void *thd; /* Used by MariaDB server to avoid calling current_thd */ unsigned int last_errno; unsigned char error; my_bool unused4; /* Please remove with the next incompatible ABI change. */ @@ -517,7 +514,7 @@ enum enum_mysql_set_option extern "C" { #endif -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); |