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 remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2017-04-19 05:21:36 +04:00
parent f89a5c9a25 e2b03cd3b5
commit 7ba0cfc8ae
93 changed files with 581 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/perfschema/ha_perfschema.cc
View File

@@ -275,7 +275,7 @@ void ha_perfschema::use_hidden_primary_key(void)
table->column_bitmaps_set_no_signal(&table->s->all_set, table->write_set);
}
int ha_perfschema::update_row(const uchar *old_data, uchar *new_data)
int ha_perfschema::update_row(const uchar *old_data, const uchar *new_data)
{
DBUG_ENTER("ha_perfschema::update_row");
if (!pfs_initialized)