Commit 9de8e3b0 authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged
parents 37abfebb 0a9badec

mysql-test/r/view.result

+8 −0
Original line number Diff line number Diff line
@@ -2385,6 +2385,14 @@ show create view v1; 
View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `v1` AS select 1 AS `1`

drop view v1;

create table t1 (id INT, primary key(id));

insert into t1 values (1),(2);

create view v1 as select * from t1;

explain select id from v1 order by id;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	index	NULL	PRIMARY	4	NULL	2	Using index

drop view v1;

drop table t1;

create table t1(f1 int, f2 int);

insert into t1 values (null, 10), (null,2);

create view v1 as select * from t1;

mysql-test/t/view.test

+10 −0
Original line number Diff line number Diff line
@@ -2254,6 +2254,16 @@ create definer = current_user sql security invoker view v1 as select 1; 
show create view v1;

drop view v1;



#

# Bug #14816 test_if_order_by_key() expected only Item_fields.

#

create table t1 (id INT, primary key(id));

insert into t1 values (1),(2);

create view v1 as select * from t1;

explain select id from v1 order by id;

drop view v1;

drop table t1;



#

# Bug #14850 Item_ref's values wasn't updated

#

sql/sql_select.cc

+1 −1
Original line number Diff line number Diff line
@@ -10988,7 +10988,7 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx, 


  for (; order ; order=order->next, const_key_parts>>=1)

  {

    Field *field=((Item_field*) (*order->item))->field;

    Field *field=((Item_field*) (*order->item)->real_item())->field;

    int flag;



    /*