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

Browse Source 
sql/sql_base.cc:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged
This commit is contained in:
unknown
2005-07-12 20:49:43 +04:00
parent 8115f6df53 2ae3cdcf97
commit 9d9ef52dbe
3 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/view.result
View File

@ -1923,6 +1923,14 @@ ERROR HY000: Field of view 'test.v2' underlying table doesn't have a default val
set sql_mode=default; set sql_mode=default;
drop view v2,v1; drop view v2,v1;
drop table t1; drop table t1;
create table t1 (f1 int);
insert into t1 values (1);
create view v1 as select f1 from t1;
select f1 as alias from v1;
alias
1
drop view v1;
drop table t1;
CREATE TABLE t1 (s1 int, s2 int); CREATE TABLE t1 (s1 int, s2 int);
INSERT INTO t1 VALUES (1,2); INSERT INTO t1 VALUES (1,2);
CREATE VIEW v1 AS SELECT s2 AS s1, s1 AS s2 FROM t1; CREATE VIEW v1 AS SELECT s2 AS s1, s1 AS s2 FROM t1;

10
mysql-test/t/view.test
View File

@ -1762,6 +1762,16 @@ set sql_mode=default;
drop view v2,v1; drop view v2,v1;
drop table t1; drop table t1;
#
# Bug#11399 Use an alias in a select statement on a view
#
create table t1 (f1 int);
insert into t1 values (1);
create view v1 as select f1 from t1;
select f1 as alias from v1;
drop view v1;
drop table t1;
# #
# Test for bug #6120: SP cache to be invalidated when altering a view # Test for bug #6120: SP cache to be invalidated when altering a view
# #

22
sql/sql_base.cc
View File

@ -2400,9 +2400,11 @@ Field *view_ref_found= (Field*) 0x2;
name name of field name name of field
item_name name of item if it will be created (VIEW) item_name name of item if it will be created (VIEW)
length length of name length length of name
ref expression substituted in VIEW should be ref [in/out] expression substituted in VIEW should be
passed using this reference (return passed using this reference (return
view_ref_found) view_ref_found)
(*ref != NULL) only if *ref contains
the item that we need to replace.
check_grants_table do check columns grants for table? check_grants_table do check columns grants for table?
check_grants_view do check columns grants for view? check_grants_view do check columns grants for view?
allow_rowid do allow finding of "_rowid" field? allow_rowid do allow finding of "_rowid" field?
@ -2440,11 +2442,6 @@ find_field_in_table(THD *thd, TABLE_LIST *table_list,
{ {
if (!my_strcasecmp(system_charset_info, field_it.name(), name)) if (!my_strcasecmp(system_charset_info, field_it.name(), name))
{ {
Item *item= field_it.create_item(thd);
if (!item)
{
DBUG_RETURN(0);
}
if (table_list->schema_table_reformed) if (table_list->schema_table_reformed)
{ {
/* /*
@ -2463,6 +2460,19 @@ find_field_in_table(THD *thd, TABLE_LIST *table_list,
name, length)) name, length))
DBUG_RETURN(WRONG_GRANT); DBUG_RETURN(WRONG_GRANT);
#endif #endif
Item *item= field_it.create_item(thd);
if (!item)
{
DBUG_RETURN(0);
}
/*
*ref != NULL means that *ref contains the item that we need to
replace. If the item was aliased by the user, set the alias to
the replacing item.
*/
if (*ref && !(*ref)->is_autogenerated_name)
item->set_name((*ref)->name, (*ref)->name_length,
system_charset_info);
if (register_tree_change) if (register_tree_change)
thd->change_item_tree(ref, item); thd->change_item_tree(ref, item);
else else