diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-10-26 18:05:46 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-10-26 18:05:46 +0500 |
| commit | 0e076d4bb96b80c39bc9588d82566166afbfaed3 (patch) | |
| tree | 89a767a9921239f50bf52cb8dd7248f0f29817c9 /mysql-test/t/select.test | |
| parent | f78be6c8e997a2e5c5e971749d35ef4e44e425e2 (diff) | |
| parent | 46b03c598dde0df5536bda3b981996219cb2d48a (diff) | |
| download | mariadb-git-0e076d4bb96b80c39bc9588d82566166afbfaed3.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/select.result:
Auto merged
mysql-test/r/type_decimal.result:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
sql/item.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Merge with 5.0-opt
Diffstat (limited to 'mysql-test/t/select.test')
| -rw-r--r-- | mysql-test/t/select.test | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test index 76a66cc4783..ceb920c6ce4 100644 --- a/mysql-test/t/select.test +++ b/mysql-test/t/select.test @@ -3455,23 +3455,30 @@ DROP TABLE t1; # --disable_ps_protocol - SELECT 1 AS ` `; SELECT 1 AS ` `; SELECT 1 AS ` x`; +--enable_ps_protocol + +--error 1166 +CREATE VIEW v1 AS SELECT 1 AS ``; +--error 1166 CREATE VIEW v1 AS SELECT 1 AS ` `; -SELECT `` FROM v1; -CREATE VIEW v2 AS SELECT 1 AS ` `; -SELECT `` FROM v2; +--error 1166 +CREATE VIEW v1 AS SELECT 1 AS ` `; -CREATE VIEW v3 AS SELECT 1 AS ` x`; -SELECT `x` FROM v3; +--error 1166 +CREATE VIEW v1 AS SELECT (SELECT 1 AS ` `); -DROP VIEW v1, v2, v3; +CREATE VIEW v1 AS SELECT 1 AS ` x`; +SELECT `x` FROM v1; ---enable_ps_protocol +--error 1166 +ALTER VIEW v1 AS SELECT 1 AS ` `; + +DROP VIEW v1; --echo End of 5.0 tests |