List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:October 20 2011 7:58am
Subject:bzr push into mysql-5.5-cluster branch (jonas.oreland:3602 to 3604)
View as plain text  
 3604 Jonas Oreland	2011-10-20
      ndb - use "--system" in rqg_spj instead of "--exec" as the former doesnt buffer output

    modified:
      mysql-test/suite/ndb_big/rqg_spj.test
 3603 Jonas Oreland	2011-10-20
      ndb - use gawk on solaris

    modified:
      storage/ndb/test/rqg/parseargs.sh
      storage/ndb/test/rqg/run_rqg.sh
 3602 Jonas Oreland	2011-10-19
      ndb - kill compiler warnings - misc ndbapi tests warnings...

    modified:
      storage/ndb/test/include/NdbMgmd.hpp
      storage/ndb/test/ndbapi/testMgm.cpp
      storage/ndb/tools/ndb_index_stat.cpp
=== modified file 'mysql-test/suite/ndb_big/rqg_spj.test'
--- a/mysql-test/suite/ndb_big/rqg_spj.test	2011-10-17 18:51:52 +0000
+++ b/mysql-test/suite/ndb_big/rqg_spj.test	2011-10-20 07:57:41 +0000
@@ -20,7 +20,7 @@ create temporary table spj_counts_at_sta
 # Load simple.zz
 # -o => with "oj-extensions"
 --echo Calling: $LOAD_RQG -d simple.zz -o
---exec $LOAD_RQG -d simple.zz -o
+--system $LOAD_RQG -d simple.zz -o
 
 ##
 # run spj_test.yy for 3600 seconds
@@ -35,12 +35,12 @@ create temporary table spj_counts_at_sta
 #
 let $cmd = $RUN_RQG -g spj_test.yy -t 600;
 --echo Calling: $cmd (6 times)
---exec $cmd
---exec $cmd
---exec $cmd
---exec $cmd
---exec $cmd
---exec $cmd
+--system $cmd
+--system $cmd
+--system $cmd
+--system $cmd
+--system $cmd
+--system $cmd
 
 drop database spj_myisam;
 drop database spj_ndb;

=== modified file 'storage/ndb/test/rqg/parseargs.sh'
--- a/storage/ndb/test/rqg/parseargs.sh	2011-10-14 10:52:20 +0000
+++ b/storage/ndb/test/rqg/parseargs.sh	2011-10-20 07:56:31 +0000
@@ -177,18 +177,24 @@ mysql_exe="$EXE_MYSQL --show-warnings --
 mysqltest_exe="$EXE_MYSQLTEST --user=${user} --host=${host} --port=${port}"
 export RQG_HOME
 
-md5sum="md5sum"
 getepochtime="date +%s"
 if [ `uname` = "SunOS" ]
 then
     getepochtime="nawk 'BEGIN{print srand();}'"
 fi
 
+md5sum="md5sum"
 if [ `uname` = "SunOS" ]
 then
     md5sum="digest -a md5"
 fi
 
+awk_exe=awk
+if [ `uname` = "SunOS" ]
+then
+    awk_exe=gawk
+fi
+
 pre="spj"
 opre="$pre.$$"
 myisam_db="${pre}_myisam"

=== modified file 'storage/ndb/test/rqg/run_rqg.sh'
--- a/storage/ndb/test/rqg/run_rqg.sh	2011-10-14 11:36:51 +0000
+++ b/storage/ndb/test/rqg/run_rqg.sh	2011-10-20 07:56:31 +0000
@@ -61,7 +61,7 @@ EOF
 	$mysqltest_exe ${ndb_db} < $tmp >> ${opre}.$no.ndbpush.$i.txt
     done
 
-    cnt=`$md5sum ${opre}.$no.*.txt | awk '{ print $1;}' | sort | uniq | wc -l`
+    cnt=`$md5sum ${opre}.$no.*.txt | $awk_exe '{ print $1;}' | sort | uniq | wc -l`
     if [ $cnt -ne 1 ]
     then
 	echo -n "$no "
@@ -129,7 +129,7 @@ run_all() {
     md5s=""
     for f in $tmpfiles
     do
-	md5s="$md5s `$md5sum $f | awk '{ print $1;}'`"
+	md5s="$md5s `$md5sum $f | $awk_exe '{ print $1;}'`"
     done
 
     ###
@@ -185,7 +185,7 @@ do
 	echo "--eval set ndb_join_pushdown='\$NDB_JOIN_PUSHDOWN';"
 	echo "$ecp"
 	${gensql} --seed=$us --queries=$queries --dsn="$dsn:database=${myisam_db}" --grammar=$grammar | grep -v "#" |
-        awk '{ print "--sorted_result"; print "--error 0,233,1242,4006"; print; }'
+        $awk_exe '{ print "--sorted_result"; print "--error 0,233,1242,4006"; print; }'
 	echo "--exit"
     ) > ${opre}_test.sql
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster branch (jonas.oreland:3602 to 3604) Jonas Oreland20 Oct