diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2021-04-06 12:52:44 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2021-04-06 12:52:44 +0200 |
| commit | c030f4c625b90baa17cb8c73a018a327aa12b557 (patch) | |
| tree | 25466f53c50fc7d92e0b17f04c206f3ccf59eb47 /sql/protocol.cc | |
| parent | 28b76afceac1eb2c35e77439142daac53908cdc3 (diff) | |
| parent | 6fe624b5acf51383d39eb0e547a03779d41cf4a8 (diff) | |
| download | mariadb-git-c030f4c625b90baa17cb8c73a018a327aa12b557.tar.gz | |
Commit last pull from origin
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index de6d1b96f76..1bffcfb3bdb 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -1250,15 +1250,15 @@ bool Protocol_text::store(Field *field) CHARSET_INFO *tocs= this->thd->variables.character_set_results; #ifndef DBUG_OFF TABLE *table= field->table; - my_bitmap_map *old_map= 0; + MY_BITMAP *old_map= 0; if (table->file) - old_map= dbug_tmp_use_all_columns(table, table->read_set); + old_map= dbug_tmp_use_all_columns(table, &table->read_set); #endif field->val_str(&str); #ifndef DBUG_OFF if (old_map) - dbug_tmp_restore_column_map(table->read_set, old_map); + dbug_tmp_restore_column_map(&table->read_set, old_map); #endif return store_string_aux(str.ptr(), str.length(), str.charset(), tocs); |