diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-04-19 20:35:04 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-19 20:35:04 +0200 |
commit | 45912599cacbfe6800f9fc6643b7963f06cc4184 (patch) | |
tree | 0c2d574cdc0e960bee5101995392edd924d148bc /mysql-test/r/join_cache.result | |
parent | 53375573e32e77676f4a4338099e44698b1bfb45 (diff) | |
parent | 016bef6ea0558a0b9758e22f448f89bf3ba25197 (diff) | |
download | mariadb-git-45912599cacbfe6800f9fc6643b7963f06cc4184.tar.gz |
10.0 merge
Diffstat (limited to 'mysql-test/r/join_cache.result')
-rw-r--r-- | mysql-test/r/join_cache.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/join_cache.result b/mysql-test/r/join_cache.result index bb455f2b39a..618ce7e540b 100644 --- a/mysql-test/r/join_cache.result +++ b/mysql-test/r/join_cache.result @@ -5595,7 +5595,7 @@ DROP TABLE t1,t2,t3; # CREATE TABLE t1 ( col269 decimal(31,10) unsigned DEFAULT NULL, -col280 multipoint DEFAULT NULL, +col280 geometry DEFAULT NULL, col281 tinyint(1) DEFAULT NULL, col282 time NOT NULL, col284 datetime DEFAULT NULL, |