← Back to branch summary

~posulliv/drizzle/optimizer-style-cleanup

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Padraig O'Sullivan
  • Date: 2010-03-15 14:05:26 UTC
  • mfrom: (1237.9.99 staging)
  • Revision ID: osullivan.padraig@gmail.com-20100315140526-opbgwdwn6tfecdkq
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
151
151
our $lib_udf_example;
152
152
our $lib_example_plugin;
153
153
our $exe_libtool;
 
154
our $exe_schemawriter;
154
155
 
155
156
our $opt_bench= 0;
156
157
our $opt_small_bench= 0;
271
272
 
272
273
our $opt_max_save_core= 5;
273
274
my $num_saved_cores= 0;  # Number of core files saved in vardir/log/ so far.
274
 
our $mysql_port_offset= 50;
 
275
our $secondary_port_offset= 50;
275
276
 
276
277
######################################################################
277
278
#
923
924
 
924
925
  $master->[0]=
925
926
  {
926
 
   pid           => 0,
927
 
   type          => "master",
928
 
   idx           => 0,
929
 
   path_myddir   => "$opt_vardir/master-data",
930
 
   path_myerr    => "$opt_vardir/log/master.err",
931
 
   path_pid      => "$opt_vardir/run/master.pid",
932
 
   path_sock     => "$sockdir/master.sock",
933
 
   port          =>  $opt_master_myport,
934
 
   mysql_port    =>  $opt_master_myport + $mysql_port_offset,
935
 
   start_timeout =>  400, # enough time create innodb tables
936
 
   cluster       =>  0, # index in clusters list
937
 
   start_opts    => [],
 
927
   pid            => 0,
 
928
   type           => "master",
 
929
   idx            => 0,
 
930
   path_myddir    => "$opt_vardir/master-data",
 
931
   path_myerr     => "$opt_vardir/log/master.err",
 
932
   path_pid       => "$opt_vardir/run/master.pid",
 
933
   path_sock      => "$sockdir/master.sock",
 
934
   port           =>  $opt_master_myport,
 
935
   secondary_port =>  $opt_master_myport + $secondary_port_offset,
 
936
   start_timeout  =>  400, # enough time create innodb tables
 
937
   cluster        =>  0, # index in clusters list
 
938
   start_opts     => [],
938
939
  };
939
940
 
940
941
  $master->[1]=
941
942
  {
942
 
   pid           => 0,
943
 
   type          => "master",
944
 
   idx           => 1,
945
 
   path_myddir   => "$opt_vardir/master1-data",
946
 
   path_myerr    => "$opt_vardir/log/master1.err",
947
 
   path_pid      => "$opt_vardir/run/master1.pid",
948
 
   path_sock     => "$sockdir/master1.sock",
949
 
   port          => $opt_master_myport + 1,
950
 
   mysql_port    => $opt_master_myport + 1 + $mysql_port_offset,
951
 
   start_timeout => 400, # enough time create innodb tables
952
 
   cluster       =>  0, # index in clusters list
953
 
   start_opts    => [],
 
943
   pid            => 0,
 
944
   type           => "master",
 
945
   idx            => 1,
 
946
   path_myddir    => "$opt_vardir/master1-data",
 
947
   path_myerr     => "$opt_vardir/log/master1.err",
 
948
   path_pid       => "$opt_vardir/run/master1.pid",
 
949
   path_sock      => "$sockdir/master1.sock",
 
950
   port           => $opt_master_myport + 1,
 
951
   secondary_port => $opt_master_myport + 1 + $secondary_port_offset,
 
952
   start_timeout  => 400, # enough time create innodb tables
 
953
   cluster        =>  0, # index in clusters list
 
954
   start_opts     => [],
954
955
  };
955
956
 
956
957
  $slave->[0]=
957
958
  {
958
 
   pid           => 0,
959
 
   type          => "slave",
960
 
   idx           => 0,
961
 
   path_myddir   => "$opt_vardir/slave-data",
962
 
   path_myerr    => "$opt_vardir/log/slave.err",
963
 
   path_pid      => "$opt_vardir/run/slave.pid",
964
 
   path_sock     => "$sockdir/slave.sock",
965
 
   port          => $opt_slave_myport,
966
 
   mysql_port    => $opt_slave_myport + $mysql_port_offset,
967
 
   start_timeout => 400,
968
 
 
969
 
   cluster       =>  1, # index in clusters list
970
 
   start_opts    => [],
 
959
   pid            => 0,
 
960
   type           => "slave",
 
961
   idx            => 0,
 
962
   path_myddir    => "$opt_vardir/slave-data",
 
963
   path_myerr     => "$opt_vardir/log/slave.err",
 
964
   path_pid       => "$opt_vardir/run/slave.pid",
 
965
   path_sock      => "$sockdir/slave.sock",
 
966
   port           => $opt_slave_myport,
 
967
   secondary_port => $opt_slave_myport + $secondary_port_offset,
 
968
   start_timeout  => 400,
 
969
   cluster        =>  1, # index in clusters list
 
970
   start_opts     => [],
971
971
  };
972
972
 
973
973
  $slave->[1]=
974
974
  {
975
 
   pid           => 0,
976
 
   type          => "slave",
977
 
   idx           => 1,
978
 
   path_myddir   => "$opt_vardir/slave1-data",
979
 
   path_myerr    => "$opt_vardir/log/slave1.err",
980
 
   path_pid      => "$opt_vardir/run/slave1.pid",
981
 
   path_sock     => "$sockdir/slave1.sock",
982
 
   port          => $opt_slave_myport + 1,
983
 
   mysql_port    => $opt_slave_myport + 1 + $mysql_port_offset,
984
 
   start_timeout => 300,
985
 
   cluster       =>  -1, # index in clusters list
986
 
   start_opts    => [],
 
975
   pid            => 0,
 
976
   type           => "slave",
 
977
   idx            => 1,
 
978
   path_myddir    => "$opt_vardir/slave1-data",
 
979
   path_myerr     => "$opt_vardir/log/slave1.err",
 
980
   path_pid       => "$opt_vardir/run/slave1.pid",
 
981
   path_sock      => "$sockdir/slave1.sock",
 
982
   port           => $opt_slave_myport + 1,
 
983
   secondary_port => $opt_slave_myport + 1 + $secondary_port_offset,
 
984
   start_timeout  => 300,
 
985
   cluster        =>  -1, # index in clusters list
 
986
   start_opts     => [],
987
987
  };
988
988
 
989
989
  $slave->[2]=
990
990
  {
991
 
   pid           => 0,
992
 
   type          => "slave",
993
 
   idx           => 2,
994
 
   path_myddir   => "$opt_vardir/slave2-data",
995
 
   path_myerr    => "$opt_vardir/log/slave2.err",
996
 
   path_pid      => "$opt_vardir/run/slave2.pid",
997
 
   path_sock     => "$sockdir/slave2.sock",
998
 
   port          => $opt_slave_myport + 2,
999
 
   mysql_port    => $opt_slave_myport + 2 + $mysql_port_offset,
1000
 
   start_timeout => 300,
1001
 
   cluster       =>  -1, # index in clusters list
1002
 
   start_opts    => [],
 
991
   pid            => 0,
 
992
   type           => "slave",
 
993
   idx            => 2,
 
994
   path_myddir    => "$opt_vardir/slave2-data",
 
995
   path_myerr     => "$opt_vardir/log/slave2.err",
 
996
   path_pid       => "$opt_vardir/run/slave2.pid",
 
997
   path_sock      => "$sockdir/slave2.sock",
 
998
   port           => $opt_slave_myport + 2,
 
999
   secondary_port => $opt_slave_myport + 2 + $secondary_port_offset,
 
1000
   start_timeout  => 300,
 
1001
   cluster        =>  -1, # index in clusters list
 
1002
   start_opts     => [],
1003
1003
  };
1004
1004
 
1005
1005
 
1257
1257
     }
1258
1258
  }
1259
1259
 
 
1260
# Look for schema_writer
 
1261
  {
 
1262
    $exe_schemawriter= mtr_exe_exists("$glob_basedir/drizzled/message/schema_writer",
 
1263
                                      "$glob_builddir/drizzled/message/schema_writer");
 
1264
  }
 
1265
 
1260
1266
# Look for drizzletest executable
1261
1267
  {
1262
1268
    $exe_drizzletest= mtr_exe_exists("$path_client_bindir/drizzletest");
1440
1446
  # ----------------------------------------------------
1441
1447
  my $cmdline_mysqldump= generate_cmdline_mysqldump($master->[0]);
1442
1448
  my $cmdline_mysqldumpslave= generate_cmdline_mysqldump($slave->[0]);
1443
 
  my $cmdline_mysqldumpmysql= mtr_native_path($exe_drizzledump) .
 
1449
  my $cmdline_mysqldump_secondary= mtr_native_path($exe_drizzledump) .
1444
1450
       " --no-defaults -uroot " .
1445
 
       "--mysql --port=$master->[0]->{'mysql_port'} ";
 
1451
       " --port=$master->[0]->{'secondary_port'} ";
1446
1452
 
1447
1453
  if ( $opt_debug )
1448
1454
  {
1450
1456
      " --debug=d:t:A,$path_vardir_trace/log/mysqldump-master.trace";
1451
1457
    $cmdline_mysqldumpslave .=
1452
1458
      " --debug=d:t:A,$path_vardir_trace/log/mysqldump-slave.trace";
1453
 
    $cmdline_mysqldumpmysql .=
 
1459
    $cmdline_mysqldump_secondary .=
1454
1460
      " --debug=d:t:A,$path_vardir_trace/log/mysqldump-mysql.trace";
1455
1461
  }
1456
1462
  $ENV{'DRIZZLE_DUMP'}= $cmdline_mysqldump;
1457
1463
  $ENV{'DRIZZLE_DUMP_SLAVE'}= $cmdline_mysqldumpslave;
1458
 
  $ENV{'DRIZZLE_DUMP_MYSQL'}= $cmdline_mysqldumpmysql;
 
1464
  $ENV{'DRIZZLE_DUMP_SECONDARY'}= $cmdline_mysqldump_secondary;
1459
1465
 
1460
1466
  # ----------------------------------------------------
1461
1467
  # Setup env so childs can execute mysqlslap
1466
1472
      mtr_native_path($exe_drizzleslap) .
1467
1473
      " -uroot " .
1468
1474
      "--port=$master->[0]->{'port'} ";
1469
 
    my $cmdline_drizzleslapmysql=
 
1475
    my $cmdline_drizzleslap_secondary=
1470
1476
      mtr_native_path($exe_drizzleslap) .
1471
1477
      " -uroot " .
1472
 
      "--mysql --port=$master->[0]->{'mysql_port'} ";
 
1478
      " --port=$master->[0]->{'secondary_port'} ";
1473
1479
 
1474
1480
    if ( $opt_debug )
1475
1481
   {
1476
1482
      $cmdline_drizzleslap .=
1477
1483
        " --debug=d:t:A,$path_vardir_trace/log/drizzleslap.trace";
1478
 
      $cmdline_drizzleslapmysql .=
 
1484
      $cmdline_drizzleslap_secondary .=
1479
1485
        " --debug=d:t:A,$path_vardir_trace/log/drizzleslap.trace";
1480
1486
    }
1481
1487
    $ENV{'DRIZZLE_SLAP'}= $cmdline_drizzleslap;
1482
 
    $ENV{'DRIZZLE_SLAP_MYSQL'}= $cmdline_drizzleslapmysql;
 
1488
    $ENV{'DRIZZLE_SLAP_SECONDARY'}= $cmdline_drizzleslap_secondary;
1483
1489
  }
1484
1490
 
1485
1491
 
1507
1513
    mtr_native_path($exe_drizzle) .
1508
1514
    " --no-defaults --host=localhost  --user=root --password= " .
1509
1515
    "--port=$master->[0]->{'port'} ";
1510
 
  my $cmdline_drizzlemysql=
 
1516
  my $cmdline_drizzle_secondary=
1511
1517
    mtr_native_path($exe_drizzle) .
1512
1518
    " --no-defaults --host=localhost  --user=root --password= " .
1513
 
    "--mysql --port=$master->[0]->{'mysql_port'} ";
 
1519
    " --port=$master->[0]->{'secondary_port'} ";
1514
1520
 
1515
1521
  $ENV{'MYSQL'}= $cmdline_mysql;
1516
 
  $ENV{'DRIZZLE_MYSQL'}= $cmdline_drizzlemysql;
 
1522
  $ENV{'DRIZZLE_SECONDARY'}= $cmdline_drizzle_secondary;
1517
1523
 
1518
1524
  # ----------------------------------------------------
1519
1525
  # Setup env so childs can execute bug25714
1777
1783
  foreach my $data_dir (@data_dir_lst)
1778
1784
  {
1779
1785
    mkpath("$data_dir/mysql");
 
1786
    system("$exe_schemawriter mysql $data_dir/mysql/db.opt");
 
1787
 
1780
1788
    mkpath("$data_dir/test");
 
1789
    system("$exe_schemawriter test $data_dir/test/db.opt");
1781
1790
  }
1782
1791
 
1783
1792
  # Make a link std_data_ln in var/ that points to std_data
2480
2489
  # Increase default connect_timeout to avoid intermittent
2481
2490
  # disconnects when test servers are put under load
2482
2491
  # see BUG#28359
2483
 
  mtr_add_arg($args, "%s--drizzle-protocol-connect-timeout=60", $prefix);
 
2492
  mtr_add_arg($args, "%s--mysql-protocol-connect-timeout=60", $prefix);
2484
2493
 
2485
2494
 
2486
2495
  # When mysqld is run by a root user(euid is 0), it will fail
2493
2502
  mtr_add_arg($args, "%s--pid-file=%s", $prefix,
2494
2503
              $mysqld->{'path_pid'});
2495
2504
 
 
2505
  mtr_add_arg($args, "%s--mysql-protocol-port=%d", $prefix,
 
2506
              $mysqld->{'port'});
 
2507
 
2496
2508
  mtr_add_arg($args, "%s--drizzle-protocol-port=%d", $prefix,
2497
 
              $mysqld->{'port'});
2498
 
 
2499
 
  mtr_add_arg($args, "%s--mysql-protocol-port=%d", $prefix,
2500
 
              $mysqld->{'mysql_port'});
 
2509
              $mysqld->{'secondary_port'});
2501
2510
 
2502
2511
  mtr_add_arg($args, "%s--datadir=%s", $prefix,
2503
2512
              $mysqld->{'path_myddir'});