database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source 
The functional changes of commit 5836191c8f
(MDEV-21168) are omitted due to MDEV-742 having addressed the issue.
This commit is contained in:
Marko Mäkelä
2020-04-25 21:57:52 +03:00
parent 62903434eb a19782522b
commit fbe2712705
202 changed files with 2911 additions and 1669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/frm-debug.result
View File

@ -13,8 +13,8 @@ CREATE TABLE t1 (c01 INT, c02 CHAR(20), c03 TEXT, c04 DOUBLE);
Warnings:
Note 1105 build_frm_image: Field data type info length: 14
Note 1105 DBUG: [0] name='c01' type_info=''
Note 1105 DBUG: [1] name='c02' type_info='xchar'
Note 1105 DBUG: [2] name='c03' type_info='xblob'
Note 1105 DBUG: [1] name='c02' type_info='xc...'
Note 1105 DBUG: [2] name='c03' type_info='xb...'
Note 1105 DBUG: [3] name='c04' type_info=''
SET SESSION debug_dbug="-d,frm_data_type_info_emulate";
SET SESSION debug_dbug="-d,frm_data_type_info";