diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 09:15:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 09:15:41 +0200 |
| commit | 45531949ae115f2ba7b9450cc2386653483211ba (patch) | |
| tree | 22809f3919c711d5030d2d0e55be969a7bc67e84 /storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result | |
| parent | 36b7f8f4b0e46e06cfcc29c221430a5b998e3b3f (diff) | |
| parent | ed13a0d221256028299df4167280e97860ba2edc (diff) | |
| download | mariadb-git-45531949ae115f2ba7b9450cc2386653483211ba.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result')
| -rw-r--r-- | storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result index 6ee39039985..cca18c7c1ab 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result @@ -194,7 +194,7 @@ INSERT into t31 set f1=1, f2=1, f3=1, f4='first'; insert ignore into t31 set f1=1, f2=1, f3=2, f4='second', f9=2.2, f10='seven samurai', f28=222.222, f35='222'; Warnings: -Warning 1366 Incorrect integer value: 'seven samurai' for column 'f10' at row 1 +Warning 1366 Incorrect integer value: 'seven samurai' for column `test`.`t31`.`f10` at row 1 insert ignore into t31 values (1, 1, 3, 'third', /* f5 BIGINT, */ 333333333333333333333333, /* f6 BLOB, */ '3333333333333333333333', |