summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <igor@olga.mysql.com>2007-12-08 14:47:56 -0800
committerunknown <igor@olga.mysql.com>2007-12-08 14:47:56 -0800
commitb3f11ed4817b91bac57c23170904c84b0606a10d (patch)
tree310818fdf176474cf6631c075a5531b34e412915 /mysql-test/r
parentb3d8ff4ebd16c418dbce2731a5553c3ae6a47a7f (diff)
parentd776054e00b917e1d6fbf0195b924a052466320a (diff)
downloadmariadb-git-b3f11ed4817b91bac57c23170904c84b0606a10d.tar.gz
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug32815
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/innodb_mysql.result12
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index b073e4bd6ce..7450d8c349b 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -1213,4 +1213,16 @@ a b
3 2
1 1
DROP TABLE t1;
+CREATE TABLE t1 (id int, type char(6), d int, INDEX idx(id,d)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES
+(191, 'member', 1), (NULL, 'member', 3), (NULL, 'member', 4), (201, 'member', 2);
+EXPLAIN SELECT * FROM t1 WHERE id=191 OR id IS NULL ORDER BY d;
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t1 ALL idx NULL NULL NULL 3 Using where; Using filesort
+SELECT * FROM t1 WHERE id=191 OR id IS NULL ORDER BY d;
+id type d
+191 member 1
+NULL member 3
+NULL member 4
+DROP TABLE t1;
End of 5.0 tests