null+****@clear*****
null+****@clear*****
2011年 7月 11日 (月) 16:45:06 JST
Kouhei Sutou 2011-07-11 07:45:06 +0000 (Mon, 11 Jul 2011)
New Revision: 42a5ea67a60516aed2c7fb56d2c98c5c24d90b85
Log:
add a missing space after ",".
Modified files:
ha_mroonga.cc
mrn_table.cc
Modified: ha_mroonga.cc (+24 -24)
===================================================================
--- ha_mroonga.cc 2011-07-11 04:17:08 +0000 (7645c0d)
+++ ha_mroonga.cc 2011-07-11 07:45:06 +0000 (b5483aa)
@@ -2499,7 +2499,7 @@ int ha_mroonga::extra(enum ha_extra_function operation)
{
int error;
MRN_DBUG_ENTER_METHOD();
- DBUG_PRINT("info",("mroonga this=%p", this));
+ DBUG_PRINT("info", ("mroonga this=%p", this));
if (share->wrapper_mode)
{
if ((error = wrapper_extra(operation)))
@@ -2965,7 +2965,7 @@ int ha_mroonga::storage_update_row(const uchar *old_data, uchar *new_data)
#ifndef DBUG_OFF
my_bitmap_map *tmp_map = dbug_tmp_use_all_columns(table, table->read_set);
#endif
- DBUG_PRINT("info",("mroonga update column %d(%d)",i,field->field_index));
+ DBUG_PRINT("info", ("mroonga update column %d(%d)",i,field->field_index));
if (field->is_null()) continue;
@@ -3222,7 +3222,7 @@ int ha_mroonga::storage_index_init(uint idx, bool sorted)
int ha_mroonga::index_init(uint idx, bool sorted)
{
MRN_DBUG_ENTER_METHOD();
- DBUG_PRINT("info",("mroonga idx=%u", idx));
+ DBUG_PRINT("info", ("mroonga idx=%u", idx));
active_index = idx;
count_skip = FALSE;
if (share->wrapper_mode)
@@ -3348,12 +3348,12 @@ int ha_mroonga::storage_index_read_map(uchar * buf, const uchar * key,
uint pkey_nr = table->s->primary_key;
if (key_nr == pkey_nr) { // primary index
- DBUG_PRINT("info",("mroonga use primary key"));
+ DBUG_PRINT("info", ("mroonga use primary key"));
cur =
grn_table_cursor_open(ctx, grn_table, val_min, size_min, val_max, size_max,
0, -1, flags);
} else { // normal index
- DBUG_PRINT("info",("mroonga use key%u", key_nr));
+ DBUG_PRINT("info", ("mroonga use key%u", key_nr));
cur0 = grn_table_cursor_open(ctx, grn_index_tables[key_nr],
val_min, size_min,
val_max, size_max,
@@ -3438,12 +3438,12 @@ int ha_mroonga::storage_index_read_last_map(uchar *buf, const uchar *key,
uint pkey_nr = table->s->primary_key;
if (key_nr == pkey_nr) { // primary index
- DBUG_PRINT("info",("mroonga use primary key"));
+ DBUG_PRINT("info", ("mroonga use primary key"));
cur =
grn_table_cursor_open(ctx, grn_table, val_min, size_min, val_max, size_max,
0, -1, flags);
} else { // normal index
- DBUG_PRINT("info",("mroonga use key%u", key_nr));
+ DBUG_PRINT("info", ("mroonga use key%u", key_nr));
cur0 = grn_table_cursor_open(ctx, grn_index_tables[key_nr],
val_min, size_min,
val_max, size_max,
@@ -3595,12 +3595,12 @@ int ha_mroonga::storage_index_first(uchar *buf)
}
uint pkey_nr = table->s->primary_key;
if (active_index == pkey_nr) { // primary index
- DBUG_PRINT("info",("mroonga use primary key"));
+ DBUG_PRINT("info", ("mroonga use primary key"));
cur =
grn_table_cursor_open(ctx, grn_table, NULL, 0, NULL, 0,
0, -1, 0);
} else { // normal index
- DBUG_PRINT("info",("mroonga use key%u", active_index));
+ DBUG_PRINT("info", ("mroonga use key%u", active_index));
cur0 = grn_table_cursor_open(ctx, grn_index_tables[active_index],
NULL, 0,
NULL, 0,
@@ -3667,12 +3667,12 @@ int ha_mroonga::storage_index_last(uchar *buf)
int flags = GRN_CURSOR_DESCENDING;
uint pkey_nr = table->s->primary_key;
if (active_index == pkey_nr) { // primary index
- DBUG_PRINT("info",("mroonga use primary key"));
+ DBUG_PRINT("info", ("mroonga use primary key"));
cur =
grn_table_cursor_open(ctx, grn_table, NULL, 0, NULL, 0,
0, -1, flags);
} else { // normal index
- DBUG_PRINT("info",("mroonga use key%u", active_index));
+ DBUG_PRINT("info", ("mroonga use key%u", active_index));
cur0 =
grn_table_cursor_open(ctx, grn_index_tables[active_index],
NULL, 0,
@@ -3841,12 +3841,12 @@ int ha_mroonga::storage_read_range_first(const key_range *start_key,
uint pkey_nr = table->s->primary_key;
if (active_index == pkey_nr) { // primary index
- DBUG_PRINT("info",("mroonga use primary key"));
+ DBUG_PRINT("info", ("mroonga use primary key"));
cur =
grn_table_cursor_open(ctx, grn_table, val_min, size_min, val_max, size_max,
0, -1, flags);
} else { // normal index
- DBUG_PRINT("info",("mroonga use key%u", active_index));
+ DBUG_PRINT("info", ("mroonga use key%u", active_index));
cur0 = grn_table_cursor_open(ctx, grn_index_tables[active_index],
val_min, size_min,
val_max, size_max,
@@ -4436,7 +4436,7 @@ void ha_mroonga::check_fast_order_limit()
select_lex->offset_limit->val_int() : 0) +
select_lex->select_limit->val_int();
if (limit > (longlong) INT_MAX) {
- DBUG_PRINT("info",("mroonga fast_order_limit = FALSE"));
+ DBUG_PRINT("info", ("mroonga fast_order_limit = FALSE"));
fast_order_limit = FALSE;
DBUG_VOID_RETURN;
}
@@ -4446,14 +4446,14 @@ void ha_mroonga::check_fast_order_limit()
if (!where ||
where->type() != Item::FUNC_ITEM ||
((Item_func *)where)->functype() != Item_func::FT_FUNC) {
- DBUG_PRINT("info",("mroonga fast_order_limit = FALSE"));
+ DBUG_PRINT("info", ("mroonga fast_order_limit = FALSE"));
fast_order_limit = FALSE;
DBUG_VOID_RETURN;
}
where = where->next;
if (!where ||
where->type() != Item::STRING_ITEM) {
- DBUG_PRINT("info",("mroonga fast_order_limit = FALSE"));
+ DBUG_PRINT("info", ("mroonga fast_order_limit = FALSE"));
fast_order_limit = FALSE;
DBUG_VOID_RETURN;
}
@@ -4462,7 +4462,7 @@ void ha_mroonga::check_fast_order_limit()
break;
}
if (where && where != info) {
- DBUG_PRINT("info",("mroonga fast_order_limit = FALSE"));
+ DBUG_PRINT("info", ("mroonga fast_order_limit = FALSE"));
fast_order_limit = FALSE;
DBUG_VOID_RETURN;
}
@@ -4475,7 +4475,7 @@ void ha_mroonga::check_fast_order_limit()
order = order->next, i++) {
if ((*order->item)->type() != Item::FIELD_ITEM)
{
- DBUG_PRINT("info",("mroonga fast_order_limit = FALSE"));
+ DBUG_PRINT("info", ("mroonga fast_order_limit = FALSE"));
fast_order_limit = FALSE;
DBUG_VOID_RETURN;
}
@@ -4501,18 +4501,18 @@ void ha_mroonga::check_fast_order_limit()
if (i == 1 && col_field_index >= 0 &&
grn_column_index(ctx, grn_columns[col_field_index], GRN_OP_LESS,
&index, 1, NULL)) {
- DBUG_PRINT("info",("mroonga fast_order_limit_with_index = TRUE"));
+ DBUG_PRINT("info", ("mroonga fast_order_limit_with_index = TRUE"));
fast_order_limit_with_index = TRUE;
} else {
- DBUG_PRINT("info",("mroonga fast_order_limit_with_index = FALSE"));
+ DBUG_PRINT("info", ("mroonga fast_order_limit_with_index = FALSE"));
fast_order_limit_with_index = FALSE;
}
- DBUG_PRINT("info",("mroonga fast_order_limit = TRUE"));
+ DBUG_PRINT("info", ("mroonga fast_order_limit = TRUE"));
fast_order_limit = TRUE;
mrn_fast_order_limit++;
DBUG_VOID_RETURN;
}
- DBUG_PRINT("info",("mroonga fast_order_limit = FALSE"));
+ DBUG_PRINT("info", ("mroonga fast_order_limit = FALSE"));
fast_order_limit = FALSE;
DBUG_VOID_RETURN;
}
@@ -4534,7 +4534,7 @@ void ha_mroonga::store_fields_from_primary_table(uchar *buf, grn_id record_id)
my_bitmap_map *tmp_map = dbug_tmp_use_all_columns(table,
table->write_set);
#endif
- DBUG_PRINT("info",("mroonga store column %d(%d)",i,field->field_index));
+ DBUG_PRINT("info", ("mroonga store column %d(%d)",i,field->field_index));
field->move_field_offset(ptr_diff);
if (strncmp(MRN_ID_COL_NAME, col_name, col_name_size) == 0) {
// for _id column
@@ -4611,7 +4611,7 @@ int ha_mroonga::reset()
{
int error;
MRN_DBUG_ENTER_METHOD();
- DBUG_PRINT("info",("mroonga this=%p", this));
+ DBUG_PRINT("info", ("mroonga this=%p", this));
if (cur)
{
grn_table_cursor_close(ctx, cur);
Modified: mrn_table.cc (+15 -15)
===================================================================
--- mrn_table.cc 2011-07-11 04:17:08 +0000 (70d8c53)
+++ mrn_table.cc 2011-07-11 07:45:06 +0000 (701efd4)
@@ -187,7 +187,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
if (!memcmp(table_name + table_name_length - 5, "#TMP#", 5))
tmp_flg = TRUE;
- DBUG_PRINT("info",("mroonga table_name=%s", table_name));
+ DBUG_PRINT("info", ("mroonga table_name=%s", table_name));
List_iterator<partition_element> part_it(part_info->partitions);
while ((*part_elem = part_it++))
{
@@ -199,7 +199,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
create_subpartition_name(tmp_name, table->s->path.str,
(*part_elem)->partition_name, (*sub_elem)->partition_name,
NORMAL_PART_NAME);
- DBUG_PRINT("info",("mroonga tmp_name=%s", tmp_name));
+ DBUG_PRINT("info", ("mroonga tmp_name=%s", tmp_name));
if (!memcmp(table_name, tmp_name, table_name_length + 1))
DBUG_VOID_RETURN;
if (
@@ -216,7 +216,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
} else {
create_partition_name(tmp_name, table->s->path.str,
(*part_elem)->partition_name, NORMAL_PART_NAME, TRUE);
- DBUG_PRINT("info",("mroonga tmp_name=%s", tmp_name));
+ DBUG_PRINT("info", ("mroonga tmp_name=%s", tmp_name));
if (!memcmp(table_name, tmp_name, table_name_length + 1))
DBUG_VOID_RETURN;
if (
@@ -234,12 +234,12 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
{
*part_elem = tmp_part_elem;
*sub_elem = tmp_sub_elem;
- DBUG_PRINT("info",("mroonga tmp find"));
+ DBUG_PRINT("info", ("mroonga tmp find"));
DBUG_VOID_RETURN;
}
*part_elem = NULL;
*sub_elem = NULL;
- DBUG_PRINT("info",("mroonga no hit"));
+ DBUG_PRINT("info", ("mroonga no hit"));
DBUG_VOID_RETURN;
}
#endif
@@ -248,7 +248,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
#define MRN_PARAM_STR(title_name, param_name) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
- DBUG_PRINT("info",("mroonga "title_name" start")); \
+ DBUG_PRINT("info", ("mroonga "title_name" start")); \
if (!share->param_name) \
{ \
if ((share->param_name = mrn_get_string_between_quote( \
@@ -260,7 +260,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
MYF(0), tmp_ptr); \
goto error; \
} \
- DBUG_PRINT("info",("mroonga "title_name"=%s", share->param_name)); \
+ DBUG_PRINT("info", ("mroonga "title_name"=%s", share->param_name)); \
} \
break; \
}
@@ -298,7 +298,7 @@ int mrn_parse_table_param(MRN_SHARE *share, TABLE *table)
case 4:
if (!sub_elem || !sub_elem->part_comment)
continue;
- DBUG_PRINT("info",("mroonga create sub comment string"));
+ DBUG_PRINT("info", ("mroonga create sub comment string"));
if (
!(param_string = mrn_create_string(
sub_elem->part_comment,
@@ -307,12 +307,12 @@ int mrn_parse_table_param(MRN_SHARE *share, TABLE *table)
error = HA_ERR_OUT_OF_MEM;
goto error_alloc_param_string;
}
- DBUG_PRINT("info",("mroonga sub comment string=%s", param_string));
+ DBUG_PRINT("info", ("mroonga sub comment string=%s", param_string));
break;
case 3:
if (!part_elem || !part_elem->part_comment)
continue;
- DBUG_PRINT("info",("mroonga create part comment string"));
+ DBUG_PRINT("info", ("mroonga create part comment string"));
if (
!(param_string = mrn_create_string(
part_elem->part_comment,
@@ -321,13 +321,13 @@ int mrn_parse_table_param(MRN_SHARE *share, TABLE *table)
error = HA_ERR_OUT_OF_MEM;
goto error_alloc_param_string;
}
- DBUG_PRINT("info",("mroonga part comment string=%s", param_string));
+ DBUG_PRINT("info", ("mroonga part comment string=%s", param_string));
break;
#endif
case 2:
if (table->s->comment.length == 0)
continue;
- DBUG_PRINT("info",("mroonga create comment string"));
+ DBUG_PRINT("info", ("mroonga create comment string"));
if (
!(param_string = mrn_create_string(
table->s->comment.str,
@@ -336,12 +336,12 @@ int mrn_parse_table_param(MRN_SHARE *share, TABLE *table)
error = HA_ERR_OUT_OF_MEM;
goto error_alloc_param_string;
}
- DBUG_PRINT("info",("mroonga comment string=%s", param_string));
+ DBUG_PRINT("info", ("mroonga comment string=%s", param_string));
break;
default:
if (table->s->connect_string.length == 0)
continue;
- DBUG_PRINT("info",("mroonga create connect_string string"));
+ DBUG_PRINT("info", ("mroonga create connect_string string"));
if (
!(param_string = mrn_create_string(
table->s->connect_string.str,
@@ -350,7 +350,7 @@ int mrn_parse_table_param(MRN_SHARE *share, TABLE *table)
error = HA_ERR_OUT_OF_MEM;
goto error_alloc_param_string;
}
- DBUG_PRINT("info",("mroonga connect_string=%s", param_string));
+ DBUG_PRINT("info", ("mroonga connect_string=%s", param_string));
break;
}