diff options
Diffstat (limited to '')
| -rw-r--r-- | sql/sql_test.cc | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 5cc192af..cf34c996 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -26,7 +26,6 @@ #include "keycaches.h" #include "my_json_writer.h" #include <hash.h> -#include <thr_alarm.h> #include "sql_connect.h" #include "thread_cache.h" @@ -388,7 +387,7 @@ void print_sjm(SJ_MATERIALIZATION_INFO *sjm) } fprintf(DBUG_FILE, " }\n"); fprintf(DBUG_FILE, " materialize_cost= %g\n", - sjm->materialization_cost.total_cost()); + sjm->materialization_cost); fprintf(DBUG_FILE, " rows= %g\n", sjm->rows); fprintf(DBUG_FILE, "}\n"); DBUG_UNLOCK_FILE; @@ -616,17 +615,6 @@ Open streams: %10lu\n", my_file_opened, my_stream_opened); -#ifndef DONT_USE_THR_ALARM - ALARM_INFO alarm_info; - thr_alarm_info(&alarm_info); - printf("\nAlarm status:\n\ -Active alarms: %u\n\ -Max used alarms: %u\n\ -Next alarm time: %lu\n", - alarm_info.active_alarms, - alarm_info.max_used_alarms, - (ulong)alarm_info.next_alarm_time); -#endif display_table_locks(); #if defined(HAVE_MALLINFO2) struct mallinfo2 info = mallinfo2(); @@ -707,14 +695,15 @@ void print_keyuse_array_for_trace(THD *thd, DYNAMIC_ARRAY *keyuse_array) { keyuse_elem.add("index", keyuse->table->key_info[keyuse->key].name); } - keyuse_elem.add("field", (keyuse->keypart == FT_KEYPART) ? "<fulltext>": - (keyuse->is_for_hash_join() ? - keyuse->table->field[keyuse->keypart] - ->field_name.str : - keyuse->table->key_info[keyuse->key] - .key_part[keyuse->keypart] - .field->field_name.str)); - keyuse_elem.add("equals",keyuse->val); - keyuse_elem.add("null_rejecting",keyuse->null_rejecting); + keyuse_elem. + add("field", (keyuse->keypart == FT_KEYPART) ? "<fulltext>": + (keyuse->is_for_hash_join() ? + keyuse->table->field[keyuse->keypart] + ->field_name.str : + keyuse->table->key_info[keyuse->key] + .key_part[keyuse->keypart] + .field->field_name.str)). + add("equals",keyuse->val). + add("null_rejecting",keyuse->null_rejecting); } } |