mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
MDEV-6152: Remove calls to current_thd while creating Item
- Part 3: Adding mem_root to push_back() and push_front() Other things: - Added THD as an argument to some partition functions. - Added memory overflow checking for XML tag's in read_xml()
This commit is contained in:
@ -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))
|
||||
|
Reference in New Issue
Block a user