database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

after-merge fixes

Browse Source 
in innobase: compilation error on windows
other changes: perfschema merge followup
This commit is contained in:
Sergei Golubchik
2015-06-16 23:55:56 +02:00
parent 27f0bd7d95
commit 985e430c0f
13 changed files with 22 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test
View File

@ -25,10 +25,6 @@ let $fixed_bug_30395= 0;
# 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
}
--source include/no_protocol.inc
--source suite/funcs_1/datadict/processlist_priv.inc

6
mysql-test/suite/funcs_1/t/processlist_val_no_prot.test
View File

@ -20,10 +20,6 @@
# 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
}
--source include/no_protocol.inc
--source suite/funcs_1/datadict/processlist_val.inc