Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
ede08808
Commit
ede08808
authored
Jun 16, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'merge-perfschema-5.6' into 10.0
parents
9859d366
3c372499
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
17 additions
and
27 deletions
+17
-27
mysql-test/suite/perfschema/include/connection_setup.inc
mysql-test/suite/perfschema/include/connection_setup.inc
+1
-1
mysql-test/suite/perfschema/include/digest_setup.inc
mysql-test/suite/perfschema/include/digest_setup.inc
+1
-1
mysql-test/suite/perfschema/include/event_aggregate_setup.inc
...l-test/suite/perfschema/include/event_aggregate_setup.inc
+1
-1
mysql-test/suite/perfschema/include/no_protocol.inc
mysql-test/suite/perfschema/include/no_protocol.inc
+0
-10
mysql-test/suite/perfschema/include/stage_setup.inc
mysql-test/suite/perfschema/include/stage_setup.inc
+1
-1
mysql-test/suite/perfschema/include/table_aggregate_setup.inc
...l-test/suite/perfschema/include/table_aggregate_setup.inc
+1
-1
mysql-test/suite/perfschema/r/threads_mysql.result
mysql-test/suite/perfschema/r/threads_mysql.result
+1
-1
mysql-test/suite/perfschema/t/digest_null_literal.test
mysql-test/suite/perfschema/t/digest_null_literal.test
+1
-1
mysql-test/suite/perfschema/t/nesting.test
mysql-test/suite/perfschema/t/nesting.test
+1
-1
mysql-test/suite/perfschema/t/rpl_gtid_func.test
mysql-test/suite/perfschema/t/rpl_gtid_func.test
+1
-1
mysql-test/suite/perfschema/t/rpl_statements.test
mysql-test/suite/perfschema/t/rpl_statements.test
+1
-1
mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
...suite/perfschema/t/socket_summary_by_event_name_func.test
+1
-1
mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
...t/suite/perfschema/t/socket_summary_by_instance_func.test
+1
-1
mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
...ite/perfschema/t/socket_summary_by_instance_func_win.test
+1
-1
mysql-test/suite/perfschema/t/start_server_low_digest.test
mysql-test/suite/perfschema/t/start_server_low_digest.test
+1
-1
mysql-test/suite/perfschema/t/statement_digest_long_query.test
...-test/suite/perfschema/t/statement_digest_long_query.test
+1
-1
mysql-test/suite/perfschema/t/unary_digest.test
mysql-test/suite/perfschema/t/unary_digest.test
+1
-1
storage/perfschema/ha_perfschema.cc
storage/perfschema/ha_perfschema.cc
+1
-1
No files found.
mysql-test/suite/perfschema/include/connection_setup.inc
View file @
ede08808
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
--
source
../
include
/
wait_for_pfs_thread_count
.
inc
--
source
../
include
/
wait_for_pfs_thread_count
.
inc
--
disable_query_log
--
disable_query_log
...
...
mysql-test/suite/perfschema/include/digest_setup.inc
View file @
ede08808
# Making sure not to run when ps-protocol is set.
# Making sure not to run when ps-protocol is set.
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
--
echo
####################################
--
echo
####################################
--
echo
# SETUP
--
echo
# SETUP
...
...
mysql-test/suite/perfschema/include/event_aggregate_setup.inc
View file @
ede08808
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
--
source
../
include
/
wait_for_pfs_thread_count
.
inc
--
source
../
include
/
wait_for_pfs_thread_count
.
inc
--
disable_query_log
--
disable_query_log
...
...
mysql-test/suite/perfschema/include/no_protocol.inc
deleted
100644 → 0
View file @
9859d366
# Tests for the performance schema
# The file with expected results fits only to a run without
# ps-protocol/sp-protocol/cursor-protocol/view-protocol.
if
(
`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL
+ $VIEW_PROTOCOL > 0`
)
{
--
skip
Test
requires
:
ps
-
protocol
/
sp
-
protocol
/
cursor
-
protocol
/
view
-
protocol
disabled
}
mysql-test/suite/perfschema/include/stage_setup.inc
View file @
ede08808
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
--
disable_query_log
--
disable_query_log
...
...
mysql-test/suite/perfschema/include/table_aggregate_setup.inc
View file @
ede08808
...
@@ -67,7 +67,7 @@
...
@@ -67,7 +67,7 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
--
source
../
include
/
wait_for_pfs_thread_count
.
inc
--
source
../
include
/
wait_for_pfs_thread_count
.
inc
--
disable_query_log
--
disable_query_log
...
...
mysql-test/suite/perfschema/r/threads_mysql.result
View file @
ede08808
...
@@ -13,7 +13,7 @@ processlist_user NULL
...
@@ -13,7 +13,7 @@ processlist_user NULL
processlist_host NULL
processlist_host NULL
processlist_db NULL
processlist_db NULL
processlist_command NULL
processlist_command NULL
processlist_info
INTERNAL DDL LOG RECOVER IN PROGRESS
processlist_info
NULL
unified_parent_thread_id NULL
unified_parent_thread_id NULL
role NULL
role NULL
instrumented YES
instrumented YES
...
...
mysql-test/suite/perfschema/t/digest_null_literal.test
View file @
ede08808
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
TRUNCATE
TABLE
performance_schema
.
events_statements_summary_by_digest
;
TRUNCATE
TABLE
performance_schema
.
events_statements_summary_by_digest
;
...
...
mysql-test/suite/perfschema/t/nesting.test
View file @
ede08808
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
# On windows, the socket instrumentation collects an extra "opt"
# On windows, the socket instrumentation collects an extra "opt"
# event, which changes the test output.
# event, which changes the test output.
--
source
include
/
not_windows
.
inc
--
source
include
/
not_windows
.
inc
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
--
source
../
include
/
wait_for_pfs_thread_count
.
inc
--
source
../
include
/
wait_for_pfs_thread_count
.
inc
--
disable_query_log
--
disable_query_log
...
...
mysql-test/suite/perfschema/t/rpl_gtid_func.test
View file @
ede08808
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
--
source
include
/
master
-
slave
.
inc
--
source
include
/
master
-
slave
.
inc
...
...
mysql-test/suite/perfschema/t/rpl_statements.test
View file @
ede08808
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
--
source
include
/
have_binlog_format_mixed
.
inc
--
source
include
/
have_binlog_format_mixed
.
inc
--
source
include
/
master
-
slave
.
inc
--
source
include
/
master
-
slave
.
inc
...
...
mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
View file @
ede08808
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
# happens per SQL statement within our MTR tests. And there is a significant
# happens per SQL statement within our MTR tests. And there is a significant
# difference between standard statement execution and execution via
# difference between standard statement execution and execution via
# prepared statement.
# prepared statement.
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
# Set this to enable debugging output
# Set this to enable debugging output
let
$my_socket_debug_dbug
=
0
;
let
$my_socket_debug_dbug
=
0
;
...
...
mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
View file @
ede08808
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
# happens per SQL statement within our MTR tests. And there is a significant
# happens per SQL statement within our MTR tests. And there is a significant
# difference between standard statement execution and execution via
# difference between standard statement execution and execution via
# prepared statement.
# prepared statement.
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
#===================================
#===================================
...
...
mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
View file @
ede08808
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
# happens per SQL statement within our MTR tests. And there is a significant
# happens per SQL statement within our MTR tests. And there is a significant
# difference between standard statement execution and execution via
# difference between standard statement execution and execution via
# prepared statement.
# prepared statement.
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
#===================================
#===================================
...
...
mysql-test/suite/perfschema/t/start_server_low_digest.test
View file @
ede08808
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
USE
performance_schema
;
USE
performance_schema
;
truncate
table
events_statements_history_long
;
truncate
table
events_statements_history_long
;
...
...
mysql-test/suite/perfschema/t/statement_digest_long_query.test
View file @
ede08808
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
USE
performance_schema
;
USE
performance_schema
;
truncate
table
events_statements_summary_by_digest
;
truncate
table
events_statements_summary_by_digest
;
...
...
mysql-test/suite/perfschema/t/unary_digest.test
View file @
ede08808
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
include
/
have_perfschema
.
inc
--
source
../
include
/
no_protocol
.
inc
--
source
include
/
no_protocol
.
inc
TRUNCATE
TABLE
performance_schema
.
events_statements_summary_by_digest
;
TRUNCATE
TABLE
performance_schema
.
events_statements_summary_by_digest
;
...
...
storage/perfschema/ha_perfschema.cc
View file @
ede08808
...
@@ -205,7 +205,7 @@ maria_declare_plugin(perfschema)
...
@@ -205,7 +205,7 @@ maria_declare_plugin(perfschema)
0x0001
,
0x0001
,
pfs_status_vars
,
pfs_status_vars
,
NULL
,
NULL
,
"5.6.2
0
"
,
"5.6.2
5
"
,
MariaDB_PLUGIN_MATURITY_STABLE
MariaDB_PLUGIN_MATURITY_STABLE
}
}
maria_declare_plugin_end
;
maria_declare_plugin_end
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment