diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-15 14:16:15 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-15 20:25:06 +0100 |
| commit | 2116649dee20a9e3ce63468f2b85442292f5c826 (patch) | |
| tree | 7a862cd81c22bbf4c1803993365a5568cddee28c /storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result | |
| parent | 7a2136433280fa5c38997bbd4b41121b8e727ca0 (diff) | |
| download | mariadb-git-2116649dee20a9e3ce63468f2b85442292f5c826.tar.gz | |
after-merge fix replication tests
* mostly update result files
* also updating test/include files to match 5.6
Diffstat (limited to 'storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result')
| -rw-r--r-- | storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result b/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result index 39a6856d684..1ba442ecde2 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_parallel_tokudb_update_pk_uc0_lookup0.result @@ -1,9 +1,4 @@ include/master-slave.inc -Warnings: -Note #### Sending passwords in plain text without SSL/TLS is extremely insecure. -Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information. -Warnings: -Note 1753 slave_transaction_retries is not supported in multi-threaded slave mode. In the event of a transient failure, the slave will not retry the transaction and will stop. [connection master] drop table if exists t; create table t (a bigint not null, b bigint not null, primary key(a)) engine=tokudb; @@ -18,9 +13,6 @@ update t set b=b+4 where a=3; update t set b=b+1 where 1<=a and a<=3; select unix_timestamp() into @tstart; select unix_timestamp() into @tend; -select @tend-@tstart <= 5; -@tend-@tstart <= 5 -1 select * from t; a b 1 3 |