- Make json_udf test work on Windows

modified:
  storage/connect/mysql-test/connect/t/json_udf.inc
This commit is contained in:
Olivier Bertrand 2015-03-02 00:35:56 +01:00
parent 5f4909b31d
commit b9a9b82f9e

View file

@ -1,5 +1,14 @@
--disable_query_log
if ($WINDOWS)
#
# Check if server has support for loading plugins
#
if (`SELECT @@have_dynamic_loading != 'YES'`) {
--skip UDF requires dynamic loading
}
let $is_win = `select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows")`;
if ($is_win)
{
--eval CREATE FUNCTION Json_Array RETURNS STRING SONAME 'ha_connect.dll';
--eval CREATE FUNCTION Json_Array_Add RETURNS STRING SONAME 'ha_connect.dll';
@ -10,7 +19,7 @@ if ($WINDOWS)
--eval CREATE AGGREGATE FUNCTION Json_Object_Grp RETURNS STRING SONAME 'ha_connect.dll';
}
if (!$WINDOWS)
if (!$is_win)
{
--eval CREATE FUNCTION Json_Array RETURNS STRING SONAME 'ha_connect.so';
--eval CREATE FUNCTION Json_Array_Add RETURNS STRING SONAME 'ha_connect.so';