diff options
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index f8f5809d9c2..0787aa9e92f 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -326,15 +326,20 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, DBUG_ENTER("mysql_admin_table"); DBUG_PRINT("enter", ("extra_open_options: %u", extra_open_options)); - field_list.push_back(item= new (thd->mem_root) Item_empty_string(thd, "Table", - NAME_CHAR_LEN * 2)); + field_list.push_back(item= new (thd->mem_root) + Item_empty_string(thd, "Table", + NAME_CHAR_LEN * 2), thd->mem_root); item->maybe_null = 1; - field_list.push_back(item= new (thd->mem_root) Item_empty_string(thd, "Op", 10)); + field_list.push_back(item= new (thd->mem_root) + Item_empty_string(thd, "Op", 10), thd->mem_root); item->maybe_null = 1; - field_list.push_back(item= new (thd->mem_root) Item_empty_string(thd, "Msg_type", 10)); + field_list.push_back(item= new (thd->mem_root) + Item_empty_string(thd, "Msg_type", 10), thd->mem_root); item->maybe_null = 1; - field_list.push_back(item= new (thd->mem_root) Item_empty_string(thd, "Msg_text", - SQL_ADMIN_MSG_TEXT_SIZE)); + field_list.push_back(item= new (thd->mem_root) + Item_empty_string(thd, "Msg_text", + SQL_ADMIN_MSG_TEXT_SIZE), + thd->mem_root); item->maybe_null = 1; if (protocol->send_result_set_metadata(&field_list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF)) |