From: Date: November 22 2007 3:05pm Subject: bk commit into 5.1 tree (hhunger:1.2625) BUG#32496 List-Archive: http://lists.mysql.com/commits/38276 X-Bug: 32496 Message-Id: <20071122140511.415FE281388@hh-nb.hhunger> Below is the list of changes that have just been committed into a local 5.1 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-22 15:05:04+01:00, hhunger@stripped +6 -0 Modifications due to bug#32496. BitKeeper/etc/ignore@stripped, 2007-11-22 15:05:01+01:00, hhunger@stripped +3 -0 Added libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc to the ignore list mysql-test/suite/funcs_1/r/innodb_views.result@stripped, 2007-11-22 15:05:01+01:00, hhunger@stripped +7 -7 Modifications due to bug#32496. mysql-test/suite/funcs_1/r/memory_views.result@stripped, 2007-11-22 15:05:01+01:00, hhunger@stripped +7 -7 Modifications due to bug#32496. mysql-test/suite/funcs_1/r/myisam_views.result@stripped, 2007-11-22 15:05:01+01:00, hhunger@stripped +1206 -1206 Modifications due to bug#32496. mysql-test/suite/funcs_1/r/ndb_views.result@stripped, 2007-11-22 15:05:01+01:00, hhunger@stripped +7 -7 Modifications due to bug#32496. mysql-test/suite/funcs_1/views/views_master.inc@stripped, 2007-11-22 15:05:01+01:00, hhunger@stripped +12 -3 Modifications due to bug#32496. diff -Nrup a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore --- a/BitKeeper/etc/ignore 2007-11-14 14:28:10 +01:00 +++ b/BitKeeper/etc/ignore 2007-11-22 15:05:01 +01:00 @@ -3005,3 +3005,6 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj +libmysqld/scheduler.cc +libmysqld/sql_connect.cc +libmysqld/sql_tablespace.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-10-05 20:06:35 +02:00 +++ b/mysql-test/suite/funcs_1/r/innodb_views.result 2007-11-22 15:05:01 +01:00 @@ -9886,16 +9886,16 @@ 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): ", +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): " + AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):" FROM t1 WHERE f1 = 2; 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-10-05 20:06:35 +02:00 +++ b/mysql-test/suite/funcs_1/r/memory_views.result 2007-11-22 15:05:01 +01:00 @@ -9891,16 +9891,16 @@ 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): ", +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): " + AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):" FROM t1 WHERE f1 = 2; 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-10-05 20:06:35 +02:00 +++ b/mysql-test/suite/funcs_1/r/myisam_views.result 2007-11-22 15:05:01 +01:00 @@ -9908,16 +9908,16 @@ 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): ", +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): " + AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):" FROM t1 WHERE f1 = 2; 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/ndb_views.result b/mysql-test/suite/funcs_1/r/ndb_views.result --- a/mysql-test/suite/funcs_1/r/ndb_views.result 2007-10-05 20:06:35 +02:00 +++ b/mysql-test/suite/funcs_1/r/ndb_views.result 2007-11-22 15:05:01 +01:00 @@ -9886,16 +9886,16 @@ 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): ", +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): " + AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):" FROM t1 WHERE f1 = 2; 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-10-05 20:06:35 +02:00 +++ b/mysql-test/suite/funcs_1/views/views_master.inc 2007-11-22 15:05:01 +01:00 @@ -2415,12 +2415,21 @@ SELECT * FROM v1; # 3.3.1.54 --vertical_results SET sql_mode = 'traditional,ansi'; +# Identifier without trailing blanks until bug#32496 will be fixed (hhunger): 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): ", +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): " + 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; + SELECT * FROM v1; SET sql_mode = ''; --horizontal_results