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/pfs_events_statements.cc
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2010, 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,
@ -179,7 +179,7 @@ void insert_events_statements_history(PFS_thread *thread, PFS_events_statements
if (unlikely(events_statements_history_per_thread == 0))
return;
DBUG_ASSERT(thread->m_statements_history != NULL);
assert(thread->m_statements_history != NULL);
uint index= thread->m_statements_history_index;
@ -211,7 +211,7 @@ void insert_events_statements_history_long(PFS_events_statements *statement)
if (unlikely(events_statements_history_long_size == 0))
return ;
DBUG_ASSERT(events_statements_history_long_array != NULL);
assert(events_statements_history_long_array != NULL);
uint index= PFS_atomic::add_u32(&events_statements_history_long_index.m_u32, 1);