diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-16 23:55:56 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-16 23:55:56 +0200 |
| commit | 985e430c0f1c99cbd0854aae649f8aefff98adc0 (patch) | |
| tree | b34d114456ec1febacfe5656144b29787bbc0c6f /mysql-test/include | |
| parent | 27f0bd7d959fa490ab724ab5bfef9aaa80b1b703 (diff) | |
| download | mariadb-git-985e430c0f1c99cbd0854aae649f8aefff98adc0.tar.gz | |
after-merge fixes
in innobase: compilation error on windows
other changes: perfschema merge followup
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/no_protocol.inc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/include/no_protocol.inc b/mysql-test/include/no_protocol.inc new file mode 100644 index 00000000000..8ffd3509afc --- /dev/null +++ b/mysql-test/include/no_protocol.inc @@ -0,0 +1,8 @@ +# 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 +} + |