diff options
| author | Martin Hansson <martin.hansson@sun.com> | 2009-11-20 13:29:43 +0100 |
|---|---|---|
| committer | Martin Hansson <martin.hansson@sun.com> | 2009-11-20 13:29:43 +0100 |
| commit | ca595821498d6a547fa1780df86cdf127b0019b3 (patch) | |
| tree | fabb9c5fa11cdf96ecdc1297561875b1a58090ed /sql/sql_repl.cc | |
| parent | b4a3083dc8b8049e64692ffc8e6e527914fb93da (diff) | |
| parent | 4205c622e1a741bae1b2d8d213342f8e0bdd936a (diff) | |
| download | mariadb-git-ca595821498d6a547fa1780df86cdf127b0019b3.tar.gz | |
merge of Bug#33204 (backport)
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 3481092fe35..4e5ce08ab5d 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -377,7 +377,7 @@ static ulonglong get_heartbeat_period(THD * thd) my_bool null_value; LEX_STRING name= { C_STRING_WITH_LEN("master_heartbeat_period")}; user_var_entry *entry= - (user_var_entry*) hash_search(&thd->user_vars, (uchar*) name.str, + (user_var_entry*) my_hash_search(&thd->user_vars, (uchar*) name.str, name.length); return entry? entry->val_int(&null_value) : 0; } @@ -1674,7 +1674,7 @@ bool mysql_show_binlog_events(THD* thd) DBUG_ENTER("mysql_show_binlog_events"); Log_event::init_show_field_list(&field_list); - if (protocol->send_fields(&field_list, + if (protocol->send_result_set_metadata(&field_list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF)) DBUG_RETURN(TRUE); @@ -1849,7 +1849,7 @@ bool show_binlog_info(THD* thd) field_list.push_back(new Item_empty_string("Binlog_Do_DB",255)); field_list.push_back(new Item_empty_string("Binlog_Ignore_DB",255)); - if (protocol->send_fields(&field_list, + if (protocol->send_result_set_metadata(&field_list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF)) DBUG_RETURN(TRUE); protocol->prepare_for_resend(); @@ -1901,7 +1901,7 @@ bool show_binlogs(THD* thd) field_list.push_back(new Item_empty_string("Log_name", 255)); field_list.push_back(new Item_return_int("File_size", 20, MYSQL_TYPE_LONGLONG)); - if (protocol->send_fields(&field_list, + if (protocol->send_result_set_metadata(&field_list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF)) DBUG_RETURN(TRUE); |