diff options
| -rw-r--r-- | storage/spider/spd_db_conn.cc | 3 | ||||
| -rw-r--r-- | storage/spider/spd_db_mysql.cc | 20 | ||||
| -rw-r--r-- | storage/spider/spd_group_by_handler.cc | 5 |
3 files changed, 2 insertions, 26 deletions
diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc index 634451680fd..32e3ccbe215 100644 --- a/storage/spider/spd_db_conn.cc +++ b/storage/spider/spd_db_conn.cc @@ -2477,9 +2477,6 @@ int spider_db_fetch_table( #ifndef DBUG_OFF dbug_tmp_restore_column_map(&table->write_set, tmp_map); #endif - } else { - DBUG_PRINT("info", ("spider bitmap is not set %s", - SPIDER_field_name_str(*field))); } row->next(); } diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc index 21c2e6bb434..a2d0c917e11 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/storage/spider/spd_db_mysql.cc @@ -15381,21 +15381,15 @@ int spider_mbase_handler::append_list_item_select( spider_fields *fields ) { int error_num; - uint32 length, begin; + uint32 length; List_iterator_fast<Item> it(*select); Item *item; Field *field; const char *item_name; DBUG_ENTER("spider_mbase_handler::append_list_item_select"); DBUG_PRINT("info",("spider this=%p", this)); - begin = str->length(); while ((item = it++)) { - if (item->const_item()) - { - DBUG_PRINT("info",("spider const item")); - continue; - } if ((error_num = spider_db_print_item_type(item, NULL, spider, str, alias, alias_length, dbton_id, use_fields, fields))) { @@ -15423,17 +15417,7 @@ int spider_mbase_handler::append_list_item_select( } str->q_append(SPIDER_SQL_COMMA_STR, SPIDER_SQL_COMMA_LEN); } - if (begin == str->length()) - { - /* no columns */ - if (str->reserve(SPIDER_SQL_ONE_LEN)) - { - DBUG_RETURN(HA_ERR_OUT_OF_MEM); - } - str->q_append(SPIDER_SQL_ONE_STR, SPIDER_SQL_ONE_LEN); - } else { - str->length(str->length() - SPIDER_SQL_COMMA_LEN); - } + str->length(str->length() - SPIDER_SQL_COMMA_LEN); DBUG_RETURN(0); } diff --git a/storage/spider/spd_group_by_handler.cc b/storage/spider/spd_group_by_handler.cc index 774b9cfa2f8..c2244f04fe9 100644 --- a/storage/spider/spd_group_by_handler.cc +++ b/storage/spider/spd_group_by_handler.cc @@ -1753,11 +1753,6 @@ group_by_handler *spider_create_group_by_handler( while ((item = it++)) { DBUG_PRINT("info",("spider select item=%p", item)); - if (item->const_item()) - { - DBUG_PRINT("info",("spider const item")); - continue; - } if (spider_db_print_item_type(item, NULL, spider, NULL, NULL, 0, roop_count, TRUE, fields_arg)) { |