mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-17 13:55:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.2 into 10.3

Browse source
This commit is contained in:
Marko Mäkelä 2018-12-18 09:15:41 +02:00
commit 45531949ae
135 changed files with 2022 additions and 1846 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/tokudb/mysql-test/rpl/r/rpl_extra_col_master_tokudb.result
View file

@ -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',