[Maria-developers] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (sanja:2723)

3 Apr 2009

#At lp:maria/5.2

 2723 sanja@askmonty.org	2009-04-03 [merge]
      5.1 -> 5.2 merge
      modified:
        mysys/my_malloc.c
        mysys/my_once.c
        mysys/my_realloc.c
        tests/fork_big2.pl

=== modified file 'mysys/my_malloc.c'

--- a/mysys/my_malloc.c	2007-10-02 07:32:33 +0000
+++ b/mysys/my_malloc.c	2009-03-31 08:06:51 +0000
@@ -13,6 +13,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+/* my_global.h may define SAFEMALLOC (through my_config.h). */
+#include <my_global.h>
+
 #ifdef SAFEMALLOC			/* We don't need SAFEMALLOC here */
 #undef SAFEMALLOC
 #endif

=== modified file 'mysys/my_once.c'
--- a/mysys/my_once.c	2007-05-10 09:59:39 +0000
+++ b/mysys/my_once.c	2009-03-31 08:06:51 +0000
@@ -15,6 +15,9 @@
 
 /* Not MT-SAFE */
 
+/* my_global.h may define SAFEMALLOC (through my_config.h). */
+#include <my_global.h>
+
 #ifdef SAFEMALLOC			/* We don't need SAFEMALLOC here */
 #undef SAFEMALLOC
 #endif

=== modified file 'mysys/my_realloc.c'
--- a/mysys/my_realloc.c	2008-04-28 16:24:05 +0000
+++ b/mysys/my_realloc.c	2009-03-31 08:06:51 +0000
@@ -13,6 +13,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+/* my_global.h may define SAFEMALLOC (through my_config.h). */
+#include <my_global.h>
+
 #ifdef SAFEMALLOC			/* We don't need SAFEMALLOC here */
 #undef SAFEMALLOC
 #endif

=== modified file 'tests/fork_big2.pl'
--- a/tests/fork_big2.pl	2006-02-12 21:26:30 +0000
+++ b/tests/fork_big2.pl	2009-04-03 13:23:08 +0000
@@ -16,21 +16,21 @@ package main;
 
 $opt_skip_create=$opt_skip_in=$opt_verbose=$opt_fast_insert=
 $opt_lock_tables=$opt_debug=$opt_skip_drop=$opt_fast=$opt_force=0;
-$opt_thread_factor=1;
-$opt_insert=1;
-$opt_select=6;$opt_join=4;
-$opt_select_count=$opt_join_count=0;
-$opt_update=1;$opt_delete=0;
-$opt_flush=$opt_check=$opt_repair=$opt_alter=0;
-$opt_join_range=100;
+$opt_thread_factor=1;
+$opt_insert=1;
+$opt_select=6;$opt_join=4;
+$opt_select_count=$opt_join_count=0;
+$opt_update=1;$opt_delete=0;
+$opt_flush=$opt_check=$opt_repair=$opt_alter=0;
+$opt_join_range=100;
 $opt_resize_interval=0;
 $opt_time=0;
 $opt_host=$opt_user=$opt_password=""; $opt_db="test";
 $opt_verbose=$opt_debug=$opt_lock_tables=$opt_fast_insert=$opt_fast=$opt_skip_in=$opt_force=undef;  # Ignore warnings from these
 
-GetOptions("host=s","db=s","user=s","password=s","loop-count=i","skip-create","skip-in","skip-drop",
-           "verbose","fast-insert","lock-tables","debug","fast","force","thread-factor=i",
-		   "insert=i", "select=i", "join=i", "select-count=i", "join-count=i", "update=i", "delete=i",
+GetOptions("host=s","db=s","user=s","password=s","loop-count=i","skip-create","skip-in","skip-drop",
+           "verbose","fast-insert","lock-tables","debug","fast","force","thread-factor=i",
+		   "insert=i", "select=i", "join=i", "select-count=i", "join-count=i", "update=i", "delete=i",
 		   "flush=i", "check=i", "repair=i", "alter=i", "resize-interval=i", "max-join_range=i", "time=i") || die "Aborted";
 
 print "Test of multiple connections that test the following things:\n";
@@ -48,20 +48,20 @@ srand 100;			# Make random numbers repea
 
 ####
 ####  Start timeing and start test
-####
-
+####
+
 $opt_insert*=$opt_thread_factor;
-$opt_select*=$opt_thread_factor;
-$opt_join*=$opt_thread_factor;
-$opt_select_count*=$opt_thread_factor;
-$opt_join_count*=$opt_thread_factor;
-$opt_update*=$opt_thread_factor;
-$opt_delete*=$opt_thread_factor;
-
-if ($opt_time == 0 && $opt_insert == 0)
-{
-  $opt_insert=1;
-}
+$opt_select*=$opt_thread_factor;
+$opt_join*=$opt_thread_factor;
+$opt_select_count*=$opt_thread_factor;
+$opt_join_count*=$opt_thread_factor;
+$opt_update*=$opt_thread_factor;
+$opt_delete*=$opt_thread_factor;
+
+if ($opt_time == 0 && $opt_insert == 0)
+{
+  $opt_insert=1;
+}
 
 $start_time=new Benchmark;
 $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host",
@@ -100,71 +100,71 @@ $|= 1;				# Autoflush
 ####
 #### Start the tests
 ####
-if ($opt_time != 0)
-{
-	test_abort() if (($pid=fork()) == 0); $work{$pid}="abort";
+if ($opt_time != 0)
+{
+	test_abort() if (($pid=fork()) == 0); $work{$pid}="abort";
 }
 for ($i=0 ; $i < $opt_insert ; $i ++)
 {
   test_insert() if (($pid=fork()) == 0); $work{$pid}="insert";
-}
+}
 $threads=$i;
-for ($i=0 ; $i < $opt_select ; $i ++)
-{
-  test_select() if (($pid=fork()) == 0); $work{$pid}="select";
-}
-$threads+=$i;
-for ($i=0 ; $i < $opt_join ; $i ++)
-{
-  test_join() if (($pid=fork()) == 0); $work{$pid}="join";
-}
-$threads+=$i;
+for ($i=0 ; $i < $opt_select ; $i ++)
+{
+  test_select() if (($pid=fork()) == 0); $work{$pid}="select";
+}
+$threads+=$i;
+for ($i=0 ; $i < $opt_join ; $i ++)
+{
+  test_join() if (($pid=fork()) == 0); $work{$pid}="join";
+}
+$threads+=$i;
 for ($i=0 ; $i < $opt_select_count ; $i ++)
 {
   test_select_count() if (($pid=fork()) == 0); $work{$pid}="select_count";
 }
-$threads+=$i;
-for ($i=0 ; $i < $opt_join_count ; $i ++)
-{
-  test_join_count() if (($pid=fork()) == 0); $work{$pid}="join_count";
-}
-$threads+=$i;
-for ($i=0 ; $i < $opt_update ; $i ++)
-{
-  test_update() if (($pid=fork()) == 0); $work{$pid}="update";
-}
-$threads+=$i;
-for ($i=0 ; $i < $opt_delete ; $i ++)
-{
-  test_delete() if (($pid=fork()) == 0); $work{$pid}="delete";
-}
-$threads+=$i;
-for ($i=0 ; $i < $opt_flush ; $i ++)
-{
-  test_flush() if (($pid=fork()) == 0); $work{$pid}="flush";
-}
-$threads+=$i;
-for ($i=0 ; $i < $opt_check ; $i ++)
-{
-  test_check() if (($pid=fork()) == 0); $work{$pid}="check";
-}
-$threads+=$i;
-for ($i=0 ; $i < $opt_repair ; $i ++)
-{
-  test_repair() if (($pid=fork()) == 0); $work{$pid}="repair";
-}
-$threads+=$i;
-for ($i=0 ; $i < $opt_alter ; $i ++)
-{
-  test_alter() if (($pid=fork()) == 0); $work{$pid}="alter";
-}
-$threads+=$i;
+$threads+=$i;
+for ($i=0 ; $i < $opt_join_count ; $i ++)
+{
+  test_join_count() if (($pid=fork()) == 0); $work{$pid}="join_count";
+}
+$threads+=$i;
+for ($i=0 ; $i < $opt_update ; $i ++)
+{
+  test_update() if (($pid=fork()) == 0); $work{$pid}="update";
+}
+$threads+=$i;
+for ($i=0 ; $i < $opt_delete ; $i ++)
+{
+  test_delete() if (($pid=fork()) == 0); $work{$pid}="delete";
+}
+$threads+=$i;
+for ($i=0 ; $i < $opt_flush ; $i ++)
+{
+  test_flush() if (($pid=fork()) == 0); $work{$pid}="flush";
+}
+$threads+=$i;
+for ($i=0 ; $i < $opt_check ; $i ++)
+{
+  test_check() if (($pid=fork()) == 0); $work{$pid}="check";
+}
+$threads+=$i;
+for ($i=0 ; $i < $opt_repair ; $i ++)
+{
+  test_repair() if (($pid=fork()) == 0); $work{$pid}="repair";
+}
+$threads+=$i;
+for ($i=0 ; $i < $opt_alter ; $i ++)
+{
+  test_alter() if (($pid=fork()) == 0); $work{$pid}="alter";
+}
+$threads+=$i;
 if ($opt_resize_interval != 0)
 {
   test_resize() if (($pid=fork()) == 0); $work{$pid}="resize";
   $threads+=1;
 }
-
+
 print "Started $threads threads\n";
 
 $errors=0;
@@ -172,17 +172,17 @@ $running_insert_threads=$opt_insert;
 while (($pid=wait()) != -1)
 {
   $ret=$?/256;
-  print "thread '" . $work{$pid} . "' finished with exit code $ret\n";
-  if ($opt_time == 0)
+  print "thread '" . $work{$pid} . "' finished with exit code $ret\n";
+  if ($opt_time == 0)
   {
     if ($work{$pid} =~ /^insert/)
     {
       if (!--$running_insert_threads)
-      {
-
+      {
+
         # Time to stop other threads
         signal_abort();
-      }
+      }
 	}
   }
   $errors++ if ($ret != 0);
@@ -214,17 +214,17 @@ print "Total time: " .
 
 exit(0);
 
-#
-# Sleep and then abort other threads
-#
-
-sub test_abort
-{
-  sleep($opt_time);
-  signal_abort();
-  exit(0);
-}
-
+#
+# Sleep and then abort other threads
+#
+
+sub test_abort
+{
+  sleep($opt_time);
+  signal_abort();
+  exit(0);
+}
+
 
 #
 # Insert records in the table
@@ -363,58 +363,58 @@ sub test_join
   $dbh->disconnect; $dbh=0;
   print "Test_join: Executed $count joins\n";
   exit(0);
-}
-
-#
-# select records
-# Do continously joins between the first and second for range and count selected rows
-#
-
-sub test_join_count
-{
-  my ($dbh, $i, $j, $count, $loop);
-
-  $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host",
-		      $opt_user, $opt_password,
-		    { PrintError => 0}) || die $DBI::errstr;
-
-  $count_query=make_count_query($numtables);
-  $count=0;
-  $loop=9999;
-  $sum=0;
-
-  srand();
-
-  $i=0;
-  while (($i++ % 10) || !test_if_abort($dbh))
-  {
-    if ($loop++ >= 10)
-    {
-      $loop=0;
-      $row_counts=simple_query($dbh, $count_query);
-    }
-    for ($j=0 ; $j < $numtables-1 ; $j++)
-    {
-      my ($id1)= int rand $row_counts->[$j];
-      my ($id2)= int rand $row_counts->[$j];
-	  if ($id1 > $id2)
-	  {
-	    my $id0=$id1; $id1=$id2; $id2=$id0;
-		if ($id2-$id1 > $opt_join_range)
-		{
-		  $id2=$id1+$opt_join_range;
-		}
-	  }
-      my ($t1,$t2)= ($testtables[$j]->[0],$testtables[$j+1]->[0]);
-      $row=simple_query($dbh, "select count(*) from $t1, $t2 where $t1.id=$t2.id and $t1.id between $id1 and $id2");
-      $sum+=$row->[0];
-      $count++;
-    }
-  }
-  $dbh->disconnect; $dbh=0;
-  print "Test_join_count: Executed $count joins: total $sum rows\n";
-  exit(0);
-}
+}
+
+#
+# select records
+# Do continously joins between the first and second for range and count selected rows
+#
+
+sub test_join_count
+{
+  my ($dbh, $i, $j, $count, $loop);
+
+  $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host",
+		      $opt_user, $opt_password,
+		    { PrintError => 0}) || die $DBI::errstr;
+
+  $count_query=make_count_query($numtables);
+  $count=0;
+  $loop=9999;
+  $sum=0;
+
+  srand();
+
+  $i=0;
+  while (($i++ % 10) || !test_if_abort($dbh))
+  {
+    if ($loop++ >= 10)
+    {
+      $loop=0;
+      $row_counts=simple_query($dbh, $count_query);
+    }
+    for ($j=0 ; $j < $numtables-1 ; $j++)
+    {
+      my ($id1)= int rand $row_counts->[$j];
+      my ($id2)= int rand $row_counts->[$j];
+	  if ($id1 > $id2)
+	  {
+	    my $id0=$id1; $id1=$id2; $id2=$id0;
+		if ($id2-$id1 > $opt_join_range)
+		{
+		  $id2=$id1+$opt_join_range;
+		}
+	  }
+      my ($t1,$t2)= ($testtables[$j]->[0],$testtables[$j+1]->[0]);
+      $row=simple_query($dbh, "select count(*) from $t1, $t2 where $t1.id=$t2.id and $t1.id between $id1 and $id2");
+      $sum+=$row->[0];
+      $count++;
+    }
+  }
+  $dbh->disconnect; $dbh=0;
+  print "Test_join_count: Executed $count joins: total $sum rows\n";
+  exit(0);
+}
 
 
 #

    

sanja＠askmonty.org

tags

participants (1)