diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
| commit | 65ca700def99289cc31a7040537f5aa6e12bf485 (patch) | |
| tree | 97b3a07299b626c519da0e80c122b5b79b933914 /mysql-test/include/have_simple_parser.inc | |
| parent | 2ab57de38d13d927ddff2d51aed4af34e13998f5 (diff) | |
| parent | 6e5bcca7935d3c62f84bb640e5357664a210ee12 (diff) | |
| download | mariadb-git-65ca700def99289cc31a7040537f5aa6e12bf485.tar.gz | |
merge.
checkpoint.
does not compile.
Diffstat (limited to 'mysql-test/include/have_simple_parser.inc')
| -rw-r--r-- | mysql-test/include/have_simple_parser.inc | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/mysql-test/include/have_simple_parser.inc b/mysql-test/include/have_simple_parser.inc index 745f68603fe..008116cd8cb 100644 --- a/mysql-test/include/have_simple_parser.inc +++ b/mysql-test/include/have_simple_parser.inc @@ -6,15 +6,9 @@ if (`SELECT @@have_dynamic_loading != 'YES'`) { } # -# Check if the variable SIMPLE_PARSER is set +# Check if the variable MYPLUGLIB_SO is set # -if (`SELECT LENGTH('$SIMPLE_PARSER') = 0`) { - --skip simple parser requires the environment variable \$SIMPLE_PARSER to be set (normally done by mtr) -} - -# -# Check if --plugin-dir was setup for simple parser -# -if (`SELECT CONCAT('--plugin-dir=', @@plugin_dir) != '$SIMPLE_PARSER_OPT'`) { - --skip simple parser requires that --plugin-dir is set to the udf plugin dir (either the .opt file does not contain \$UDF_EXAMPLE_LIB_OPT or another plugin is in use) -} +--require r/have_simple_parser.require +disable_query_log; +eval select LENGTH('$MYPLUGLIB_SO') > 0 as 'have_simple_parser'; +enable_query_log; |