diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-02 14:36:14 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-02 14:36:14 +0200 |
| commit | 5edf3e03887142f83044ee9fcc8fcf65386c43c7 (patch) | |
| tree | 179e1f56be501aeb8ed2a975ee49efad5e5144dd /libmysqld/lib_sql.cc | |
| parent | 32a29afea777d8bbfcea7a2b5e6e5ee674013cb5 (diff) | |
| parent | c58e184b14ccdf0b0eaeeeb7947e23b8b5fff7a7 (diff) | |
| download | mariadb-git-5edf3e03887142f83044ee9fcc8fcf65386c43c7.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index eb3cf9cd8e3..21227e78a39 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -1138,7 +1138,7 @@ bool Protocol::send_result_set_metadata(List<Item> *list, uint flags) for (uint pos= 0 ; (item= it++); pos++) { - if (prot.store_field_metadata(thd, item, pos)) + if (prot.store_item_metadata(thd, item, pos)) goto err; } @@ -1253,8 +1253,7 @@ bool Protocol_binary::write() @retval FALSE Success */ -bool -net_send_ok(THD *thd, +bool Protocol::net_send_ok(THD *thd, uint server_status, uint statement_warn_count, ulonglong affected_rows, ulonglong id, const char *message, bool) @@ -1289,7 +1288,7 @@ net_send_ok(THD *thd, */ bool -net_send_eof(THD *thd, uint server_status, uint statement_warn_count) +Protocol::net_send_eof(THD *thd, uint server_status, uint statement_warn_count) { bool error= write_eof_packet(thd, server_status, statement_warn_count); thd->cur_data= 0; @@ -1297,8 +1296,8 @@ net_send_eof(THD *thd, uint server_status, uint statement_warn_count) } -bool net_send_error_packet(THD *thd, uint sql_errno, const char *err, - const char *sqlstate) +bool Protocol::net_send_error_packet(THD *thd, uint sql_errno, const char *err, + const char *sqlstate) { uint error; char converted_err[MYSQL_ERRMSG_SIZE]; |