database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge hh-nb.hhunger:/work/merge/mysql-5.0-32496

Browse Source 
into  hh-nb.hhunger:/work/merge/mysql-5.1-32496


BitKeeper/etc/ignore:
  auto-union
mysql-test/suite/funcs_1/r/innodb_views.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_views.result:
  used ul
This commit is contained in:
unknown
2007-11-26 22:19:39 +01:00
parent 9cf1b18593 77f59b989c
commit c916a0761b
4 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -1845,6 +1845,7 @@ scripts/make_binary_distribution
scripts/make_sharedlib_distribution scripts/make_sharedlib_distribution
scripts/make_win_binary_distribution scripts/make_win_binary_distribution
scripts/make_win_src_distribution scripts/make_win_src_distribution
scripts/make_win_src_distribution_old
scripts/msql2mysql scripts/msql2mysql
scripts/mysql_config scripts/mysql_config
scripts/mysql_convert_table_format scripts/mysql_convert_table_format

15
mysql-test/suite/funcs_1/r/innodb_views.result
View File

@ -9886,16 +9886,23 @@ f2
two two
SET sql_mode = 'traditional,ansi'; SET sql_mode = 'traditional,ansi';
CREATE OR REPLACE VIEW v1 AS 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 = ", 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): ", 3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",
'->' || CAST(f3 AS CHAR) || '<-' '->' || 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; FROM t1 WHERE f1 = 2;
ERROR 42000: Incorrect column name 'pure column f3: '
SELECT * FROM v1; SELECT * FROM v1;
pure column f3: 2.20000 pure column f3: 2.20000
sum of columns f1 + f3 = 4.20000 sum of columns f1 + f3 = 4.20000
product of constants 3 * (- 0.11111E+1): -3.3333 product of constants 3 * (- 0.11111E+1): -3.3333
expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<- expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<-
SET sql_mode = ''; SET sql_mode = '';
Testcases 3.3.1.55 - 3.3.1.62 Testcases 3.3.1.55 - 3.3.1.62

15
mysql-test/suite/funcs_1/r/memory_views.result
View File

@ -9891,16 +9891,23 @@ f2
two two
SET sql_mode = 'traditional,ansi'; SET sql_mode = 'traditional,ansi';
CREATE OR REPLACE VIEW v1 AS 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 = ", 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): ", 3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",
'->' || CAST(f3 AS CHAR) || '<-' '->' || 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; FROM t1 WHERE f1 = 2;
ERROR 42000: Incorrect column name 'pure column f3: '
SELECT * FROM v1; SELECT * FROM v1;
pure column f3: 2.20000 pure column f3: 2.20000
sum of columns f1 + f3 = 4.20000 sum of columns f1 + f3 = 4.20000
product of constants 3 * (- 0.11111E+1): -3.3333 product of constants 3 * (- 0.11111E+1): -3.3333
expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<- expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<-
SET sql_mode = ''; SET sql_mode = '';
Testcases 3.3.1.55 - 3.3.1.62 Testcases 3.3.1.55 - 3.3.1.62

9
mysql-test/suite/funcs_1/views/views_master.inc
View File

@ -2415,6 +2415,15 @@ SELECT * FROM v1;
# 3.3.1.54 # 3.3.1.54
--vertical_results --vertical_results
SET sql_mode = 'traditional,ansi'; 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 CREATE OR REPLACE VIEW v1 AS
SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ", 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): ", 3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",