diff options
| author | gkodinov@dl145s.mysql.com <> | 2006-10-19 16:00:06 +0200 |
|---|---|---|
| committer | gkodinov@dl145s.mysql.com <> | 2006-10-19 16:00:06 +0200 |
| commit | ea8ba0355651d52f692a34a63cde87b412629c52 (patch) | |
| tree | bbd21ba07f3e7194fe45e8183786bd87b47aeb6d /mysql-test/r | |
| parent | 9aa346bb26c76914889ec8b3ee3cea99f1f76925 (diff) | |
| parent | 6633173d5156797b406e94730cdae2814361d308 (diff) | |
| download | mariadb-git-ea8ba0355651d52f692a34a63cde87b412629c52.tar.gz | |
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/gis-rtree.result | 11 | ||||
| -rw-r--r-- | mysql-test/r/view.result | 10 |
2 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/r/gis-rtree.result b/mysql-test/r/gis-rtree.result index 92fcbfcdc9e..dbd6783fe76 100644 --- a/mysql-test/r/gis-rtree.result +++ b/mysql-test/r/gis-rtree.result @@ -862,3 +862,14 @@ CHECK TABLE t1 EXTENDED; Table Op Msg_type Msg_text test.t1 check status OK DROP TABLE t1; +CREATE TABLE t1 (foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) ); +INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(1,1))); +INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(1,0))); +INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(0,1))); +INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(0,0))); +SELECT 1 FROM t1 WHERE foo != PointFromWKB(POINT(0,0)); +1 +1 +1 +1 +DROP TABLE t1; diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 2fa467727f1..ed31ade9d33 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -2956,4 +2956,14 @@ View Create View v1 CREATE ALGORITHM=MERGE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`pk` AS `pk` from (`t1` join `t2` on(((`t2`.`fk` = `t1`.`pk`) and (`t2`.`ver` = (select max(`t`.`ver`) AS `MAX(t.ver)` from `t2` `t` where (`t`.`org` = `t2`.`org`)))))) DROP VIEW v1; DROP TABLE t1, t2; +CREATE TABLE t1(id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, val INT UNSIGNED NOT NULL); +CREATE VIEW v1 AS SELECT id, val FROM t1 WHERE val >= 1 AND val <= 5 WITH CHECK OPTION; +INSERT INTO v1 (val) VALUES (2); +INSERT INTO v1 (val) VALUES (4); +INSERT INTO v1 (val) VALUES (6); +ERROR HY000: CHECK OPTION failed 'test.v1' +UPDATE v1 SET val=6 WHERE id=2; +ERROR HY000: CHECK OPTION failed 'test.v1' +DROP VIEW v1; +DROP TABLE t1; End of 5.0 tests. |