diff options
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index b7b70f0f55c..56d10ddaa13 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -137,7 +137,8 @@ void TEST_filesort(SORT_FIELD *sortorder,uint s_length) out.append(*sortorder->field->table_name); out.append('.'); } - out.append(sortorder->field->field_name ? sortorder->field->field_name: + out.append(sortorder->field->field_name.str ? + sortorder->field->field_name.str : "tmp_table_column"); } else @@ -238,11 +239,11 @@ static void print_keyuse(KEYUSE *keyuse) keyuse->val->print(&str, QT_ORDINARY); str.append('\0'); if (keyuse->is_for_hash_join()) - fieldname= keyuse->table->field[keyuse->keypart]->field_name; + fieldname= keyuse->table->field[keyuse->keypart]->field_name.str; else if (keyuse->keypart == FT_KEYPART) fieldname= "FT_KEYPART"; else - fieldname= key_info->key_part[keyuse->keypart].field->field_name; + fieldname= key_info->key_part[keyuse->keypart].field->field_name.str; ll2str(keyuse->used_tables, buf2, 16, 0); fprintf(DBUG_FILE, "KEYUSE: %s.%s=%s optimize: %u used_tables: %s " "ref_table_rows: %lu keypart_map: %0lx\n", @@ -387,10 +388,10 @@ void print_sjm(SJ_MATERIALIZATION_INFO *sjm) /* Debugging help: force List<...>::elem function not be removed as unused. */ -Item* (List<Item>:: *dbug_list_item_elem_ptr)(int)= &List<Item>::elem; -Item_equal* (List<Item_equal>:: *dbug_list_item_equal_elem_ptr)(int)= +Item* (List<Item>:: *dbug_list_item_elem_ptr)(uint)= &List<Item>::elem; +Item_equal* (List<Item_equal>:: *dbug_list_item_equal_elem_ptr)(uint)= &List<Item_equal>::elem; -TABLE_LIST* (List<TABLE_LIST>:: *dbug_list_table_list_elem_ptr)(int) = +TABLE_LIST* (List<TABLE_LIST>:: *dbug_list_table_list_elem_ptr)(uint) = &List<TABLE_LIST>::elem; #endif |