summaryrefslogtreecommitdiff
path: root/mysql-test/r/default.result
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-05-17 12:59:07 +0400
committerAlexander Barkov <bar@mariadb.org>2017-05-17 12:59:07 +0400
commit896c2c73a02c7e82299b00e66ee3ff5f85aa3adc (patch)
treeb51a6b87f0d2488845144be585275c8cac19a1ed /mysql-test/r/default.result
parent6378c95ee07cccc2f2187b2caddc4496e14827d9 (diff)
parentfba7fbbc5c7bb1d05488108a29b854ee8ef0066a (diff)
downloadmariadb-git-896c2c73a02c7e82299b00e66ee3ff5f85aa3adc.tar.gz
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.310.3-MDEV-10953
Diffstat (limited to 'mysql-test/r/default.result')
-rw-r--r--mysql-test/r/default.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/default.result b/mysql-test/r/default.result
index 253cb412146..c18db932afa 100644
--- a/mysql-test/r/default.result
+++ b/mysql-test/r/default.result
@@ -2901,7 +2901,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` varchar(10) DEFAULT NULL,
- `b` int(11) DEFAULT length(`a`),
+ `b` int(11) DEFAULT octet_length(`a`),
`c` int(11) DEFAULT char_length(`a`),
`d` int(11) DEFAULT bit_length(`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1