mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'merge-perfschema-5.7' into 10.5

Browse source
This commit is contained in:
Oleksandr Byelkin 2022-01-28 11:57:52 +01:00
commit 880d543554
275 changed files with 1124 additions and 922 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/perfschema/table_events_waits_summary.cc
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
@ -196,7 +196,7 @@ int table_events_waits_summary_by_instance
return HA_ERR_RECORD_DELETED;
/* Set the null bits */
DBUG_ASSERT(table->s->null_bytes == 0);
assert(table->s->null_bytes == 0);
for (; (f= *fields) ; fields++)
{
@ -226,7 +226,7 @@ int table_events_waits_summary_by_instance
set_field_ulonglong(f, m_row.m_stat.m_max);
break;
default:
DBUG_ASSERT(false);
assert(false);
}
}
}