Commit 7bc2d427 authored by ramil/ram@mysql.com/ramil.myoffice.izhnet.ru's avatar ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
Browse files

Merge mysql.com:/home/ram/work/mysql-5.0-engines 

into  mysql.com:/home/ram/work/b32559/b32559.5.0
parents 92d4ea79 ac034767

mysql-test/r/func_misc.result

+7 −0
Original line number Diff line number Diff line
@@ -207,4 +207,11 @@ test 
SELECT NAME_CONST('test', 'test');

test

test

CREATE TABLE t1(a INT);

INSERT INTO t1 VALUES (), (), ();

SELECT NAME_CONST(a, '1') FROM t1;

ERROR HY000: Incorrect arguments to NAME_CONST

SET INSERT_ID= NAME_CONST(a, a);

ERROR HY000: Incorrect arguments to NAME_CONST

DROP TABLE t1;

End of 5.0 tests

mysql-test/t/func_misc.test

+11 −1
Original line number Diff line number Diff line
@@ -204,5 +204,15 @@ SELECT NAME_CONST('test', 1.0); 
SELECT NAME_CONST('test', -1.0);

SELECT NAME_CONST('test', 'test');



--echo End of 5.0 tests

#

# Bug #32559: connection hangs on query with name_const

#

CREATE TABLE t1(a INT);

INSERT INTO t1 VALUES (), (), ();

--error ER_WRONG_ARGUMENTS

SELECT NAME_CONST(a, '1') FROM t1;

--error ER_WRONG_ARGUMENTS

SET INSERT_ID= NAME_CONST(a, a);

DROP TABLE t1;



--echo End of 5.0 tests

sql/item.cc

+11 −1
Original line number Diff line number Diff line
@@ -1209,7 +1209,17 @@ bool Item_name_const::is_null() 


Item::Type Item_name_const::type() const

{

  return value_item->type();

  /*

    As 

    1. one can try to create the Item_name_const passing non-constant 

    arguments, although it's incorrect and 

    2. the type() method can be called before the fix_fields() to get

    type information for a further type cast, e.g. 

    if (item->type() == FIELD_ITEM) 

      ((Item_field *) item)->... 

    we return NULL_ITEM in the case to avoid wrong casting.

  */

  return valid_args ? value_item->type() : NULL_ITEM;

}

sql/item.h

+3 −1
Original line number Diff line number Diff line
@@ -1111,11 +1111,13 @@ class Item_name_const : public Item 
{

  Item *value_item;

  Item *name_item;

  bool valid_args;

public:

  Item_name_const(Item *name_arg, Item *val):

    value_item(val), name_item(name_arg)

  {

    if(!value_item->basic_const_item())

    if (!(valid_args= name_item->basic_const_item() & 

                      value_item->basic_const_item()))

      my_error(ER_WRONG_ARGUMENTS, MYF(0), "NAME_CONST");

    Item::maybe_null= TRUE;

  }