Commit cb33d0dc authored by hhunger@hh-nb.hhunger's avatar hhunger@hh-nb.hhunger
Browse files

Merge hh-nb.hhunger:/work/trees/mysql-5.0-build-src-clean 

into  hh-nb.hhunger:/work/merge/mysql-5.0-build
parents 99c4a164 10ea2aa9

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/suite/funcs_1/r/innodb_views.result

+11 −4
Original line number Diff line number Diff line
@@ -9841,6 +9841,13 @@ SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns 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

mysql-test/suite/funcs_1/r/memory_views.result

+11 −4
Original line number Diff line number Diff line
@@ -9846,6 +9846,13 @@ SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns 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

mysql-test/suite/funcs_1/views/views_master.inc

+9 −0
Original line number Diff line number Diff line
@@ -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): ",