summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-26 22:42:48 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-30 11:43:02 +0200
commited77ee1aab1c41584bccfc62bee77d7c4d9af8d4 (patch)
treeed4d896e4e06db8e0bfa9bc075f0dd39fdda55d6 /sql/item_func.cc
parente8bdb73adee78253424fbb1ff782ad12700939a1 (diff)
downloadmariadb-git-ed77ee1aab1c41584bccfc62bee77d7c4d9af8d4.tar.gz
cleanup: change Item::walk() to take void* not uchar*
and remove all related casts to uchar* also remove a couple of unused methods
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 95ee128d95b..bda3b76a8dd 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -257,7 +257,7 @@ Item_func::quick_fix_field()
bool
-Item_func::eval_not_null_tables(uchar *opt_arg)
+Item_func::eval_not_null_tables(void *opt_arg)
{
Item **arg,**arg_end;
not_null_tables_cache= 0;
@@ -4741,7 +4741,7 @@ Item_func_set_user_var::fix_length_and_dec()
column read set or to register used fields in a view
*/
-bool Item_func_set_user_var::register_field_in_read_map(uchar *arg)
+bool Item_func_set_user_var::register_field_in_read_map(void *arg)
{
if (result_field)
{
@@ -4760,7 +4760,7 @@ bool Item_func_set_user_var::register_field_in_read_map(uchar *arg)
*/
-bool Item_func_set_user_var::register_field_in_bitmap(uchar *arg)
+bool Item_func_set_user_var::register_field_in_bitmap(void *arg)
{
MY_BITMAP *bitmap = (MY_BITMAP *) arg;
DBUG_ASSERT(bitmap);