diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-31 10:28:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-31 10:28:59 +0300 |
| commit | 4a0b56f60436cab3f2f60b15ec699cb19c1e10ba (patch) | |
| tree | 141f7f177748f763dab14484514453cec367c585 /plugin | |
| parent | 0bf843cd13981b03920bfc49c646b28a130f5d47 (diff) | |
| parent | 6da14d7b4a935466de55a6aa87db14bc359dbd30 (diff) | |
| download | mariadb-git-4a0b56f60436cab3f2f60b15ec699cb19c1e10ba.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'plugin')
3 files changed, 8 insertions, 8 deletions
diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6-debug.result b/plugin/type_inet/mysql-test/type_inet/type_inet6-debug.result index e21fb47fea8..0e879aad58f 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6-debug.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6-debug.result @@ -6,8 +6,8 @@ SET debug_dbug="+d,frm_data_type_info"; CREATE TABLE t1 (c01 INET6, c02 INET6); Warnings: Note 1105 build_frm_image: Field data type info length: 14 -Note 1105 DBUG: [0] name='c01' type_info='in...' -Note 1105 DBUG: [1] name='c02' type_info='in...' +Note 1105 DBUG: [0] name='c01' type_info='inet6' +Note 1105 DBUG: [1] name='c02' type_info='inet6' SET debug_dbug=@old_debug_dbug; SHOW CREATE TABLE t1; Table Create Table diff --git a/plugin/type_test/mysql-test/type_test/type_test_double-debug.result b/plugin/type_test/mysql-test/type_test/type_test_double-debug.result index ba4c8ea7b6a..975decca11e 100644 --- a/plugin/type_test/mysql-test/type_test/type_test_double-debug.result +++ b/plugin/type_test/mysql-test/type_test/type_test_double-debug.result @@ -8,14 +8,14 @@ SET @@debug_dbug="+d,frm_data_type_info"; CREATE TABLE t1 (a TEST_DOUBLE); Warnings: Note 1105 build_frm_image: Field data type info length: 13 -Note 1105 DBUG: [0] name='a' type_info='test_dou...' +Note 1105 DBUG: [0] name='a' type_info='test_double' SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_double DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 Warnings: -Note 1105 DBUG: [0] name='a' type_info='test_dou...' +Note 1105 DBUG: [0] name='a' type_info='test_double' DROP TABLE t1; SET @@debug_dbug=@old_debug_dbug; # Testing what happens on failure to resolve a type handler by name @@ -24,7 +24,7 @@ SET @@debug_dbug="+d,frm_data_type_info"; CREATE TABLE t1 (a TEST_DOUBLE); Warnings: Note 1105 build_frm_image: Field data type info length: 13 -Note 1105 DBUG: [0] name='a' type_info='test_dou...' +Note 1105 DBUG: [0] name='a' type_info='test_double' FLUSH TABLES; SET @@debug_dbug="+d,emulate_handler_by_name_or_error_failure"; SHOW CREATE TABLE t1; diff --git a/plugin/type_test/mysql-test/type_test/type_test_int8-debug.result b/plugin/type_test/mysql-test/type_test/type_test_int8-debug.result index e348b5b5f18..952a63c8476 100644 --- a/plugin/type_test/mysql-test/type_test/type_test_int8-debug.result +++ b/plugin/type_test/mysql-test/type_test/type_test_int8-debug.result @@ -8,14 +8,14 @@ SET @@debug_dbug="+d,frm_data_type_info"; CREATE TABLE t1 (a TEST_INT8); Warnings: Note 1105 build_frm_image: Field data type info length: 11 -Note 1105 DBUG: [0] name='a' type_info='test_i...' +Note 1105 DBUG: [0] name='a' type_info='test_int8' SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` test_int8(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 Warnings: -Note 1105 DBUG: [0] name='a' type_info='test_i...' +Note 1105 DBUG: [0] name='a' type_info='test_int8' DROP TABLE t1; SET @@debug_dbug=@old_debug_dbug; # Testing what happens on failure to resolve a type handler by name @@ -24,7 +24,7 @@ SET @@debug_dbug="+d,frm_data_type_info"; CREATE TABLE t1 (a TEST_INT8); Warnings: Note 1105 build_frm_image: Field data type info length: 11 -Note 1105 DBUG: [0] name='a' type_info='test_i...' +Note 1105 DBUG: [0] name='a' type_info='test_int8' FLUSH TABLES; SET @@debug_dbug="+d,emulate_handler_by_name_or_error_failure"; SHOW CREATE TABLE t1; |