Commit 700f21b7 authored by Magnus Blåudd's avatar Magnus Blåudd

Bug#47801 The plugin test fails with the Embedded Server on Windows

 - Remove the "hack" from mtr.pl that skipped searching for the .dll files
  when embedded and windows. Now the variables will be preoperly initialized.
 - Make the tests detect that they can't run on windows+embedded
parent d94752f4
let $is_win = `select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows")`;
let $is_embedded = `select version() like '%embedded%'`;
#echo is_win: $is_win;
#echo is_embedded: $is_embedded;
if ($is_win)
{
if ($is_embedded)
{
skip Not supported with embedded on windows;
}
}
...@@ -1797,7 +1797,7 @@ sub environment_setup { ...@@ -1797,7 +1797,7 @@ sub environment_setup {
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Add the path where mysqld will find ha_example.so # Add the path where mysqld will find ha_example.so
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
if ($mysql_version_id >= 50100 && !(IS_WINDOWS && $opt_embedded_server)) { if ($mysql_version_id >= 50100) {
my $plugin_filename; my $plugin_filename;
if (IS_WINDOWS) if (IS_WINDOWS)
{ {
......
--source include/not_windows_embedded.inc
--source include/have_example_plugin.inc --source include/have_example_plugin.inc
CREATE TABLE t1(a int) ENGINE=EXAMPLE; CREATE TABLE t1(a int) ENGINE=EXAMPLE;
......
--source include/not_windows_embedded.inc
--source include/have_example_plugin.inc --source include/have_example_plugin.inc
SELECT @@global.example_enum_var = 'e2'; SELECT @@global.example_enum_var = 'e2';
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment