Moving Item_args::arg_count from "public" to "protected".

Author: Alexander Barkov

sql/item.h

@@ -3479,6 +3479,7 @@ class Item_args
 {
 protected:
   Item **args, *tmp_arg[2];
+  uint arg_count;
   void set_arguments(THD *thd, List<Item> &list);
   bool walk_args(Item_processor processor, bool walk_subquery, uchar *arg)
   {
@@ -3492,7 +3493,6 @@ class Item_args
   bool transform_args(THD *thd, Item_transformer transformer, uchar *arg);
   void propagate_equal_fields(THD *, const Item::Context &, COND_EQUAL *);
 public:
-  uint arg_count;
   Item_args(void)
     :args(NULL), arg_count(0)
   { }

sql/item_cmpfunc.cc

@@ -1863,7 +1863,7 @@ bool Item_func_opt_neg::eq(const Item *item, bool binary_cmp) const
   if (item->type() != FUNC_ITEM)
     return 0;
   Item_func *item_func=(Item_func*) item;
-  if (arg_count != item_func->arg_count ||
+  if (arg_count != item_func->argument_count() ||
       functype() != item_func->functype())
     return 0;
   if (negated != ((Item_func_opt_neg *) item_func)->negated)

sql/item_strfunc.cc

@@ -3485,7 +3485,7 @@ bool Item_func_set_collation::eq(const Item *item, bool binary_cmp) const
   if (item->type() != FUNC_ITEM)
     return 0;
   Item_func *item_func=(Item_func*) item;
-  if (arg_count != item_func->arg_count ||
+  if (arg_count != item_func->argument_count() ||
       functype() != item_func->functype())
     return 0;
   Item_func_set_collation *item_func_sc=(Item_func_set_collation*) item;

sql/item_subselect.cc

@@ -2638,7 +2638,7 @@ static bool check_equality_for_exist2in(Item_func *func,
   Item **args;
   if (func->functype() != Item_func::EQ_FUNC)
     return FALSE;
-  DBUG_ASSERT(func->arg_count == 2);
+  DBUG_ASSERT(func->argument_count() == 2);
   args= func->arguments();
   if (args[0]->real_type() == Item::FIELD_ITEM &&
       args[0]->all_used_tables() != OUTER_REF_TABLE_BIT &&

sql/sql_select.cc

@@ -5045,7 +5045,7 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array,
     Item_func::Functype functype=  func->functype();
     if (functype == Item_func::FT_FUNC)
       cond_func=(Item_func_match *)cond;
-    else if (func->arg_count == 2)
+    else if (func->argument_count() == 2)
     {
       Item *arg0=(Item *)(func->arguments()[0]),
            *arg1=(Item *)(func->arguments()[1]);
@@ -23167,13 +23167,13 @@ void free_underlaid_joins(THD *thd, SELECT_LEX *select)
 static bool change_group_ref(THD *thd, Item_func *expr, ORDER *group_list,
                              bool *changed)
 {
-  if (expr->arg_count)
+  if (expr->argument_count())
   {
     Name_resolution_context *context= &thd->lex->current_select->context;
     Item **arg,**arg_end;
     bool arg_changed= FALSE;
     for (arg= expr->arguments(),
-         arg_end= expr->arguments()+expr->arg_count;
+         arg_end= expr->arguments() + expr->argument_count();
          arg != arg_end; arg++)
     {
       Item *item= *arg;

storage/mroonga/ha_mroonga.cpp

@@ -9701,13 +9701,13 @@ void ha_mroonga::check_count_skip(key_part_map start_key_part_map,
 
         if (where->type() == Item::FUNC_ITEM) {
           Item_func *func_item = static_cast<Item_func *>(where);
-          if (func_item->arg_count == 0) {
+          if (func_item->argument_count() == 0) {
             break;
           }
           target = func_item->key_item();
           where = where->next;
           if (func_item->arguments()[0] == where) {
-            uint n_args = func_item->arg_count;
+            uint n_args = func_item->argument_count();
             for (; n_args > 0; --n_args) {
               where = where->next;
             }

storage/spider/spd_db_mysql.cc

@@ -3289,7 +3289,7 @@ int spider_db_mysql_util::open_item_func(
       {
         if (
           !strncasecmp("rand", func_name, func_name_length) &&
-          !item_func->arg_count
+          !item_func->argument_count()
         ) {
           if (str)
             str->length(str->length() - SPIDER_SQL_OPEN_PAREN_LEN);