1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

5.6.29

Browse Source
This commit is contained in:
Sergei Golubchik 2016-02-16 18:56:39 +01:00
parent 6bb292f1bc
commit 7e22a1d843
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/r/dml_setup_instruments.result
View File

@ -36,6 +36,7 @@ where name like 'Wait/Synch/Cond/sql/%'
'wait/synch/cond/sql/DEBUG_SYNC::cond') 'wait/synch/cond/sql/DEBUG_SYNC::cond')
order by name limit 10; order by name limit 10;
NAME ENABLED TIMED NAME ENABLED TIMED
wait/synch/cond/sql/COND_connection_count YES YES
wait/synch/cond/sql/COND_flush_thread_cache YES YES wait/synch/cond/sql/COND_flush_thread_cache YES YES
wait/synch/cond/sql/COND_manager YES YES wait/synch/cond/sql/COND_manager YES YES
wait/synch/cond/sql/COND_queue_state YES YES wait/synch/cond/sql/COND_queue_state YES YES
@ -45,7 +46,6 @@ wait/synch/cond/sql/COND_thread_count YES YES
wait/synch/cond/sql/Delayed_insert::cond YES YES wait/synch/cond/sql/Delayed_insert::cond YES YES
wait/synch/cond/sql/Delayed_insert::cond_client YES YES wait/synch/cond/sql/Delayed_insert::cond_client YES YES
wait/synch/cond/sql/Event_scheduler::COND_state YES YES wait/synch/cond/sql/Event_scheduler::COND_state YES YES
wait/synch/cond/sql/Gtid_state YES YES
select * from performance_schema.setup_instruments select * from performance_schema.setup_instruments
where name='Wait'; where name='Wait';
select * from performance_schema.setup_instruments select * from performance_schema.setup_instruments

2
mysql-test/suite/perfschema/r/view_table_io.result
View File

@ -52,7 +52,7 @@ insert into marker set a = 1;
optimize table test.v1; optimize table test.v1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.v1 optimize Error 'test.v1' is not BASE TABLE test.v1 optimize Error 'test.v1' is not BASE TABLE
test.v1 optimize error Corrupt test.v1 optimize status Operation failed
insert into marker set a = 1; insert into marker set a = 1;
select * from test.v1; select * from test.v1;
a b a b

5
storage/perfschema/table_session_connect.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -251,7 +251,8 @@ void table_session_connect::make_row(PFS_thread *pfs, uint ordinal)
&m_row.m_attr_value_length)) &m_row.m_attr_value_length))
{ {
/* we don't expect internal threads to have connection attributes */ /* we don't expect internal threads to have connection attributes */
DBUG_ASSERT(pfs->m_processlist_id != 0); if (pfs->m_processlist_id == 0)
return;
m_row.m_ordinal_position= ordinal; m_row.m_ordinal_position= ordinal;
m_row.m_process_id= pfs->m_processlist_id; m_row.m_process_id= pfs->m_processlist_id;