diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-25 10:18:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-25 10:18:22 +0300 |
| commit | fba9883bc4ee4e35ed6aa095056981acbfe9f6b2 (patch) | |
| tree | beb5d354218d58c6f40e7506ea74102b4be0bb83 /mysql-test/main/func_time.result | |
| parent | 8e92d5e5e3842fbb805304f1d0e4f5b1def9a145 (diff) | |
| parent | d3350c160a7a884e97a5e4a696432230c13d53e0 (diff) | |
| download | mariadb-git-fba9883bc4ee4e35ed6aa095056981acbfe9f6b2.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/func_time.result')
| -rw-r--r-- | mysql-test/main/func_time.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/func_time.result b/mysql-test/main/func_time.result index a85b8c965ba..4faf9731a29 100644 --- a/mysql-test/main/func_time.result +++ b/mysql-test/main/func_time.result @@ -2158,7 +2158,7 @@ Warning 1292 Truncated incorrect DECIMAL value: '2005-05-0410' SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `f2` varchar(26) DEFAULT NULL + `f2` varchar(22) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SELECT * FROM t2; f2 |