Hosting Provided By

[patch 7/8] ndb tests for win32

From: <stewart(at)flamingspork.com>
Date: Wed Sep 19 2007 - 03:46:48 EDT

ooo bzr diff -r1 -pa/:b/ ndb/test/ mysql-test/ |di -X Make
--- a/mysql-test/lib/mtr_misc.pl	2007-08-29 07:25:53 +0000
+++ b/mysql-test/lib/mtr_misc.pl	2007-09-11 10:44:51 +0000

@@ -72,7 +72,7 @@

# MySQL version before 5.0 still use cygwin, no need # to convert path
return $path
- if ($::mysql_version_id < 50000);
+ if ($::mysql_version_id < 50000 || $::glob_cygwin_perl);

$path=~ s/\//\\/g
if ($::glob_win32);

a/mysql-test/lib/mtr_process.pl 2007-08-29 07:25:53 +0000 +++ b/mysql-test/lib/mtr_process.pl 2007-09-06 13:30:39 +0000
@@ -359,7 +359,7 @@
"socket: '$srv->{path_sock}'; ". "port: $srv->{port})");
- my $pid= mtr_mysqladmin_start($srv, "shutdown", 70); + my $pid= mtr_mysqladmin_start($srv, "shutdown", 3);

     # Save the pid of the mysqladmin process
     $admin_pids{$pid}= 1;

@@ -375,11 +375,13 @@

if ( ! $::opt_skip_ndbcluster )
{
- # Start shutdown of clusters.
- mtr_debug("Shutting down cluster...");

     foreach my $cluster (@{$::clusters})
     {
+
+      # Don't shut down a "running" cluster
+      next if $cluster->{'use_running'};
+
       mtr_debug("  - cluster " .
 		"(pid: $cluster->{pid}; " .
 		"pid file: '$cluster->{path_pid})");

--- a/mysql-test/mysql-test-run.pl	2007-08-29 07:25:53 +0000
+++ b/mysql-test/mysql-test-run.pl	2007-09-13 15:21:41 +0000

@@ -104,8 +104,6 @@

 our $glob_hostname=               undef;
 our $glob_scriptname=             undef;
 our $glob_timers=                 undef;
-our $glob_use_running_ndbcluster= 0;
-our $glob_use_running_ndbcluster_slave= 0;

our $glob_use_embedded_server= 0;
our @glob_test_mode;

@@ -479,7 +477,9 @@

my $opt_comment;

   $opt_master_myport=          9306;
-  $opt_slave_myport=           9308;
+# $opt_slave_myport=           9308;
+# with the default 3 slaves, the 3rd is 9310, which conflicts with ndbcluster_port
+  $opt_slave_myport=           9328;
   $opt_ndbcluster_port=        9310;
   $opt_ndbcluster_port_slave=  9311;
   $im_port=                    9312;

@@ -924,40 +924,6 @@

}

   # --------------------------------------------------------------------------
-  # Ndb cluster flags
-  # --------------------------------------------------------------------------
-
-  if ( $opt_ndbconnectstring )
-  {
-    $glob_use_running_ndbcluster= 1;
-    mtr_error("Can't specify --ndb-connectstring and --skip-ndbcluster")
-      if $opt_skip_ndbcluster;
-    mtr_error("Can't specify --ndb-connectstring and --ndbcluster-port")
-      if $opt_ndbcluster_port;
-  }
-  else
-  {
-    # Set default connect string
-    $opt_ndbconnectstring= "host=localhost:$opt_ndbcluster_port";
Do you need help? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
-  }
-
-  if ( $opt_ndbconnectstring_slave )
-  {
-      $glob_use_running_ndbcluster_slave= 1;
-      mtr_error("Can't specify ndb-connectstring_slave and " .
-		"--skip-ndbcluster-slave")
-	if $opt_skip_ndbcluster;
-      mtr_error("Can't specify --ndb-connectstring-slave and " .
-		"--ndbcluster-port-slave")
-	if $opt_ndbcluster_port_slave;
-  }
-  else
-  {
-    # Set default connect string
-    $opt_ndbconnectstring_slave= "host=localhost:$opt_ndbcluster_port_slave";
-  }

-  # --------------------------------------------------------------------------

# Bench flags

   # --------------------------------------------------------------------------

if ( $opt_small_bench )
@@ -1200,7 +1166,7 @@

    nodes           => 2,
    port            => "$opt_ndbcluster_port",
    data_dir        => "$data_dir",
-   connect_string  => "$opt_ndbconnectstring",
+   connect_string  => "host=localhost:$opt_ndbcluster_port",
    path_pid        => "$data_dir/ndb_3.pid", # Nodes + 1
    pid             => 0, # pid of ndb_mgmd
    installed_ok    => 0,

@@ -1213,7 +1179,7 @@

    nodes           => 1,
    port            => "$opt_ndbcluster_port_slave",
    data_dir        => "$data_dir",
-   connect_string  => "$opt_ndbconnectstring_slave",
+   connect_string  => "host=localhost:$opt_ndbcluster_port_slave",
    path_pid        => "$data_dir/ndb_2.pid", # Nodes + 1
    pid             => 0, # pid of ndb_mgmd

installed_ok => 0,
@@ -1235,6 +1201,9 @@

Do you need more help?

}
}

+  # --------------------------------------------------------------------------

+ # extern

+  # --------------------------------------------------------------------------

   if ( $opt_extern )
   {
     # Turn off features not supported when running with extern server
@@ -1251,6 +1220,38 @@

if $opt_socket;
}

+
+  # --------------------------------------------------------------------------
+  # ndbconnectstring and ndbconnectstring_slave
+  # --------------------------------------------------------------------------
+  if ( $opt_ndbconnectstring )
+  {
Can we help you? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
+    # ndbconnectstring was supplied by user, the tests shoudl be run
+    # against an already started cluster, change settings
+    my $cluster= $clusters->[0]; # Master cluster
+    $cluster->{'connect_string'}= $opt_ndbconnectstring;
+    $cluster->{'use_running'}= 1;
+
+    mtr_error("Can't specify --ndb-connectstring and --skip-ndbcluster")
+      if $opt_skip_ndbcluster;
+  }
+  $ENV{'NDB_CONNECTSTRING'}= $clusters->[0]->{'connect_string'};
+
+
+  if ( $opt_ndbconnectstring_slave )
+  {
+    # ndbconnectstring-slave was supplied by user, the tests should be run
+    # agains an already started slave cluster, change settings
+    my $cluster= $clusters->[1]; # Slave cluster
+    $cluster->{'connect_string'}= $opt_ndbconnectstring_slave;
+    $cluster->{'use_running'}= 1;
+
+    mtr_error("Can't specify ndb-connectstring_slave and " .
+	      "--skip-ndbcluster-slave")
+      if $opt_skip_ndbcluster_slave;
+  }
+
+
   $path_timefile=  "$opt_vardir/log/mysqltest-time";

$path_mysqltest_log= "$opt_vardir/log/mysqltest.log"; $path_current_test_log= "$opt_vardir/log/current_test";
@@ -1467,23 +1468,28 @@

   my $ndb_path= mtr_file_exists("$glob_basedir/ndb",
 				"$glob_basedir/storage/ndb",
 				"$glob_basedir/bin");

+  my $ndb_rel= $ndb_path;
+  $ndb_rel=~ s/^$glob_basedir\///;
+

$exe_ndbd=
- mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd", - "$ndb_path/ndbd");
+ mtr_exe_maybe_exists(vs_config_dirs("$ndb_rel/src/kernel","ndbd"), + "$ndb_path/src/kernel/ndbd");

$exe_ndb_mgm=
- mtr_exe_maybe_exists("$ndb_path/src/mgmclient/ndb_mgm", - "$ndb_path/ndb_mgm");
+ mtr_exe_maybe_exists(vs_config_dirs("$ndb_rel/src/mgmclient","ndb_mgm"), + "$ndb_path/src/mgmclient/ndb_mgm");

$exe_ndb_mgmd=
- mtr_exe_maybe_exists("$ndb_path/src/mgmsrv/ndb_mgmd", - "$ndb_path/ndb_mgmd");
+ mtr_exe_maybe_exists(vs_config_dirs("$ndb_rel/src/mgmsrv","ndb_mgmd"), + "$ndb_path/src/mgmsrv/ndb_mgmd");

$exe_ndb_waiter=
- mtr_exe_maybe_exists("$ndb_path/tools/ndb_waiter", + mtr_exe_maybe_exists(vs_config_dirs("$ndb_rel/tools","ndb_waiter"),

+			 "$ndb_path/tools/ndb_waiter",
 			 "$ndb_path/ndb_waiter");

# May not exist

-  $path_ndb_tools_dir= mtr_file_exists("$ndb_path/tools",
+  $path_ndb_tools_dir= mtr_file_exists("$ndb_path/tools/debug",
+                                       "$ndb_path/tools",
 				       "$ndb_path");

+ print "NDB_TOOLS $path_ndb_tools_dir\n";

Can't find what you're looking for?

   # May not exist
   $path_ndb_examples_dir=
     mtr_file_exists("$ndb_path/ndbapi-examples",
@@ -1491,7 +1497,6 @@

   # May not exist
   $exe_ndb_example=
     mtr_file_exists("$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple"); -

return ( $exe_ndbd eq "" or

 	   $exe_ndb_mgm eq "" or
 	   $exe_ndb_mgmd eq "" or

@@ -1866,7 +1871,6 @@

     $ENV{'NDB_DATA_DIR'}=             $clusters->[0]->{'data_dir'};
     $ENV{'NDB_TOOLS_DIR'}=            $path_ndb_tools_dir;
     $ENV{'NDB_TOOLS_OUTPUT'}=         $path_ndb_testrun_log;
-    $ENV{'NDB_CONNECTSTRING'}=        $opt_ndbconnectstring;
 
     if ( $mysql_version_id >= 50000 )
Don't know where to look next? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
     {

@@ -2436,7 +2440,8 @@

     return ("$glob_basedir/$path_part/$opt_vs_config/$exe");

}

return ("$glob_basedir/$path_part/release/$exe", + return ("/cygdrv/c/bin/svc/$exe", + "$glob_basedir/$path_part/release/$exe", "$glob_basedir/$path_part/relwithdebinfo/$exe", "$glob_basedir/$path_part/debug/$exe"); }
@@ -2709,7 +2714,7 @@

mtr_verbose("ndbcluster_start '$cluster->{'name'}'");

if ( $glob_use_running_ndbcluster ) + if ( $cluster->{'use_running'} ) { return 0; }
@@ -2929,30 +2934,34 @@

my $cluster_started_ok= 1; # Assume it can be started

if ($opt_skip_ndbcluster || $glob_use_running_ndbcluster ||
$clusters->[0]->{executable_setup_failed}) + my $cluster= $clusters->[0]; # Master cluster + if ($opt_skip_ndbcluster || + $cluster->{'use_running'} || + $cluster->{executable_setup_failed}) { # Don't install master cluster }
elsif (ndbcluster_start_install($clusters->[0])) + elsif (ndbcluster_start_install($cluster)) {
mtr_warning("Failed to start install of $clusters->[0]->{name}"); + mtr_warning("Failed to start install of $cluster->{name}"); $cluster_started_ok= 0; }

+ $cluster= $clusters->[1]; # Slave cluster

   if ($max_slave_num == 0 ||
-      $opt_skip_ndbcluster_slave || $glob_use_running_ndbcluster_slave ||
-      $clusters->[1]->{executable_setup_failed})
+      $opt_skip_ndbcluster_slave ||
+      $cluster->{'use_running'} ||
+      $cluster->{executable_setup_failed})
   {
     # Don't install slave cluster

}
- elsif (ndbcluster_start_install($clusters->[1])) + elsif (ndbcluster_start_install($cluster))

{
- mtr_warning("Failed to start install of $clusters->[1]->{name}"); + mtr_warning("Failed to start install of $cluster->{name}");

$cluster_started_ok= 0;
}

foreach my $cluster (@{$clusters}) + foreach $cluster (@{$clusters}) {

Confused? Frustrated?

next if !$cluster->{'pid'};
@@ -3227,9 +3236,16 @@

{

     foreach my $cluster (@{$clusters})
     {
+      # Slave cluster is skipped and thus not
+      # installed, no need to perform checks
       last if ($opt_skip_ndbcluster_slave and
 	       $cluster->{'name'} eq 'Slave');
 
+      # Using running cluster - no need
+      # to check if test should be skipped
+      # will be done by test itself
+      last if ($cluster->{'use_running'});
+
       # If test needs this cluster, check binaries was found ok
       if ( $cluster->{'executable_setup_failed'} )
       {

@@ -3827,8 +3843,9 @@

     }
 
     my $cluster= $clusters->[$mysqld->{'cluster'}];
+
     if ( $opt_skip_ndbcluster ||
-	 !$cluster->{'pid'})
+	 (!$cluster->{'pid'} && !$cluster->{'use_running'}))
     {
       mtr_add_arg($args, "%s--skip-ndbcluster", $prefix);
     }

@@ -4469,7 +4486,8 @@

}

if ( $clusters->[0]->{'pid'} and ! $master->[1]->{'pid'} and + if ( $clusters->[0]->{'pid'} || $clusters->[0]->{'use_running'} + and ! $master->[1]->{'pid'} and $tinfo->{'master_num'} > 1 ) { # Test needs cluster, start an extra mysqld connected to cluster
@@ -4676,7 +4694,8 @@
mtr_init_args(\$args);

   mtr_add_arg($args, "--no-defaults");
-  mtr_add_arg($args, "--silent");
+ # mtr_add_arg($args, "--silent");
+  mtr_add_arg($args, "-v");
   mtr_add_arg($args, "--skip-safemalloc");

mtr_add_arg($args, "--tmpdir=%s", $opt_tmpdir); mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir);

a/mysql-test/t/ndb_autodiscover.test 2007-08-29 07:25:53 +0000 +++ b/mysql-test/t/ndb_autodiscover.test 2007-09-06 13:30:46 +0000
@@ -200,7 +200,8 @@
select * from t4;

# Remove the table from NDB
-system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 >> $NDB_TOOLS_OUTPUT ; +--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 >> $NDB_TOOLS_OUTPUT +#-c $NDB_CONNECTSTRING

#
# Test that correct error is returned
@@ -221,7 +222,7 @@

select * from t4;

--error 1146
select * from t4;
@@ -253,7 +254,7 @@

flush tables;

Call Pantek today for Open Source Technical Support at 1-877-546-8934 - 24/7/365

SHOW TABLES;
@@ -287,8 +288,8 @@

insert into t9 values (9);

# Remove t3, t5 from NDB

-system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 >> $NDB_TOOLS_OUTPUT ;
-system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 >> $NDB_TOOLS_OUTPUT ;
+--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 >> $NDB_TOOLS_OUTPUT
+--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 >> $NDB_TOOLS_OUTPUT

# Remove t6, t7 from disk
system rm $MYSQLTEST_VARDIR/master-data/test/t6.frm > /dev/null ; system rm $MYSQLTEST_VARDIR/master-data/test/t7.frm > /dev/null ;
@@ -329,8 +330,8 @@

insert into t9 values (9);

# Remove t3, t5 from NDB

-system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 > /dev/null  ;
Do you need help? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
-system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 > /dev/null  ;
+--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 > /dev/null 
+--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 > /dev/null

# Remove t6, t7 from disk
system rm $MYSQLTEST_VARDIR/master-data/test/t6.frm > /dev/null ; system rm $MYSQLTEST_VARDIR/master-data/test/t7.frm > /dev/null ;
@@ -485,12 +486,12 @@

use test_only_ndb_tables;
create table t1 (a int primary key) engine=ndb; select * from t1;

---exec $NDB_MGM --no-defaults -e "all restart -n" > /dev/null
---exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults --not-started > /dev/null
+--exec $NDB_MGM --no-defaults -e "all restart -n"  > /dev/null
+--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults --not-started  > /dev/null
 --error 1015

select * from t1;

---exec $NDB_MGM --no-defaults -e "all start" > /dev/null
---exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null
+--exec $NDB_MGM --no-defaults -e "all start"  > /dev/null
+--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults  > /dev/null

use test;
drop database test_only_ndb_tables;

@@ -543,6 +544,6 @@

insert into t10 values (1, 'kalle');

---exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test `$NDB_TOOLS_DIR/ndb_show_tables --no-defaults | grep BLOB` >> $NDB_TOOLS_OUTPUT 2>&1 || true +--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test `$NDB_TOOLS_DIR/ndb_show_tables --no-defaults | grep BLOB |tr -d \\\r` >> $NDB_TOOLS_OUTPUT 2>&1 || true

# End of 4.1 tests

a/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp 2007-08-29 07:25:53 +0000 +++ b/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp 2007-09-06 13:30:52 +0000
@@ -488,7 +488,7 @@
now = ::time((time_t*)NULL); tm_now = ::gmtime(&now);
- ::snprintf(buf, 128, + BaseString::snprintf(buf, 128, "%d-%.2d-%.2d %.2d:%.2d:%.2d", tm_now->tm_year + 1900, tm_now->tm_mon,
a/ndb/test/ndbapi/bench/ndb_error.hpp 2007-08-29 07:25:53 +0000 +++ b/ndb/test/ndbapi/bench/ndb_error.hpp 2007-09-06 13:30:52 +0000
@@ -36,7 +36,7 @@
const struct NdbError & error){

char buf[100];
- snprintf(buf, sizeof(buf), "subscriber = %.*s ", + BaseString::snprintf(buf, sizeof(buf), "subscriber = %.*s ",

 	  SUBSCRIBER_NUMBER_LENGTH, 
 	  td->transactionData.number);

ndbout << str << " " << error << endl

a/ndb/test/ndbapi/bench/userInterface.cpp 2007-08-29 07:25:53 +0000 +++ b/ndb/test/ndbapi/bench/userInterface.cpp 2007-09-06 13:30:52 +0000
@@ -657,8 +657,10 @@
int check; uint32 activeSessions = 0; Location l = 0; - ChangedBy changedBy; snprintf(changedBy, sizeof(changedBy), "ChangedBy"); - ChangedTime changedTime; snprintf(changedTime, sizeof(changedTime), "ChangedTime"); + ChangedBy changedBy; + ChangedTime changedTime; + BaseString::snprintf(changedBy, sizeof(changedBy), "ChangedBy"); + BaseString::snprintf(changedTime, sizeof(changedTime), "ChangedTime");

Do you need more help?

NdbConnection * MyTransaction = 0;
if(uh->pCurrTrans != 0){

a/ndb/test/ndbapi/flexBench.cpp 2007-08-29 07:25:53 +0000 +++ b/ndb/test/ndbapi/flexBench.cpp 2007-09-06 13:30:52 +0000
@@ -165,7 +165,7 @@
nodeid = p == 0 ? 0 : atoi(p); if ((statSock = socket(PF_INET, SOCK_STREAM, 0)) < 0) { if (statState != statError) { - ndbout_c("stat: create socket failed: %s", strerror(errno)); + ndbout_c("stat: create socket failed: %s", strerror(socket_errno)); statState = statError; } (void)NdbMutex_Unlock(&statMutex);
@@ -186,7 +186,7 @@
} if (connect(statSock, (struct sockaddr *)&saddr, sizeof(saddr)) < 0) { if (statState != statError) { - ndbout_c("stat: connect failed: %s", strerror(errno)); + ndbout_c("stat: connect failed: %s", strerror(socket_errno)); statState = statError; } (void)close(statSock);
@@ -224,9 +224,9 @@
sprintf(buf, "%d %s %d\n", nodeid, text, ops); int len = strlen(buf); // assume SIGPIPE already ignored - if (write(statSock, buf, len) != len) { + if (send(statSock, buf, len, 0) != len) { if (statState != statError) { - ndbout_c("stat: write failed: %s", strerror(errno)); + ndbout_c("stat: write failed: %s", strerror(socket_errno)); statState = statError; } (void)close(statSock);
a/ndb/test/ndbapi/flex_bench_mysql.cpp 2007-08-29 07:25:53 +0000 +++ b/ndb/test/ndbapi/flex_bench_mysql.cpp 2007-09-06 13:30:52 +0000
@@ -250,7 +250,7 @@
sprintf(buf, "%d %s %d\n", nodeid, text, ops); int len = strlen(buf); // assume SIGPIPE already ignored - if (write(statSock, buf, len) != len) { + if (send(statSock, buf, len, 0) != len) { if (statState != statError) { ndbout_c("stat: write failed: %s", strerror(errno)); statState = statError;
a/ndb/test/ndbapi/testMgm.cpp 2007-08-29 07:25:53 +0000 +++ b/ndb/test/ndbapi/testMgm.cpp 2007-09-06 13:30:52 +0000
@@ -177,7 +177,7 @@
ndb_mgm_set_connectstring(h, mgm); ndb_mgm_connect(h,0,0,0); int s= ndb_mgm_get_fd(h); - write(s,"get",3); + send(s,"get",3,0); ndb_mgm_disconnect(h); ndb_mgm_destroy_handle(&h); /** NOTE: WE CANNOT REALLY TEST ANYTHING in 5.0
@@ -187,6 +187,7 @@
*
- This is kept so that we can at least manually test easily */ + return 0; }
a/ndb/test/ndbapi/testOIBasic.cpp 2007-08-29 07:25:53 +0000 +++ b/ndb/test/ndbapi/testOIBasic.cpp 2007-09-06 13:30:52 +0000
@@ -142,6 +142,11 @@

// random ints

+#ifdef NDB_WIN32
+#define random() rand()
+#define srandom(SEED) srand(SEED)
+#endif
+

static unsigned
urandom(unsigned n)
{

a/ndb/test/ndbapi/testScanFilter.cpp 2007-08-29 07:25:53 +0000 +++ b/ndb/test/ndbapi/testScanFilter.cpp 2007-09-06 13:30:52 +0000
@@ -49,15 +49,7 @@
- there are six columns, 'i', 'j', 'k', 'l', 'm', 'n', and each on is equal to 1 or 1,
- Since each tuple should be unique in this case, then TUPLE_NUM = 2 power 6 = 64 */ -#ifdef _AIX -/* - IBM xlC_r breaks on the initialization with pow(): - "The expression must be an integral constant expression." -*/ -const int TUPLE_NUM = 64; -#else -const int TUPLE_NUM = (int)pow(2, COL_LEN-1); -#endif +const int TUPLE_NUM = 1<<(COL_LEN-1);

the recursive level of random scan filter, can
@@ -297,7 +289,7 @@
srand(num*time(NULL)); len = rand() % col_len + 1; change_col_order(); - snprintf(str, len+1, "%s", col_string); //len+1, including '\0' + BaseString::snprintf(str, len+1, "%s", col_string); //len+1, including '\0' return len; }

@@ -313,7 +305,7 @@

   len2 = get_rand_col_str(temp+len1);
   len = len1 + len2;
   temp[len] = 'x';
- snprintf(str, len+1+1, "%s", temp); //len+1, including '\0' + BaseString::snprintf(str, len+1+1, "%s", temp); //len+1, including '\0'

return len+1;
}

@@ -327,10 +319,10 @@

int replace_a_to_str(char *source, int pos, char *newstr) {
char temp[MAX_STR_LEN];

-  snprintf(temp, pos+1, "%s", source);
-  snprintf(temp+pos, strlen(newstr)+1, "%s", newstr);
-  snprintf(temp+pos+strlen(newstr), strlen(source)-pos, "%s", source+pos+1);
-  snprintf(source, strlen(temp)+1, "%s", temp); 
+  BaseString::snprintf(temp, pos+1, "%s", source);
+  BaseString::snprintf(temp+pos, strlen(newstr)+1, "%s", newstr);

+ BaseString::snprintf(temp+pos+strlen(newstr), strlen(source)-pos, "%s", source+pos+1); + BaseString::snprintf(source, strlen(temp)+1, "%s", temp);

return strlen(source);
}

Can we help you?

@@ -711,7 +703,7 @@

     col[i] = table->getColumn(COL_NAME[i]);
 	  if(!col[i]) 
     {
-      snprintf(tmp, 128, "Can't get column %s", COL_NAME[i]);
+      BaseString::snprintf(tmp, 128, "Can't get column %s", COL_NAME[i]);
       ERR_EXIT(dict, tmp);
     }

}
@@ -738,7 +730,7 @@

     rec[i] = scan->getValue(COL_NAME[i]);
 	  if(!rec[i]) 
     {
-      snprintf(tmp, 128, "Can't get rec of %s", COL_NAME[i]);
+      BaseString::snprintf(tmp, 128, "Can't get rec of %s", COL_NAME[i]);
       ERR_EXIT(scan, tmp);
     }

}

a/ndb/test/tools/transproxy.cpp 2007-08-29 07:25:53 +0000 +++ b/ndb/test/tools/transproxy.cpp 2007-09-06 13:30:53 +0000
@@ -217,7 +217,7 @@
int fd; while (1) { if ((fd = socket(PF_INET, SOCK_STREAM, 0)) == -1) { - fatal("%s: create client socket failed: %s", info, strerror(errno)); + fatal("%s: create client socket failed: %s", info, strerror(socket_errno)); } struct sockaddr_in servaddr; memset(&servaddr, 0, sizeof(servaddr));
@@ -231,8 +231,8 @@
#endif if (connect(fd, (struct sockaddr*)&servaddr, sizeof(servaddr)) == 0) break; - if (errno != ECONNREFUSED) { - fatal("%s: connect failed: %s", info, strerror(errno)); + if (socket_errno != SOCKET_ECONNREFUSED) { + fatal("%s: connect failed: %s", info, strerror(socket_errno)); } close(fd); NdbSleep_MilliSleep(100);
@@ -246,7 +246,7 @@
{ int servfd; if ((servfd = socket(PF_INET, SOCK_STREAM, 0)) == -1) { - fatal("%s: create server socket failed: %s", info, strerror(errno)); + fatal("%s: create server socket failed: %s", info, strerror(socket_errno)); } struct sockaddr_in servaddr; memset(&servaddr, 0, sizeof(servaddr));
@@ -256,14 +256,14 @@
const int on = 1; setsockopt(servfd, SOL_SOCKET, SO_REUSEADDR, (const char*)&on, sizeof(on)); if (bind(servfd, (struct sockaddr*) &servaddr, sizeof(servaddr)) == -1) { - fatal("%s: bind %d failed: %s", info, proxy, strerror(errno)); + fatal("%s: bind %d failed: %s", info, proxy, strerror(socket_errno)); } if (listen(servfd, 1) == -1) { - fatal("%s: listen %d failed: %s", info, proxy, strerror(errno)); + fatal("%s: listen %d failed: %s", info, proxy, strerror(socket_errno)); } int fd; if ((fd = accept(servfd, 0, 0)) == -1) { - fatal("%s: accept failed: %s", info, strerror(errno)); + fatal("%s: accept failed: %s", info, strerror(socket_errno)); } sockfd[1] = fd; close(servfd);

--
Stewart Smith
Can't find what you're looking for? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Received on Wed Sep 19 04:11:39 2007

This message: [ Message body ]
Next message: stewart(at)flamingspork.com: "[patch 6/8] non-kernel patches"
Previous message: stewart(at)flamingspork.com: "[patch 8/8] ndb tools for win32"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]

This archive was generated by hypermail 2.1.8 : Sun Oct 07 2007 - 09:32:47 EDT