maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2775 knielsen@xxxxxxxxxxxxxxx	2009-10-09
      Fix many test failures in parts test suite with --embedded-server.
      
      Fix some connect options to work with embedded.
      
      Disable in --embedded tests that rely on connecting to mysqld externally by
      spawning mysqltest.
      
      Disable in --embedded tests that rely on the mysqltest --list_files command,
      which does not seem to work properly in --embedded.
      modified:
        mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test
        mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test
        mysql-test/suite/parts/t/partition_alter1_1_innodb.test
        mysql-test/suite/parts/t/partition_alter1_1_myisam.test
        mysql-test/suite/parts/t/partition_alter1_2_innodb.test
        mysql-test/suite/parts/t/partition_alter1_2_myisam.test
        mysql-test/suite/parts/t/partition_alter2_1_innodb.test
        mysql-test/suite/parts/t/partition_alter2_1_maria.test
        mysql-test/suite/parts/t/partition_alter2_1_myisam.test
        mysql-test/suite/parts/t/partition_alter2_2_innodb.test
        mysql-test/suite/parts/t/partition_alter2_2_maria.test
        mysql-test/suite/parts/t/partition_alter2_2_myisam.test
        mysql-test/suite/parts/t/partition_alter3_innodb.test
        mysql-test/suite/parts/t/partition_alter3_myisam.test
        mysql-test/suite/parts/t/partition_alter4_innodb.test
        mysql-test/suite/parts/t/partition_alter4_myisam.test
        mysql-test/suite/parts/t/partition_basic_innodb.test
        mysql-test/suite/parts/t/partition_basic_myisam.test
        mysql-test/suite/parts/t/partition_basic_symlink_myisam.test
        mysql-test/suite/parts/t/partition_engine_innodb.test
        mysql-test/suite/parts/t/partition_engine_myisam.test
        mysql-test/suite/parts/t/partition_special_innodb.test
        mysql-test/suite/parts/t/partition_syntax_innodb.test
        mysql-test/suite/parts/t/partition_syntax_myisam.test

per-file messages:
  mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter1_1_innodb.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter1_1_myisam.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter1_2_innodb.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter1_2_myisam.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter2_1_innodb.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter2_1_maria.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter2_1_myisam.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter2_2_innodb.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter2_2_maria.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter2_2_myisam.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter3_innodb.test
    Disable in --embedded tests that rely on the mysqltest --list_files command,
    which does not seem to work properly in --embedded.
  mysql-test/suite/parts/t/partition_alter3_myisam.test
    Disable in --embedded tests that rely on the mysqltest --list_files command,
    which does not seem to work properly in --embedded.
  mysql-test/suite/parts/t/partition_alter4_innodb.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_alter4_myisam.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_basic_innodb.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_basic_myisam.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_basic_symlink_myisam.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_engine_innodb.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_engine_myisam.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_special_innodb.test
    Fix some connect options to work with embedded.
  mysql-test/suite/parts/t/partition_syntax_innodb.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
  mysql-test/suite/parts/t/partition_syntax_myisam.test
    Disable in --embedded tests that rely on connecting to mysqld externally by
    spawning mysqltest.
=== modified file 'mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test	2008-05-16 16:03:50 +0000
+++ b/mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test	2009-10-09 13:08:09 +0000
@@ -43,6 +43,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test'
--- a/mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test	2008-05-16 16:03:50 +0000
+++ b/mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test	2009-10-09 13:08:09 +0000
@@ -42,6 +42,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter1_1_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter1_1_innodb.test	2008-05-16 16:03:50 +0000
+++ b/mysql-test/suite/parts/t/partition_alter1_1_innodb.test	2009-10-09 13:08:09 +0000
@@ -42,6 +42,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter1_1_myisam.test'
--- a/mysql-test/suite/parts/t/partition_alter1_1_myisam.test	2008-05-16 16:03:50 +0000
+++ b/mysql-test/suite/parts/t/partition_alter1_1_myisam.test	2009-10-09 13:08:09 +0000
@@ -43,6 +43,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter1_2_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter1_2_innodb.test	2008-05-16 16:03:50 +0000
+++ b/mysql-test/suite/parts/t/partition_alter1_2_innodb.test	2009-10-09 13:08:09 +0000
@@ -43,6 +43,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter1_2_myisam.test'
--- a/mysql-test/suite/parts/t/partition_alter1_2_myisam.test	2008-05-16 16:03:50 +0000
+++ b/mysql-test/suite/parts/t/partition_alter1_2_myisam.test	2009-10-09 13:08:09 +0000
@@ -43,6 +43,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter2_1_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter2_1_innodb.test	2008-09-18 09:02:48 +0000
+++ b/mysql-test/suite/parts/t/partition_alter2_1_innodb.test	2009-10-09 13:08:09 +0000
@@ -40,6 +40,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter2_1_maria.test'
--- a/mysql-test/suite/parts/t/partition_alter2_1_maria.test	2008-11-24 14:53:10 +0000
+++ b/mysql-test/suite/parts/t/partition_alter2_1_maria.test	2009-10-09 13:08:09 +0000
@@ -40,6 +40,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter2_1_myisam.test'
--- a/mysql-test/suite/parts/t/partition_alter2_1_myisam.test	2008-09-18 09:02:48 +0000
+++ b/mysql-test/suite/parts/t/partition_alter2_1_myisam.test	2009-10-09 13:08:09 +0000
@@ -40,6 +40,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter2_2_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter2_2_innodb.test	2008-09-18 09:02:48 +0000
+++ b/mysql-test/suite/parts/t/partition_alter2_2_innodb.test	2009-10-09 13:08:09 +0000
@@ -40,6 +40,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter2_2_maria.test'
--- a/mysql-test/suite/parts/t/partition_alter2_2_maria.test	2008-11-24 14:53:10 +0000
+++ b/mysql-test/suite/parts/t/partition_alter2_2_maria.test	2009-10-09 13:08:09 +0000
@@ -40,6 +40,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter2_2_myisam.test'
--- a/mysql-test/suite/parts/t/partition_alter2_2_myisam.test	2008-09-18 09:02:48 +0000
+++ b/mysql-test/suite/parts/t/partition_alter2_2_myisam.test	2009-10-09 13:08:09 +0000
@@ -40,6 +40,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter3_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter3_innodb.test	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/partition_alter3_innodb.test	2009-10-09 13:08:09 +0000
@@ -39,6 +39,8 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on --list_files, which doesn't work correctly in embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter3_myisam.test'
--- a/mysql-test/suite/parts/t/partition_alter3_myisam.test	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/partition_alter3_myisam.test	2009-10-09 13:08:09 +0000
@@ -39,6 +39,8 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on --list_files, which doesn't work correctly in embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter4_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter4_innodb.test	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/partition_alter4_innodb.test	2009-10-09 13:08:09 +0000
@@ -40,6 +40,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_alter4_myisam.test'
--- a/mysql-test/suite/parts/t/partition_alter4_myisam.test	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/partition_alter4_myisam.test	2009-10-09 13:08:09 +0000
@@ -40,6 +40,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_basic_innodb.test'
--- a/mysql-test/suite/parts/t/partition_basic_innodb.test	2008-03-17 15:18:02 +0000
+++ b/mysql-test/suite/parts/t/partition_basic_innodb.test	2009-10-09 13:08:09 +0000
@@ -40,6 +40,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_basic_myisam.test'
--- a/mysql-test/suite/parts/t/partition_basic_myisam.test	2008-03-17 15:18:02 +0000
+++ b/mysql-test/suite/parts/t/partition_basic_myisam.test	2009-10-09 13:08:09 +0000
@@ -40,6 +40,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_basic_symlink_myisam.test'
--- a/mysql-test/suite/parts/t/partition_basic_symlink_myisam.test	2008-02-06 14:13:56 +0000
+++ b/mysql-test/suite/parts/t/partition_basic_symlink_myisam.test	2009-10-09 13:08:09 +0000
@@ -40,6 +40,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 # The server must support symlink for DATA/INDEX DIRECTORY.

=== modified file 'mysql-test/suite/parts/t/partition_engine_innodb.test'
--- a/mysql-test/suite/parts/t/partition_engine_innodb.test	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/partition_engine_innodb.test	2009-10-09 13:08:09 +0000
@@ -39,6 +39,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_engine_myisam.test'
--- a/mysql-test/suite/parts/t/partition_engine_myisam.test	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/partition_engine_myisam.test	2009-10-09 13:08:09 +0000
@@ -39,6 +39,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_special_innodb.test'
--- a/mysql-test/suite/parts/t/partition_special_innodb.test	2008-12-04 09:47:25 +0000
+++ b/mysql-test/suite/parts/t/partition_special_innodb.test	2009-10-09 13:08:09 +0000
@@ -58,8 +58,8 @@ ENGINE = InnoDB
 PARTITION BY HASH (a)
 PARTITIONS 2;
 
-connect (con1,127.0.0.1,root,,test,$MASTER_MYPORT,);
-connect (con2,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect (con1,localhost,root,,test,$MASTER_MYPORT,);
+connect (con2,localhost,root,,test,$MASTER_MYPORT,);
 
 --connection con1
 SET autocommit=OFF;

=== modified file 'mysql-test/suite/parts/t/partition_syntax_innodb.test'
--- a/mysql-test/suite/parts/t/partition_syntax_innodb.test	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/partition_syntax_innodb.test	2009-10-09 13:08:09 +0000
@@ -39,6 +39,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

=== modified file 'mysql-test/suite/parts/t/partition_syntax_myisam.test'
--- a/mysql-test/suite/parts/t/partition_syntax_myisam.test	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/partition_syntax_myisam.test	2009-10-09 13:08:09 +0000
@@ -39,6 +39,9 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# This test relies on connecting externally from mysqltest, doesn't
+# work with embedded.
+--source include/not_embedded.inc
 # The server must support partitioning.
 --source include/have_partition.inc