diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-10-02 18:10:58 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-10-02 18:10:58 +0400 |
| commit | cefe5bb6b3be80df51e9580445b5c299abe61e60 (patch) | |
| tree | d6fabf3b2b4072b5c06640004ee0a6a2f70770a2 /mysql-test | |
| parent | 5e356ce707610976e3267b8eada509f993ff8833 (diff) | |
| download | mariadb-git-cefe5bb6b3be80df51e9580445b5c299abe61e60.tar.gz | |
A cleanup for MDEV-20042 Implement EXTRA2_FIELD_DATA_TYPE_INFO in FRM
Adding error reporting (ER_UNKNOWN_DATA_TYPE) when a handler name read
from EXTRA2_FIELD_DATA_TYPE_INFO is not known to the server.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/main/frm-debug.result | 11 | ||||
| -rw-r--r-- | mysql-test/main/frm-debug.test | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/mysql-test/main/frm-debug.result b/mysql-test/main/frm-debug.result index d4d71caacbd..332d7e00a8f 100644 --- a/mysql-test/main/frm-debug.result +++ b/mysql-test/main/frm-debug.result @@ -11,11 +11,14 @@ SET SESSION debug_dbug="+d,frm_data_type_info"; SET SESSION debug_dbug="+d,frm_data_type_info_emulate"; CREATE TABLE t1 (c01 INT, c02 CHAR(20), c03 TEXT, c04 DOUBLE); Warnings: -Note 1105 build_frm_image: Field data type info length: 12 +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='char' -Note 1105 DBUG: [2] name='c03' type_info='blob' +Note 1105 DBUG: [1] name='c02' type_info='xchar' +Note 1105 DBUG: [2] name='c03' type_info='xblob' Note 1105 DBUG: [3] name='c04' type_info='' -DROP TABLE t1; SET SESSION debug_dbug="-d,frm_data_type_info_emulate"; SET SESSION debug_dbug="-d,frm_data_type_info"; +FLUSH TABLES; +SHOW CREATE TABLE t1; +ERROR HY000: Unknown data type: 'xchar' +DROP TABLE t1; diff --git a/mysql-test/main/frm-debug.test b/mysql-test/main/frm-debug.test index 95207354bdc..d86acdbc7e3 100644 --- a/mysql-test/main/frm-debug.test +++ b/mysql-test/main/frm-debug.test @@ -14,6 +14,9 @@ SET SESSION debug_dbug="-d,frm_data_type_info"; SET SESSION debug_dbug="+d,frm_data_type_info"; SET SESSION debug_dbug="+d,frm_data_type_info_emulate"; CREATE TABLE t1 (c01 INT, c02 CHAR(20), c03 TEXT, c04 DOUBLE); -DROP TABLE t1; SET SESSION debug_dbug="-d,frm_data_type_info_emulate"; SET SESSION debug_dbug="-d,frm_data_type_info"; +FLUSH TABLES; +--error ER_UNKNOWN_DATA_TYPE +SHOW CREATE TABLE t1; +DROP TABLE t1; |