manual merge 5.0-bugteam --> 5.1-bugteam (bug 40825)
This commit is contained in:
commit
d4be7dadb8
@ -3699,6 +3699,25 @@ SELECT * FROM v1 IGNORE INDEX (c2) WHERE c2=2;
|
|||||||
ERROR 42000: Key 'c2' doesn't exist in table 'v1'
|
ERROR 42000: Key 'c2' doesn't exist in table 'v1'
|
||||||
DROP VIEW v1;
|
DROP VIEW v1;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
# -----------------------------------------------------------------
|
||||||
|
# -- Bug#40825: Error 1356 while selecting from a view
|
||||||
|
# -- with a "HAVING" clause though query works
|
||||||
|
# -----------------------------------------------------------------
|
||||||
|
|
||||||
|
CREATE TABLE t1 (c INT);
|
||||||
|
|
||||||
|
CREATE VIEW v1 (view_column) AS SELECT c AS alias FROM t1 HAVING alias;
|
||||||
|
SHOW CREATE VIEW v1;
|
||||||
|
View Create View character_set_client collation_connection
|
||||||
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`c` AS `view_column` from `t1` having `view_column` latin1 latin1_swedish_ci
|
||||||
|
SELECT * FROM v1;
|
||||||
|
view_column
|
||||||
|
|
||||||
|
DROP VIEW v1;
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
# -- End of test case for Bug#40825
|
||||||
|
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
# -- End of 5.0 tests.
|
# -- End of 5.0 tests.
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
|
@ -3680,6 +3680,29 @@ SELECT * FROM v1 IGNORE INDEX (c2) WHERE c2=2;
|
|||||||
DROP VIEW v1;
|
DROP VIEW v1;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
--echo # -----------------------------------------------------------------
|
||||||
|
--echo # -- Bug#40825: Error 1356 while selecting from a view
|
||||||
|
--echo # -- with a "HAVING" clause though query works
|
||||||
|
--echo # -----------------------------------------------------------------
|
||||||
|
--echo
|
||||||
|
|
||||||
|
CREATE TABLE t1 (c INT);
|
||||||
|
|
||||||
|
--echo
|
||||||
|
|
||||||
|
CREATE VIEW v1 (view_column) AS SELECT c AS alias FROM t1 HAVING alias;
|
||||||
|
SHOW CREATE VIEW v1;
|
||||||
|
SELECT * FROM v1;
|
||||||
|
|
||||||
|
--echo
|
||||||
|
|
||||||
|
DROP VIEW v1;
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
--echo
|
||||||
|
--echo # -- End of test case for Bug#40825
|
||||||
|
--echo
|
||||||
|
|
||||||
--echo # -----------------------------------------------------------------
|
--echo # -----------------------------------------------------------------
|
||||||
--echo # -- End of 5.0 tests.
|
--echo # -- End of 5.0 tests.
|
||||||
--echo # -----------------------------------------------------------------
|
--echo # -----------------------------------------------------------------
|
||||||
|
@ -5810,7 +5810,8 @@ void Item_ref::print(String *str, enum_query_type query_type)
|
|||||||
!table_name && name && alias_name_used)
|
!table_name && name && alias_name_used)
|
||||||
{
|
{
|
||||||
THD *thd= current_thd;
|
THD *thd= current_thd;
|
||||||
append_identifier(thd, str, name, (uint) strlen(name));
|
append_identifier(thd, str, (*ref)->real_item()->name,
|
||||||
|
(*ref)->real_item()->name_length);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
(*ref)->print(str, query_type);
|
(*ref)->print(str, query_type);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user