Commit 37a823b7 authored by unknown's avatar unknown
Browse files

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  rakia.gmz:/home/kgeorge/mysql/autopush/B21809-5.0-opt


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
parents c805d584 f51d0812

mysql-test/r/udf.result

+79 −0
Original line number Diff line number Diff line
@@ -105,6 +105,85 @@ explain select myfunc_int(f1) from t1 order by 1; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort

drop table t1;

CREATE TABLE t1(a INT, b INT);

INSERT INTO t1 values (1,1),(2,2);

CREATE FUNCTION fn(a int) RETURNS int DETERMINISTIC

BEGIN

RETURN a;

END

||

CREATE VIEW v1 AS SELECT a, fn(MIN(b)) as c FROM t1 GROUP BY a;

SELECT myfunc_int(a AS attr_name) FROM t1;

myfunc_int(a AS attr_name)

1

2

EXPLAIN EXTENDED SELECT myfunc_int(a AS attr_name) FROM t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	

Warnings:

Note	1003	select myfunc_int(`test`.`t1`.`a` AS `attr_name`) AS `myfunc_int(a AS attr_name)` from `test`.`t1`

EXPLAIN EXTENDED SELECT myfunc_int(a) FROM t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	

Warnings:

Note	1003	select myfunc_int(`test`.`t1`.`a` AS `a`) AS `myfunc_int(a)` from `test`.`t1`

SELECT a,c FROM v1;

a	c

1	1

2	2

SELECT a, fn(MIN(b) xx) as c FROM t1 GROUP BY a;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xx) as c FROM t1 GROUP BY a' at line 1

SELECT myfunc_int(fn(MIN(b) xx)) as c FROM t1 GROUP BY a;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xx)) as c FROM t1 GROUP BY a' at line 1

SELECT myfunc_int(test.fn(MIN(b) xx)) as c FROM t1 GROUP BY a;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xx)) as c FROM t1 GROUP BY a' at line 1

SELECT myfunc_int(fn(MIN(b)) xx) as c FROM t1 GROUP BY a;

c

1

2

SELECT myfunc_int(test.fn(MIN(b)) xx) as c FROM t1 GROUP BY a;

c

1

2

EXPLAIN EXTENDED SELECT myfunc_int(MIN(b) xx) as c FROM t1 GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort

Warnings:

Note	1003	select myfunc_int(min(`test`.`t1`.`b`) AS `xx`) AS `c` from `test`.`t1` group by `test`.`t1`.`a`

EXPLAIN EXTENDED SELECT test.fn(MIN(b)) as c FROM t1 GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort

Warnings:

Note	1003	select `test`.`fn`(min(`test`.`t1`.`b`)) AS `c` from `test`.`t1` group by `test`.`t1`.`a`

EXPLAIN EXTENDED SELECT myfunc_int(fn(MIN(b))) as c FROM t1 GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort

Warnings:

Note	1003	select myfunc_int(`test`.`fn`(min(`test`.`t1`.`b`)) AS `fn(MIN(b))`) AS `c` from `test`.`t1` group by `test`.`t1`.`a`

EXPLAIN EXTENDED SELECT myfunc_int(test.fn(MIN(b))) as c FROM t1 GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort

Warnings:

Note	1003	select myfunc_int(`test`.`fn`(min(`test`.`t1`.`b`)) AS `test.fn(MIN(b))`) AS `c` from `test`.`t1` group by `test`.`t1`.`a`

SELECT myfunc_int(MIN(b) xx) as c FROM t1 GROUP BY a;

c

1

2

SELECT test.fn(MIN(b)) as c FROM t1 GROUP BY a;

c

1

2

SELECT myfunc_int(fn(MIN(b))) as c FROM t1 GROUP BY a;

c

1

2

SELECT myfunc_int(test.fn(MIN(b))) as c FROM t1 GROUP BY a;

c

1

2

DROP VIEW v1;

DROP TABLE t1;

DROP FUNCTION fn;

End of 5.0 tests.

DROP FUNCTION metaphon;

DROP FUNCTION myfunc_double;

mysql-test/t/udf.test

+44 −0
Original line number Diff line number Diff line
@@ -127,6 +127,50 @@ create table t1(f1 int); 
insert into t1 values(1),(2);

explain select myfunc_int(f1) from t1 order by 1;

drop table t1;



# 

# Bug #21809: Error 1356 while selecting from view with grouping though 

#              underlying select OK.

#

CREATE TABLE t1(a INT, b INT); INSERT INTO t1 values (1,1),(2,2);



DELIMITER ||;

CREATE FUNCTION fn(a int) RETURNS int DETERMINISTIC

BEGIN

    RETURN a;

END

||

DELIMITER ;||



CREATE VIEW v1 AS SELECT a, fn(MIN(b)) as c FROM t1 GROUP BY a;



SELECT myfunc_int(a AS attr_name) FROM t1;

EXPLAIN EXTENDED SELECT myfunc_int(a AS attr_name) FROM t1;

EXPLAIN EXTENDED SELECT myfunc_int(a) FROM t1;

SELECT a,c FROM v1;



--error ER_PARSE_ERROR

SELECT a, fn(MIN(b) xx) as c FROM t1 GROUP BY a;

--error ER_PARSE_ERROR

SELECT myfunc_int(fn(MIN(b) xx)) as c FROM t1 GROUP BY a;

--error ER_PARSE_ERROR

SELECT myfunc_int(test.fn(MIN(b) xx)) as c FROM t1 GROUP BY a;



SELECT myfunc_int(fn(MIN(b)) xx) as c FROM t1 GROUP BY a;

SELECT myfunc_int(test.fn(MIN(b)) xx) as c FROM t1 GROUP BY a;



EXPLAIN EXTENDED SELECT myfunc_int(MIN(b) xx) as c FROM t1 GROUP BY a;

EXPLAIN EXTENDED SELECT test.fn(MIN(b)) as c FROM t1 GROUP BY a;

EXPLAIN EXTENDED SELECT myfunc_int(fn(MIN(b))) as c FROM t1 GROUP BY a;

EXPLAIN EXTENDED SELECT myfunc_int(test.fn(MIN(b))) as c FROM t1 GROUP BY a;

SELECT myfunc_int(MIN(b) xx) as c FROM t1 GROUP BY a;

SELECT test.fn(MIN(b)) as c FROM t1 GROUP BY a;

SELECT myfunc_int(fn(MIN(b))) as c FROM t1 GROUP BY a;

SELECT myfunc_int(test.fn(MIN(b))) as c FROM t1 GROUP BY a;

DROP VIEW v1;

DROP TABLE t1;

DROP FUNCTION fn;



--echo End of 5.0 tests.



#

sql/item.cc

+24 −2
Original line number Diff line number Diff line
@@ -1147,6 +1147,28 @@ void Item_name_const::print(String *str) 
}





/*

 need a special class to adjust printing : references to aggregate functions 

 must not be printed as refs because the aggregate functions that are added to

 the front of select list are not printed as well.

*/

class Item_aggregate_ref : public Item_ref

{

public:

  Item_aggregate_ref(Name_resolution_context *context_arg, Item **item,

                  const char *table_name_arg, const char *field_name_arg)

    :Item_ref(context_arg, item, table_name_arg, field_name_arg) {}



  void print (String *str)

  {

    if (ref)

      (*ref)->print(str);

    else

      Item_ident::print(str);

  }

};





/*

  Move SUM items out from item tree and replace with reference
@@ -1200,7 +1222,7 @@ void Item::split_sum_func2(THD *thd, Item **ref_pointer_array, 
    Item *new_item, *real_itm= real_item();



    ref_pointer_array[el]= real_itm;

    if (!(new_item= new Item_ref(&thd->lex->current_select->context,

    if (!(new_item= new Item_aggregate_ref(&thd->lex->current_select->context,

                                           ref_pointer_array + el, 0, name)))

      return;                                   // fatal_error is set

    fields.push_front(real_itm);

sql/item_func.cc

+14 −0
Original line number Diff line number Diff line
@@ -2869,6 +2869,20 @@ void Item_udf_func::cleanup() 
}





void Item_udf_func::print(String *str)

{

  str->append(func_name());

  str->append('(');

  for (uint i=0 ; i < arg_count ; i++)

  {

    if (i != 0)

      str->append(',');

    args[i]->print_item_w_name(str);

  }

  str->append(')');

}





double Item_func_udf_float::val_real()

{

  DBUG_ASSERT(fixed == 1);

sql/item_func.h

+1 −0
Original line number Diff line number Diff line
@@ -952,6 +952,7 @@ class Item_udf_func :public Item_func 
  Item_result result_type () const { return udf.result_type(); }

  table_map not_null_tables() const { return 0; }

  bool is_expensive() { return 1; }

  void print(String *str);

};