diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 12:26:11 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 12:26:11 +0200 |
commit | 1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8 (patch) | |
tree | c40b137e083a5adccc139a844c0f8d085283fc32 /mysql-test/include | |
parent | c676f58c270d75b6c1889b24b9833afc65b0d98b (diff) | |
parent | a6585d5ce99c2efdd75884b989250e2de8203cca (diff) | |
download | mariadb-git-1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/include')
-rw-r--r-- | mysql-test/include/mix2.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/mix2.inc b/mysql-test/include/mix2.inc index 53c1ffd36a3..ed06e436ead 100644 --- a/mysql-test/include/mix2.inc +++ b/mysql-test/include/mix2.inc @@ -1153,7 +1153,7 @@ checksum table t1, t2, t3, t4, t5, t6, t7 extended; drop table t1,t2,t3, t4, t5, t6; # -# Test problem with refering to different fields in same table in UNION +# Test problem with referring to different fields in same table in UNION # (Bug#2552: UNION returns NULL instead of expected value (innoDB only tables)) # eval create table t1 (id int, name char(10) not null, name2 char(10) not null) engine=$engine_type; |