diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /mysql-test/include/have_simple_parser.inc | |
parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz |
lots of post-merge changes
Diffstat (limited to 'mysql-test/include/have_simple_parser.inc')
-rw-r--r-- | mysql-test/include/have_simple_parser.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mysql-test/include/have_simple_parser.inc b/mysql-test/include/have_simple_parser.inc index 008116cd8cb..100c8fc7a5a 100644 --- a/mysql-test/include/have_simple_parser.inc +++ b/mysql-test/include/have_simple_parser.inc @@ -8,7 +8,6 @@ if (`SELECT @@have_dynamic_loading != 'YES'`) { # # Check if the variable MYPLUGLIB_SO is set # ---require r/have_simple_parser.require -disable_query_log; -eval select LENGTH('$MYPLUGLIB_SO') > 0 as 'have_simple_parser'; -enable_query_log; +if (`SELECT LENGTH('$MYPLUGLIB_SO') = 0`) { + --skip simple parser is not built (no mypluglib.so) +} |