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 /sql/item.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 'sql/item.h')
-rw-r--r-- | sql/item.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index 127f1cf138f..8faba4ddcb5 100644 --- a/sql/item.h +++ b/sql/item.h @@ -4769,7 +4769,7 @@ public: null_value= 1; } - virtual bool allocate(uint i) { return 0; } + virtual bool allocate(THD *thd, uint i) { return 0; } virtual bool setup(THD *thd, Item *item) { example= item; @@ -4950,7 +4950,7 @@ public: 'allocate' used only in row transformer, to preallocate space for row cache. */ - bool allocate(uint num); + bool allocate(THD *thd, uint num); /* 'setup' is needed only by row => it not called by simple row subselect (only by IN subselect (in subselect optimizer)) |