database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch 'bb-10.4-release' into bb-10.5-release

Browse Source
This commit is contained in:
Sergei Golubchik
2021-02-15 16:43:15 +01:00
parent 5e3d3220bb 2696538723
commit 25d9d2e37f
316 changed files with 21851 additions and 3529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/protocol.cc
View File

@@ -1334,16 +1334,16 @@ bool Protocol_text::store(Field *field)
return store_null();
#ifdef DBUG_ASSERT_EXISTS
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
bool rc= field->send(this);
#ifdef DBUG_ASSERT_EXISTS
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 rc;