4.6.1 merge #2

README.md

@@ -1,4 +1,4 @@
-# This is InfiniDB 4.6
+# This is InfiniDB 4.6.1
 
 ## Build prerequisites
 To build InfiniDB from source you will need:
@@ -22,9 +22,9 @@ Along with a working C++ compiler and GNU software development tools you will ne
 
 ### InfiniDB MySQL
 
-    wget -Omysql-4.6.0-1.tar.gz https://github.com/infinidb/mysql/archive/4.6.0-1.tar.gz
-    tar -zxf mysql-4.6.0-1.tar.gz
-    ln -s mysql-4.6.0-1 mysql
+    wget -Omysql-4.6.1-1.tar.gz https://github.com/infinidb/mysql/archive/4.6.1-1.tar.gz
+    tar -zxf mysql-4.6.1-1.tar.gz
+    ln -s mysql-4.6.1-1 mysql
     cd mysql
     ./configure --prefix=$HOME/infinidb/mysql
     make
@@ -33,9 +33,9 @@ Along with a working C++ compiler and GNU software development tools you will ne
 ### InfiniDB
 
     cd ..
-    wget -Oinfinidb-4.6.0-1.tar.gz https://github.com/infinidb/infinidb/archive/4.6.0-1.tar.gz
-    tar -zxf infinidb-4.6.0-1.tar.gz
-    ln -s infinidb-4.6.0-1 infinidb
+    wget -Oinfinidb-4.6.1-1.tar.gz https://github.com/infinidb/infinidb/archive/4.6.1-1.tar.gz
+    tar -zxf infinidb-4.6.1-1.tar.gz
+    ln -s infinidb-4.6.1-1 infinidb
     cd infinidb
     ./configure --prefix=$HOME/infinidb
     make
@@ -44,3 +44,17 @@ Along with a working C++ compiler and GNU software development tools you will ne
 This will leave you with `$HOME/infinidb` as a binary tree. Follow the Binary Download
 instructions in the InfiniDB 4.6 Installation Guide (available on http://www.infinidb.co/).
 
+## How to Contribute
+  * You may submit your contributions via GitHub pull requests.
+  * The submission must be by the original author.
+  * Along with any pull requests, please state that the contribution is your original work
+and that you license the work to the project under the project's open source license
+and the InfiniDB Contributor Agreement
+(see InfiniDBContributorAgreement.pdf). Whether or not you state this explicitly,
+by submitting any copyrighted material via pull request, email, or other means you agree to
+license the material under the project's open source license and warrant that you have the
+legal authority to do so.
+  * The InfiniDB Project committee will review your pull request and shall decide when and
+whether to merge your request in the main InfiniDB project. The InfiniDB Project
+committee will inform you of any decision regarding your request.
+

build/releasenum

@@ -1,5 +1,5 @@
 #
 
-version=4.6
-release=0
+version=4.6.1
+release=1
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for infinidb 4.6.0.
+# Generated by GNU Autoconf 2.59 for infinidb 4.6.1.
 #
 # Report bugs to <support@infinidb.co>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='infinidb'
 PACKAGE_TARNAME='infinidb'
-PACKAGE_VERSION='4.6.0'
-PACKAGE_STRING='infinidb 4.6.0'
+PACKAGE_VERSION='4.6.1'
+PACKAGE_STRING='infinidb 4.6.1'
 PACKAGE_BUGREPORT='support@infinidb.co'
 
 ac_default_prefix=/usr/local
@@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures infinidb 4.6.0 to adapt to many kinds of systems.
+\`configure' configures infinidb 4.6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1020,7 +1020,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of infinidb 4.6.0:";;
+     short | recursive ) echo "Configuration of infinidb 4.6.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1163,7 +1163,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-infinidb configure 4.6.0
+infinidb configure 4.6.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1177,7 +1177,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by infinidb $as_me 4.6.0, which was
+It was created by infinidb $as_me 4.6.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1833,7 +1833,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='infinidb'
- VERSION='4.6.0'
+ VERSION='4.6.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -25919,7 +25919,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by infinidb $as_me 4.6.0, which was
+This file was extended by infinidb $as_me 4.6.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25985,7 +25985,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-infinidb config.status 4.6.0
+infinidb config.status 4.6.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -3,7 +3,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(infinidb, 4.6.0, support@infinidb.co)
+AC_INIT(infinidb, 4.6.1, support@infinidb.co)
 ### we don't want the deault CXXFLAGS set by AC_INIT, but we do want to allow the user to set them
 SAVE_CXXFLAGS=
 if test -n "$CXXFLAGS"; then