Merge branch 'master' of github.com:Tokutek/ft-engine

scripts/common.sh

@@ -157,15 +157,12 @@ function parse_mysqlbuild() {
         else
             git_tag=HEAD
             # setup _tree defaults
-            if [ -z $mysql_tree ] ; then mysql_tree=$mysql_version; fi
+            if [ -z $mysql_tree ] ; then mysql_tree=$mysql_distro-$mysql_version; fi
             if [ -z $jemalloc_tree ] ; then jemalloc_tree=$jemalloc_version; fi
         fi
-        # 5.6 is in another repo
         mysql_repo=$mysql_distro
-        if [[ $mysql_distro = mysql && $mysql_version =~ ^5.6 ]] ; then 
-            mysql_repo=mysql56
-            mysql_tree=$mysql_distro-$mysql_version
-        fi
+        # 5.6 is in another repo
+        if [[ $mysql_distro = mysql && $mysql_version =~ ^5.6 ]] ; then mysql_repo=mysql56; fi
     else
         exitcode=1
     fi

scripts/run.mysql.tests.bash

@@ -52,7 +52,7 @@ if [[ $mysqlbuild =~ (.*)-(tokudb\-.*)-(linux)-(x86_64) ]] ; then
     system=${BASH_REMATCH[3]}
     arch=${BASH_REMATCH[4]}
 else
-    exit 1
+    echo $mysqlbuild is not a tokudb build
 fi
 
 if [ -d $mysql_basedir/lib/mysql ] ; then

scripts/run.sql.bench.bash

@@ -51,7 +51,7 @@ if [[ $mysqlbuild =~ (.*)-(tokudb-.*)-(linux)-(x86_64) ]] ; then
     system=${BASH_REMATCH[3]}
     arch=${BASH_REMATCH[4]}
 else
-    exit 1
+    echo $mysqlbuild is not a tokudb build
 fi
 
 # goto the base directory

scripts/run.tests.7.0.3.bash

-mysqlbuild=mysql-5.5.30-tokudb-7.0.3-e-linux-x86_64
-setup.mysql.bash --mysqlbuild=$mysqlbuild --install=0
-if [ $? = 0 ] ; then
-    run.sql.bench.bash --mysqlbuild=$mysqlbuild --commit=1
-fi
-
-mysqlbuild=mariadb-5.5.30-tokudb-7.0.3-e-linux-x86_64
-setup.mysql.bash --mysqlbuild=$mysqlbuild --install=0
-if [ $? = 0 ] ; then
-    run.atc.ontime.bash --mysqlbuild=$mysqlbuild --commit=1 --engine=tokudb
-fi
-
-mysqlbuild=mariadb-5.5.30-tokudb-7.0.3-linux-x86_64
-setup.mysql.bash --mysqlbuild=$mysqlbuild --install=0
-if [ $? = 0 ] ; then
-    run.sql.bench.bash --mysqlbuild=$mysqlbuild --commit=1
-fi
-
-mysqlbuild=mariadb-5.5.30-tokudb-7.0.3-e-linux-x86_64
-setup.mysql.bash --mysqlbuild=$mysqlbuild --install=0
-if [ $? = 0 ] ; then
-    run.sql.bench.bash --mysqlbuild=$mysqlbuild --commit=1
-fi
-
-mysqlbuild=mariadb-5.5.30-tokudb-7.0.3-e-linux-x86_64
-setup.mysql.bash --mysqlbuild=$mysqlbuild --install=0
-if [ $? = 0 ] ; then
-    run.tpch.bash --mysqlbuild=$mysqlbuild --commit=1 --SCALE=1
-    run.tpch.bash --mysqlbuild=$mysqlbuild --commit=1 --SCALE=1 --tokudb_load_save_space=1
-    run.tpch.bash --mysqlbuild=$mysqlbuild --commit=1 --SCALE=10
-    run.tpch.bash --mysqlbuild=$mysqlbuild --commit=1 --SCALE=10 --tokudb_load_save_space=1
-    run.tpch.bash --mysqlbuild=$mysqlbuild --commit=1 --SCALE=30
-    run.tpch.bash --mysqlbuild=$mysqlbuild --commit=1 --SCALE=30 --tokudb_load_save_space=1
-fi
-
-mysqlbuild=mariadb-5.5.30-tokudb-7.0.3-e-linux-x86_64
-setup.mysql.bash --mysqlbuild=$mysqlbuild --install=0
-if [ $? = 0 ] ; then
-    run.iibench.bash --mysqlbuild=$mysqlbuild --commit=1 --max_rows=1000000000 --insert_only=0
-    run.iibench.bash --mysqlbuild=$mysqlbuild --commit=1 --max_rows=1000000000 --replace_into
-    run.iibench.bash --mysqlbuild=$mysqlbuild --commit=1 --max_rows=1000000000 --insert_ignore
-    run.iibench.bash --mysqlbuild=$mysqlbuild --commit=1 --max_rows=1000000000 --insert_only=1
-fi
-
-mysqlbuild=mariadb-5.5.30-tokudb-7.0.3-e-linux-x86_64
-setup.mysql.bash --mysqlbuild=$mysqlbuild --install=0
-if [ $? = 0 ] ; then
-    run.tpch.bash --mysqlbuild=$mysqlbuild --commit=1 --SCALE=100 --compare=0
-    run.tpch.bash --mysqlbuild=$mysqlbuild --commit=1 --SCALE=100 --compare=0 --tokudb_load_save_space=1
-fi

scripts/setup.mysql.bash

@@ -10,7 +10,8 @@ shutdown=1
 install=1
 startup=1
 s3bucket=tokutek-mysql-build
-builtins="mysqlbuild shutdown install startup s3bucket"
+sleeptime=60
+builtins="mysqlbuild shutdown install startup s3bucket sleeptime"
 mysqld_args="--user=mysql --core-file --core-file-size=unlimited"
 defaultsfile=""
 if [ -f /etc/$(whoami).my.cnf ] ; then
@@ -50,7 +51,7 @@ if [[ $mysqlbuild =~ (.*)-(tokudb\-.*)-(linux)-(x86_64) ]] ; then
     system=${BASH_REMATCH[3]}
     arch=${BASH_REMATCH[4]}
 else
-    exit 1
+    echo $muysqlbuild is not a tokudb build
 fi
 mysqltarball=$mysqlbuild.tar.gz
 
@@ -79,6 +80,12 @@ if [ $? -ne 0 ] ; then
     if [ $? -ne 0 ] ; then exit 1; fi
 fi
 
+# set ldpath
+ldpath=""
+if [ -d /usr/local/gcc-4.7/lib64 ] ; then
+    ldpath="export LD_LIBRARY_PATH=/usr/local/gcc-4.7/lib64:\$LD_LIBRARY_PATH;"
+fi
+
 # shutdown mysql
 if [ $shutdown -ne 0 ] ; then
     if [ -x /etc/init.d/mysql ] ; then
@@ -86,7 +93,7 @@ if [ $shutdown -ne 0 ] ; then
     else
         /usr/local/mysql/bin/mysqladmin shutdown
     fi
-    sleep 60
+    sleep $sleeptime
 fi
 
 pushd /usr/local
@@ -112,6 +119,9 @@ if [ ! -d $mysqlbuild ] || [ $install -ne 0 ] ; then
     tar xzf $basedir/$mysqltarball
     if [ $? -ne 0 ] ; then exit 1; fi
     ln -s $mysqldir /usr/local/mysql
+    if [ $? -ne 0 ] ; then exit 1; fi
+    ln -s $mysqldir /usr/local/$mysqlbuild
+    if [ $? -ne 0 ] ; then exit 1; fi
 
     installdb=$mysqlbuild/bin/mysql_install_db
     if [ ! -f $installdb ] ; then
@@ -126,17 +136,19 @@ if [ ! -d $mysqlbuild ] || [ $install -ne 0 ] ; then
 	ln $mysqlbuild/bin/mysqld-debug $mysqlbuild/bin/mysqld
     fi
 
-    if [ -z "$defaultsfile" ] ; then
-        sudo $installdb --user=mysql --basedir=$PWD/$mysqlbuild --datadir=$PWD/$mysqlbuild/data
+    if [ -z "$defaultsfile" ] ; then 
+        default_arg=""
     else
-        sudo $installdb --defaults-file=$defaultsfile --user=mysql --basedir=$PWD/$mysqlbuild --datadir=$PWD/$mysqlbuild/data
+        default_arg="--defaults-file=$defaultsfile"
     fi
+    sudo bash -c "$ldpath $installdb $default_arg --user=mysql --basedir=$PWD/$mysqlbuild --datadir=$PWD/$mysqlbuild/data"
     if [ $? -ne 0 ] ; then exit 1; fi
-    
 else
     # create link
     ln -s $mysqldir /usr/local/mysql
     if [ $? -ne 0 ] ; then exit 1; fi
+    ln -s $mysqldir /usr/local/$mysqlbuild
+    if [ $? -ne 0 ] ; then exit 1; fi
 fi
 popd
 
@@ -151,9 +163,14 @@ if [ $startup -ne 0 ] ; then
     if [ -x /etc/init.d/mysql ] ; then
         sudo setsid /etc/init.d/mysql start
     else
-        sudo -b /usr/local/mysql/bin/mysqld_safe $mysqld_args >/dev/null 2>&1 &
+        if [ -z "$defaultsfile" ] ; then
+            default_arg=""
+        else
+            default_arg="--defaults-file=$defaultsfile"
+        fi
+        sudo -b bash -c "$ldpath /usr/local/mysql/bin/mysqld_safe $default_arg $mysqld_args" >/dev/null 2>&1 &
     fi
-    sleep 60
+    sleep $sleeptime
 
     # add mysql grants
     /usr/local/mysql/bin/mysql -u root -e "grant all on *.* to tokubuild@localhost"

storage/tokudb/ha_tokudb.cc

@@ -6168,7 +6168,13 @@ int ha_tokudb::create_txn(THD* thd, tokudb_trx_data* trx) {
          (thd_sql_command(thd) != SQLCOM_ALTER_TABLE)) {
         /* QQQ We have to start a master transaction */
         // DBUG_PRINT("trans", ("starting transaction all "));
-        if ((error = txn_begin(db_env, NULL, &trx->all, toku_iso_to_txn_flag(toku_iso_level), thd))) {
+        uint32_t txn_begin_flags = toku_iso_to_txn_flag(toku_iso_level);
+#if 50614 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699
+        if (thd_tx_is_read_only(thd)) {
+            txn_begin_flags |= DB_TXN_READ_ONLY;
+        }
+#endif
+        if ((error = txn_begin(db_env, NULL, &trx->all, txn_begin_flags, thd))) {
             trx->tokudb_lock_count--;      // We didn't get the lock
             goto cleanup;
         }
@@ -6614,9 +6620,11 @@ void ha_tokudb::update_create_info(HA_CREATE_INFO* create_info) {
         // show create table asks us to update this create_info, this makes it
         // so we'll always show what compression type we're using
         create_info->row_type = get_row_type();
+#if TOKU_INCLUDE_ROW_TYPE_COMPRESSION
         if (create_info->row_type == ROW_TYPE_TOKU_ZLIB && THDVAR(ha_thd(), hide_default_row_format) != 0) {
             create_info->row_type = ROW_TYPE_DEFAULT;
         }
+#endif
     }
 }