bk commit into 5.0 tree (hhunger:1.2586) BUG#32496

[horst]

Below is the list of changes that have just been committed into a local
5.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-26 21:28:01+01:00, hhunger@stripped +5 -0
  patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  BitKeeper/etc/ignore@stripped, 2007-11-26 21:27:59+01:00, hhunger@stripped +2 -0
    Added scripts/make_win_src_distribution_old server-tools/instance-manager/net_serv.cc
to the ignore list

  mysql-test/suite/funcs_1/r/innodb_views.result@stripped, 2007-11-26 21:27:58+01:00,
hhunger@stripped +11 -4
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  mysql-test/suite/funcs_1/r/memory_views.result@stripped, 2007-11-26 21:27:59+01:00,
hhunger@stripped +11 -4
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  mysql-test/suite/funcs_1/r/myisam_views.result@stripped, 2007-11-26 21:27:59+01:00,
hhunger@stripped [phone]
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  mysql-test/suite/funcs_1/views/views_master.inc@stripped, 2007-11-26 21:27:59+01:00,
hhunger@stripped +9 -0
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

diff -Nrup a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
--- a/BitKeeper/etc/ignore	2007-11-12 10:06:17 +01:00
+++ b/BitKeeper/etc/ignore	2007-11-26 21:27:59 +01:00
@@ -1351,3 +1351,5 @@ win/vs71cache.txt
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
+scripts/make_win_src_distribution_old
+server-tools/instance-manager/net_serv.cc
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-07-25 06:31:21 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result	2007-11-26 21:27:58 +01:00
@@ -9836,16 +9836,23 @@ f2
 two
 SET sql_mode = 'traditional,ansi';
 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;
+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
-product of constants 3 * (- 0.11111E+1): 	-3.3333
-expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): 	->2.20000<-
+pure column f3:	2.20000
+sum of columns f1 + f3 =	4.20000
+product of constants 3 * (- 0.11111E+1):	-3.3333
+expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):	->2.20000<-
 SET sql_mode = '';
 
 Testcases 3.3.1.55 - 3.3.1.62 
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-07-25 06:31:22 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_views.result	2007-11-26 21:27:59 +01:00
@@ -9841,16 +9841,23 @@ f2
 two
 SET sql_mode = 'traditional,ansi';
 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;
+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
-product of constants 3 * (- 0.11111E+1): 	-3.3333
-expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): 	->2.20000<-
+pure column f3:	2.20000
+sum of columns f1 + f3 =	4.20000
+product of constants 3 * (- 0.11111E+1):	-3.3333
+expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):	->2.20000<-
 SET sql_mode = '';
 
 Testcases 3.3.1.55 - 3.3.1.62 
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-07-25 06:31:22 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result	2007-11-26 21:27:59 +01:00
@@ -9858,16 +9858,23 @@ f2
 two
 SET sql_mode = 'traditional,ansi';
 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;
+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
-product of constants 3 * (- 0.11111E+1): 	-3.3333
-expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): 	->2.20000<-
+pure column f3:	2.20000
+sum of columns f1 + f3 =	4.20000
+product of constants 3 * (- 0.11111E+1):	-3.3333
+expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):	->2.20000<-
 SET sql_mode = '';
 
 Testcases 3.3.1.55 - 3.3.1.62 
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-05-01 15:52:17 +02:00
+++ b/mysql-test/suite/funcs_1/views/views_master.inc	2007-11-26 21:27:59 +01:00
@@ -2410,6 +2410,15 @@ SELECT * FROM v1;
 # 3.3.1.54
 --vertical_results
 SET sql_mode = 'traditional,ansi';
+# 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;
+# 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): ",