MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:October 8 2009 8:39am
Subject:bzr commit into mysql-5.1-mtr branch (magnus.blaudd:2840) Bug#47801
View as plain text  
#At file:///home/msvensson/mysql/5.1-mtr/ based on revid:magnus.blaudd@strippedgtk37a5u799c64

 2840 Magnus Blåudd	2009-10-08
      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

    added:
      mysql-test/include/not_windows_embedded.inc
    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/t/plugin.test
      mysql-test/t/plugin_load.test
=== added file 'mysql-test/include/not_windows_embedded.inc'
--- a/mysql-test/include/not_windows_embedded.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/not_windows_embedded.inc	2009-10-08 08:39:15 +0000
@@ -0,0 +1,11 @@
+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;
+  }
+}

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-10-08 08:32:43 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-10-08 08:39:15 +0000
@@ -1797,7 +1797,7 @@ sub environment_setup {
   # --------------------------------------------------------------------------
   # 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;
     if (IS_WINDOWS)
     {

=== modified file 'mysql-test/t/plugin.test'
--- a/mysql-test/t/plugin.test	2009-06-10 08:59:49 +0000
+++ b/mysql-test/t/plugin.test	2009-10-08 08:39:15 +0000
@@ -1,3 +1,4 @@
+--source include/not_windows_embedded.inc
 --source include/have_example_plugin.inc
 
 CREATE TABLE t1(a int) ENGINE=EXAMPLE;

=== modified file 'mysql-test/t/plugin_load.test'
--- a/mysql-test/t/plugin_load.test	2008-01-26 00:05:15 +0000
+++ b/mysql-test/t/plugin_load.test	2009-10-08 08:39:15 +0000
@@ -1,3 +1,4 @@
+--source include/not_windows_embedded.inc
 --source include/have_example_plugin.inc
 
 SELECT @@global.example_enum_var = 'e2';

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20091008083915-9pg2l22r5w6p8ov1.bundle
Thread
bzr commit into mysql-5.1-mtr branch (magnus.blaudd:2840) Bug#47801Magnus Blåudd8 Oct