diff options
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/mroonga/ha_mroonga.cpp | 4 | ||||
| -rw-r--r-- | storage/spider/spd_db_mysql.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/mroonga/ha_mroonga.cpp b/storage/mroonga/ha_mroonga.cpp index a94278e19c2..9266d2d6d82 100644 --- a/storage/mroonga/ha_mroonga.cpp +++ b/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; } diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc index 1b40265e9b6..92f95259090 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/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); |