Merge branch 'master' into releases/tokudb-7.5

README.md

@@ -24,14 +24,14 @@ working MySQL or MariaDB with Tokutek patches, and with the TokuDB storage
 engine, called `make.mysql.bash`.  This script will download copies of the
 needed source code from github and build everything.
 
-To build MySQL 5.5.38 with TokuDB 7.1.7:
+To build MySQL 5.5.39 with TokuDB 7.5.0:
 ```sh
-scripts/make.mysql.bash --mysqlbuild=mysql-5.5.38-tokudb-7.1.7-linux-x86_64
+scripts/make.mysql.bash --mysqlbuild=mysql-5.5.39-tokudb-7.5.0-linux-x86_64
 ```
 
-To build MariaDB 5.5.38 with TokuDB 7.1.7:
+To build MariaDB 5.5.39 with TokuDB 7.5.0:
 ```sh
-scripts/make.mysql.bash --mysqlbuild=mariadb-5.5.38-tokudb-7.1.7-linux-x86_64
+scripts/make.mysql.bash --mysqlbuild=mariadb-5.5.39-tokudb-7.5.0-linux-x86_64
 ```
 
 Before you start, make sure you have a C++11-compatible compiler (GCC >=

mysql-test/suite/tokudb.bugs/t/db739_insert.test

+source include/have_tokudb.inc;
+set default_storage_engine=tokudb;
+disable_warnings;
+drop table if exists t;
+enable_warnings;
+create table t (
+    id bigint not null,
+    a bigint not null default 0,
+    b bigint not null default 0,
+    c bigint not null default 0,
+    primary key(id, a)
+);
+
+set tokudb_commit_sync=0;
+let $id=0;
+while ($id < 1000) {
+   let $a=0;
+   while ($a < 100) {
+       eval insert into t (id,a) values ($id,$a);
+       inc $a;
+   }
+   inc $id;
+}
+
+delete from t where id=404;
+insert into t values (404,0,0,0);
+
+drop table t;
\ No newline at end of file

mysql-test/suite/tokudb.bugs/t/db739_replace.test

+source include/have_tokudb.inc;
+set default_storage_engine=tokudb;
+disable_warnings;
+drop table if exists t;
+enable_warnings;
+create table t (
+    id bigint not null,
+    a bigint not null default 0,
+    b bigint not null default 0,
+    c bigint not null default 0,
+    primary key(id, a)
+);
+
+set tokudb_commit_sync=0;
+let $id=0;
+while ($id < 1000) {
+   let $a=0;
+   while ($a < 100) {
+       eval insert into t (id,a) values ($id,$a);
+       inc $a;
+   }
+   inc $id;
+}
+
+delete from t where id=404;
+set tokudb_pk_insert_mode=2;
+replace into t values (404,0,0,0);
+
+drop table t;
\ No newline at end of file

mysql-test/suite/tokudb.bugs/t/db739_upsert.test

+source include/have_tokudb.inc;
+set default_storage_engine=tokudb;
+disable_warnings;
+drop table if exists t;
+enable_warnings;
+create table t (
+    id bigint not null,
+    a bigint not null default 0,
+    b bigint not null default 0,
+    c bigint not null default 0,
+    primary key(id, a)
+);
+
+set tokudb_commit_sync=0;
+let $id=0;
+while ($id < 1000) {
+   let $a=0;
+   while ($a < 100) {
+       eval insert into t (id,a) values ($id,$a);
+       inc $a;
+   }
+   inc $id;
+}
+
+delete from t where id=404;
+insert into t values (404,0,0,0) on duplicate key update b=b+1;
+
+drop table t;
\ No newline at end of file