Final commit before merge dev310 to master

README.md

@@ -10,7 +10,11 @@ installation using rwlman and from
 
 ## News
 
-Release 3.0 includes these major new features:
+Release 3.1 includes several new features with primary focus on using rwloadsim
+as a scripting tool.
+For details, see [CHANGELOG.md](CHANGELOG.md).
+
+Release 3.0 included these major new features:
 
  * SQL declaration no longer needs explicit bind and/or define, as bind variables and select list elements can be implicitly matched to declared variables.
  * The separate declaration and subsequent execution of SQL is no longer needed.
@@ -19,28 +23,26 @@ Release 3.0 includes these major new features:
  * New syntax for file open for read, append or pipe (added in 3.0.3)
  * Release 3.0.6 will be the last 3.0 release, in 3.1 the new file open syntax will be enforced
 
-In addition, there are several minor update, 
+In addition, there are several minor updates, 
 a number of bug fixes and updates to the standard oltp workload
 as shown in [CHANGELOG.md](CHANGELOG.md).
 
 Note that there was an update to the repository in 3.0.4 and that you _must_ apply
 the rwl304.sql script if you are upgrading from version 3.0.3 or earlier.
 There is also a repository upgrade in 3.0.6 and you _must_ apply the rwl306.sql script
-before using release 3.0.6.
+before using release 3.0.6 or newer.
 See [docs/INSTALL.md](docs/INSTALL.md) for details.
 
 ## Branches
 
-The branches that should be used by ordinary users are named after the release, e.g. 3.0.6.
-The branch named "development" is getting frequent commits
-and may as such contain intermediate code.
-The master branch receives occasional pull request from the development branch.
-You should normally _not_ clone or checkout the development or master branch
+The branches that should be used by ordinary users are named after the release, e.g. 3.1.0.
+The master branch receives occasional pull request from the various development branches.
+You should normally _not_ clone or checkout these
 unless you are developing the rwloadsim code or always want the latest.
-If you use the development or master branch, you _must_ do compilation yourself;
+If you use a development or master branch, you _must_ do compilation yourself;
 no binaries are released.
 
-At present, branch 3.0.6 is the release branch.
+At present, branch 3.1.0 is the release branch.
 
 Please see [CHANGELOG.md](CHANGELOG.md) for details.
 

public/ociping.rwl

@@ -97,7 +97,7 @@ $userswitch:flush-output:"--flush-output   : flush stdout after each line"
    $useroption:utcformat:"--utcformat=fmt  : provide alternative format for utctime"
    $userswitch:unixepoch:"--unixepoch      : timestamps will be unixepoch"
     $userswitch:csvexcel:"--csvexcel       : csv has ; separator, CRLF line terminator and no #, suggest"
-               $userhelp:"                   --utctime --utcformat='YYYY/MM/DD HH24:MI:SS'"
+	       $userhelp:"                 : to also use --utctime --utcformat='YYYY/MM/DD HH24:MI:SS'"
                $userhelp:"The following options will run many concurrently and plot results"
  $useroption:concurrency:"--concurrency=N  : number of threads to start"
      $useroption:runname:"--runname=string : prefix to various files in concurrent execution"
@@ -109,7 +109,6 @@ $userswitch:flush-output:"--flush-output   : flush stdout after each line"
       $useroption:min-ms:"--min-ms=D       : min range on the y-axis, default 0"
     $useroption:plotwith:"--plotwith=text  : gnuplot type for plotting, default 'points ps 0.5'"
      $useroption:plotkey:"--plotkey=text   : gnuplot set key argument, default 'right outside'"
-	       $userhelp:"                 : to also use --utctime --utcformat='YYYY/MM/DD HH24:MI:SS'"
 	       $userhelp:"--fullhelp       : also show help for ordinary rwloadsim options"
 
 if unixepoch and utctime then

src/rwl.h

@@ -13,6 +13,7 @@
  *
  * History
  *
+ * bengsig   2-oct-2023 - Releasing 3.1.0 
  * bengsig  22-sep-2023 - ampersand fixes
  * bengsig  21-sep-2023 - $errordetail:on directive
  * bengsig  20-sep-2023 - list iterator loop
@@ -2051,9 +2052,9 @@ extern const char rwlexecbanner[];
 #define RWL_EXTRA_VERSION_TEXT ""
 
 #define RWL_VERSION_MAJOR 3
-#define RWL_VERSION_MINOR 0
-#define RWL_VERSION_RELEASE 7
-#define RWL_VERSION_TEXT "Development" RWL_EXTRA_VERSION_TEXT
+#define RWL_VERSION_MINOR 1
+#define RWL_VERSION_RELEASE 0
+#define RWL_VERSION_TEXT "Production" RWL_EXTRA_VERSION_TEXT
 #define RWL_VERSION_DATE // undef to not include compile date 
 extern ub4 rwlpatch;
 

test/testres/178.err.good

@@ -1,3 +1,3 @@
-RWL-009: warning at [178.rwl;7]: superfluous ';' at posistion 36
+RWL-009: warning at [178.rwl;7]: superfluous ';' at position 36
 RWL-133: warning at [178.rwl;12]: superfluous ';' after procedure header
-RWL-009: warning at [178.rwl;19]: superfluous ';' at posistion 12
+RWL-009: warning at [178.rwl;19]: superfluous ';' at position 12