bk commit into 6.0 tree (hhunger:1.2694) BUG#32496

[horst]

Below is the list of changes that have just been committed into a local
6.0 repository of hhunger. When hhunger does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-27 11:22:25+01:00, hhunger@stripped +5 -0
  post merge fix for bug#32496

  mysql-test/suite/funcs_1/r/innodb_views.result@stripped, 2007-11-27 11:22:22+01:00,
hhunger@stripped +9 -2
    post merge fix for bug#32496

  mysql-test/suite/funcs_1/r/memory_views.result@stripped, 2007-11-27 11:22:22+01:00,
hhunger@stripped +9 -2
    post merge fix for bug#32496

  mysql-test/suite/funcs_1/r/myisam_views.result@stripped, 2007-11-27 11:22:22+01:00,
hhunger@stripped [phone]
    post merge fix for bug#32496

  mysql-test/suite/funcs_1/r/ndb_views.result@stripped, 2007-11-27 11:22:22+01:00,
hhunger@stripped +9 -2
    post merge fix for bug#32496

  mysql-test/suite/funcs_1/views/views_master.inc@stripped, 2007-11-27 11:22:22+01:00,
hhunger@stripped +12 -12
    post merge fix for bug#32496

diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_views.result
b/mysql-test/suite/funcs_1/r/innodb_views.result
--- a/mysql-test/suite/funcs_1/r/innodb_views.result	2007-11-27 10:27:11 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result	2007-11-27 11:22:22 +01:00
@@ -9891,6 +9891,13 @@ SELECT f3 AS "pure column f3:", f1 + f3 
 '->' || CAST(f3 AS CHAR) || '<-'
          AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):"
 FROM t1 WHERE f1 = 2;
+CREATE OR REPLACE VIEW v1 AS
+SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ",
+3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",
+'->' || CAST(f3 AS CHAR) || '<-'
+         AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): "
+FROM t1 WHERE f1 = 2;
+ERROR 42000: Incorrect column name 'pure column f3: '
 SELECT * FROM v1;
 pure column f3:	2.20000
 sum of columns f1 + f3 =	4.20000
@@ -10473,14 +10480,14 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2
FROM test1.t1;
+SELECT f1 ,
CONVERT('ßÄäÖöÜü§'
USING UCS2) as f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v27;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2
FROM test1.t1;
+SELECT
CONVERT('ßÄäÖöÜü§'
USING UCS2) as f1, f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v27;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_views.result
b/mysql-test/suite/funcs_1/r/memory_views.result
--- a/mysql-test/suite/funcs_1/r/memory_views.result	2007-11-27 10:27:31 +01:00
+++ b/mysql-test/suite/funcs_1/r/memory_views.result	2007-11-27 11:22:22 +01:00
@@ -9896,6 +9896,13 @@ SELECT f3 AS "pure column f3:", f1 + f3 
 '->' || CAST(f3 AS CHAR) || '<-'
          AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):"
 FROM t1 WHERE f1 = 2;
+CREATE OR REPLACE VIEW v1 AS
+SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ",
+3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",
+'->' || CAST(f3 AS CHAR) || '<-'
+         AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): "
+FROM t1 WHERE f1 = 2;
+ERROR 42000: Incorrect column name 'pure column f3: '
 SELECT * FROM v1;
 pure column f3:	2.20000
 sum of columns f1 + f3 =	4.20000
@@ -10478,14 +10485,14 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2
FROM test1.t1;
+SELECT f1 ,
CONVERT('ßÄäÖöÜü§'
USING UCS2) as f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v27;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2
FROM test1.t1;
+SELECT
CONVERT('ßÄäÖöÜü§'
USING UCS2) as f1, f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v27;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_views.result
b/mysql-test/suite/funcs_1/r/myisam_views.result
--- a/mysql-test/suite/funcs_1/r/myisam_views.result	2007-11-27 10:28:29 +01:00
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result	2007-11-27 11:22:22 +01:00
@@ -9913,6 +9913,13 @@ SELECT f3 AS "pure column f3:", f1 + f3 
 '->' || CAST(f3 AS CHAR) || '<-'
          AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):"
 FROM t1 WHERE f1 = 2;
+CREATE OR REPLACE VIEW v1 AS
+SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ",
+3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",
+'->' || CAST(f3 AS CHAR) || '<-'
+         AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): "
+FROM t1 WHERE f1 = 2;
+ERROR 42000: Incorrect column name 'pure column f3: '
 SELECT * FROM v1;
 pure column f3:	2.20000
 sum of columns f1 + f3 =	4.20000
@@ -10481,14 +10488,14 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v20;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v20;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2
FROM test1.t1;
+SELECT f1 ,
CONVERT('ßÄäÖöÜü§'
USING UCS2) as f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v20;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v20;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v20;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2
FROM test1.t1;
+SELECT
CONVERT('ßÄäÖöÜü§'
USING UCS2) as f1, f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v20;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v20;
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_views.result
b/mysql-test/suite/funcs_1/r/ndb_views.result
--- a/mysql-test/suite/funcs_1/r/ndb_views.result	2007-11-27 10:27:44 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_views.result	2007-11-27 11:22:22 +01:00
@@ -9891,6 +9891,13 @@ SELECT f3 AS "pure column f3:", f1 + f3 
 '->' || CAST(f3 AS CHAR) || '<-'
          AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):"
 FROM t1 WHERE f1 = 2;
+CREATE OR REPLACE VIEW v1 AS
+SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ",
+3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",
+'->' || CAST(f3 AS CHAR) || '<-'
+         AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): "
+FROM t1 WHERE f1 = 2;
+ERROR 42000: Incorrect column name 'pure column f3: '
 SELECT * FROM v1;
 pure column f3:	2.20000
 sum of columns f1 + f3 =	4.20000
@@ -10473,14 +10480,14 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2
FROM test1.t1;
+SELECT f1 ,
CONVERT('ßÄäÖöÜü§'
USING UCS2) as f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v27;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2
FROM test1.t1;
+SELECT
CONVERT('ßÄäÖöÜü§'
USING UCS2) as f1, f2 FROM test1.t1;
 SHOW CREATE VIEW test1.v27;
 SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
 CAST(f2 AS CHAR) AS f2 FROM test1.v27;
diff -Nrup a/mysql-test/suite/funcs_1/views/views_master.inc
b/mysql-test/suite/funcs_1/views/views_master.inc
--- a/mysql-test/suite/funcs_1/views/views_master.inc	2007-11-27 10:28:01 +01:00
+++ b/mysql-test/suite/funcs_1/views/views_master.inc	2007-11-27 11:22:22 +01:00
@@ -1585,7 +1585,7 @@ let $message= Testcase 3.3.1.41 ;
 ###############################################################################
 # Testcase 3.3.1.41: Ensure that a view definition within a stored procedure
 #                    definition cannot include references to any of the stored
-#                    procedure’s parameters.
+#                    procedure’s parameters.
 ###############################################################################
 --disable_warnings
 Drop view if exists test.v1 ;
@@ -2415,21 +2415,21 @@ SELECT * FROM v1;
 # 3.3.1.54
 --vertical_results
 SET sql_mode = 'traditional,ansi';
-# bug#32496: deleted trailing blanks (hhunger):
+# due to bug#32496 "no trailing blanks in identifier".
 CREATE OR REPLACE VIEW v1 AS
 SELECT f3 AS "pure column f3:", f1 + f3 AS "sum of columns f1 + f3 =",
        3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1):",
        '->' || CAST(f3 AS CHAR) || '<-'
          AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):"
 FROM t1 WHERE f1 = 2;
-# Original:
-#CREATE OR REPLACE VIEW v1 AS
-#SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ",
-#       3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",
-#       '->' || CAST(f3 AS CHAR) || '<-'
-#         AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): "
-#FROM t1 WHERE f1 = 2;
-
+# This error is not conformant with ansi (see bug#32496). hhunger
+--error ER_WRONG_COLUMN_NAME
+CREATE OR REPLACE VIEW v1 AS
+SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ",
+       3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",
+       '->' || CAST(f3 AS CHAR) || '<-'
+         AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): "
+FROM t1 WHERE f1 = 2;
 SELECT * FROM v1;
 SET sql_mode = '';
 --horizontal_results
@@ -3094,7 +3094,7 @@ eval EXPLAIN SELECT CAST(f1 AS SIGNED IN
                    CAST(f2 AS CHAR) AS f2 FROM test1.v$toplevel;
 # 2.3.3 UCS2 string instead of common string
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT f1 , CONVERT('ßÄäÖöÜü§' USING UCS2) as f2
FROM test1.t1;
+SELECT f1 ,
CONVERT('ßÄäÖöÜü§'
USING UCS2) as f2 FROM test1.t1;
 eval SHOW CREATE VIEW test1.v$toplevel;
 eval SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
             CAST(f2 AS CHAR) AS f2 FROM test1.v$toplevel;
@@ -3103,7 +3103,7 @@ eval EXPLAIN SELECT CAST(f1 AS SIGNED IN
 
 # 2.3.4 UCS2 string instead of numeric
 CREATE OR REPLACE VIEW test3.v0 AS
-SELECT CONVERT('ßÄäÖöÜü§' USING UCS2) as f1, f2
FROM test1.t1;
+SELECT
CONVERT('ßÄäÖöÜü§'
USING UCS2) as f1, f2 FROM test1.t1;
 eval SHOW CREATE VIEW test1.v$toplevel;
 eval SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
             CAST(f2 AS CHAR) AS f2 FROM test1.v$toplevel;