diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-05-28 01:08:35 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-05-28 01:08:35 +0500 |
| commit | 1e40d3259bc9e8137dc4697502b0a98357692825 (patch) | |
| tree | 88f4b92f2ce7bacebd30677f5b6c4ff4c9aede7f /mysql-test | |
| parent | 4f9d984572f08a981f13dbb83293a17304a420d8 (diff) | |
| download | mariadb-git-1e40d3259bc9e8137dc4697502b0a98357692825.tar.gz | |
view.result, mysqldump.result:
Merge with 5.0-opt.
mysql-test/r/view.result:
Merge with 5.0-opt.
mysql-test/r/mysqldump.result:
Merge with 5.0-opt.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysqldump.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/view.result | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index f4d30921cee..5d7145fa7b7 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -3314,7 +3314,7 @@ drop database mysqldump_test_db; CREATE TABLE t1 (c1 INT, c2 LONGBLOB); INSERT INTO t1 SET c1=11, c2=REPEAT('q',509); CREATE TABLE `t1` ( - `c1` int(11) default NULL, + `c1` int(11) DEFAULT NULL, `c2` longblob ); INSERT INTO `t1` VALUES (11,0x7171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171); diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 5a338b633cc..db488aa4876 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -3139,6 +3139,16 @@ code COUNT(DISTINCT country) 100 2 DROP VIEW v1; DROP TABLE t1; +CREATE TABLE t1 (id int); +CREATE TABLE t2 (id int, c int DEFAULT 0); +INSERT INTO t1 (id) VALUES (1); +INSERT INTO t2 (id) VALUES (1); +CREATE VIEW v1 AS +SELECT t2.c FROM t1, t2 +WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION; +UPDATE v1 SET c=1; +DROP VIEW v1; +DROP TABLE t1,t2; DROP VIEW IF EXISTS v1; SELECT * FROM (SELECT 1) AS t; 1 @@ -3359,16 +3369,6 @@ SHOW CREATE VIEW v1; View Create View v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(1.23456789 as decimal(8,0)) AS `col` DROP VIEW v1; -CREATE TABLE t1 (id int); -CREATE TABLE t2 (id int, c int DEFAULT 0); -INSERT INTO t1 (id) VALUES (1); -INSERT INTO t2 (id) VALUES (1); -CREATE VIEW v1 AS -SELECT t2.c FROM t1, t2 -WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION; -UPDATE v1 SET c=1; -DROP VIEW v1; -DROP TABLE t1,t2; End of 5.0 tests. DROP DATABASE IF EXISTS `d-1`; CREATE DATABASE `d-1`; |