diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 11:56:08 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 11:56:08 +0200 |
commit | a6585d5ce99c2efdd75884b989250e2de8203cca (patch) | |
tree | 67c1e6f7bf8e078c7d63416f1a00c6b291e64080 /mysql-test/include | |
parent | 762419a5732fceb5c7ed5728cd7d22b4d82ff74c (diff) | |
parent | 828cc2ba7cdbe47c55fd679437e6e7f0bc714dff (diff) | |
download | mariadb-git-a6585d5ce99c2efdd75884b989250e2de8203cca.tar.gz |
Merge 10.0 into 10.1
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 cdc39f8407f..3b6c91ebbed 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; |