maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2698 knielsen@xxxxxxxxxxxxxxx	2009-04-27
      Misc. small fixes:
       - Fixes for pool-of-threads patch.
       - Fixes for push of PBXT storage engine.
       - mysql-test-run.pl fix.
      modified:
        BUILD/compile-dist
        mysql-test/Makefile.am
        mysql-test/lib/mtr_unique.pm
        mysql-test/t/pool_of_threads.cnf
        sql/set_var.cc

per-file messages:
  BUILD/compile-dist
    Fix that PBXT was missing in source tarball after `BUILD/compile-dist && make dist`
  mysql-test/Makefile.am
    Fix that PBXT test suite was missing from `make dist` source tarball.
  mysql-test/lib/mtr_unique.pm
    Better fix to avoid races when chmod'ing the semaphore file.
    (Though using chmod 666 shared files in /tmp/ is still not a very good solution).
  mysql-test/t/pool_of_threads.cnf
    Fix that test case pool_of_threads fails if run on mysqld with no --with-libevent support.
  sql/set_var.cc
    Fix missing static declaration on pool_of_threads.
=== modified file 'BUILD/compile-dist'
--- a/BUILD/compile-dist	2009-02-19 09:01:25 +0000
+++ b/BUILD/compile-dist	2009-04-27 13:17:47 +0000
@@ -60,8 +60,6 @@ fi
 # Make sure to enable all features that affect "make dist"
 # Remember that configure restricts the man pages to the configured features !
 ./configure \
-  --with-maria-storage-engine \
-  --with-embedded-server \
-  --with-ndbcluster
-$gmake
-
+  --with-plugins=max-no-ndb \
+  --with-embedded-server
+$gmake -j4

=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2009-02-13 12:25:41 +0000
+++ b/mysql-test/Makefile.am	2009-04-27 13:17:47 +0000
@@ -98,7 +98,8 @@ TEST_DIRS = t r include std_data std_dat
 	suite/stress/include suite/stress/t suite/stress/r \
 	suite/ndb suite/ndb/t suite/ndb/r \
 	suite/rpl_ndb suite/rpl_ndb/t suite/rpl_ndb/r \
-	suite/parts suite/parts/t suite/parts/r suite/parts/inc
+	suite/parts suite/parts/t suite/parts/r suite/parts/inc \
+	suite/pbxt/t suite/pbxt/r
 
 # Used by dist-hook and install-data-local to copy all
 # test files into either dist or install directory

=== modified file 'mysql-test/lib/mtr_unique.pm'
--- a/mysql-test/lib/mtr_unique.pm	2009-04-08 16:55:26 +0000
+++ b/mysql-test/lib/mtr_unique.pm	2009-04-27 13:17:47 +0000
@@ -62,14 +62,14 @@ sub mtr_get_unique_id($$) {
     die 'lock file is a symbolic link';
   }
 
+  my $save_umask= umask(0);
   open SEM, ">", "$file.sem" or die "can't write to $file.sem";
-  chmod 0777, "$file.sem";
   flock SEM, LOCK_EX or die "can't lock $file.sem";
   if(! -e $file) {
     open FILE, ">", $file or die "can't create $file";
     close FILE;
   }
-  chmod 0777, $file;
+  umask($save_umask);
 
   msg("HAVE THE LOCK");
 
@@ -135,8 +135,8 @@ sub mtr_release_unique_id($) {
     die 'lock file is a symbolic link';
   }
 
+  my $save_umask= umask(0);
   open SEM, ">", "$file.sem" or die "can't write to $file.sem";
-  chmod 0777, "$file.sem";
   flock SEM, LOCK_EX or die "can't lock $file.sem";
 
   msg("HAVE THE LOCK");
@@ -149,7 +149,7 @@ sub mtr_release_unique_id($) {
     open FILE, ">", $file or die "can't create $file";
     close FILE;
   }
-  chmod 0777, "$file.sem";
+  umask($save_umask);
   open FILE, "+<", $file or die "can't open $file";
   #select undef,undef,undef,0.2;
   seek FILE, 0, 0;

=== modified file 'mysql-test/t/pool_of_threads.cnf'
--- a/mysql-test/t/pool_of_threads.cnf	2009-03-18 15:46:32 +0000
+++ b/mysql-test/t/pool_of_threads.cnf	2009-04-27 13:17:47 +0000
@@ -2,8 +2,8 @@
 
 [mysqld.1]
 test-ignore-wrong-options
-thread-handling=   pool-of-threads
-thread_pool_size=  2
+loose-thread-handling=   pool-of-threads
+loose-thread_pool_size=  2
 extra-port=        @mysqld.1.#extra-port
 extra-max-connections=1
 

=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2009-04-08 16:55:26 +0000
+++ b/sql/set_var.cc	2009-04-27 13:17:47 +0000
@@ -642,7 +642,7 @@ static sys_var_long_ptr	sys_table_lock_w
 static sys_var_long_ptr	sys_thread_cache_size(&vars, "thread_cache_size",
 					      &thread_cache_size);
 #if HAVE_POOL_OF_THREADS == 1
-sys_var_long_ptr	sys_thread_pool_size(&vars, "thread_pool_size",
+static sys_var_long_ptr	sys_thread_pool_size(&vars, "thread_pool_size",
 					      &thread_pool_size);
 #endif
 static sys_var_thd_enum	sys_tx_isolation(&vars, "tx_isolation",