Commit 7c018c39 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/psergey/mysql-5.0-bug15827-r2
parents 9f5cec76 15e00f1f

mysql-test/r/func_in.result

+102 −1
Original line number Diff line number Diff line 
drop table if exists t1;

drop table if exists t1, t2;

select 1 in (1,2,3);

1 in (1,2,3)

1
@@ -225,3 +225,104 @@ a 
46

DROP VIEW v1;

DROP TABLE t1;

create table t1 (a int);

insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);

create table t2 (a int, filler char(200), key(a));

insert into t2 select C.a*2,   'no'  from t1 A, t1 B, t1 C;

insert into t2 select C.a*2+1, 'yes' from t1 C;

explain 

select * from t2 where a NOT IN (0, 2,4,6,8,10,12,14,16,18);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	range	a	a	5	NULL	12	Using where

select * from t2 where a NOT IN (0, 2,4,6,8,10,12,14,16,18);

a	filler

1	yes

3	yes

5	yes

7	yes

9	yes

11	yes

13	yes

15	yes

17	yes

19	yes

explain select * from t2 force index(a) where a NOT IN (2,2,2,2,2,2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	range	a	a	5	NULL	912	Using where

explain select * from t2 force index(a) where a <> 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	range	a	a	5	NULL	912	Using where

drop table t2;

create table t2 (a datetime, filler char(200), key(a));

insert into t2 select '2006-04-25 10:00:00' + interval C.a minute,

'no'  from t1 A, t1 B, t1 C where C.a % 2 = 0;

insert into t2 select '2006-04-25 10:00:00' + interval C.a*2+1 minute,

'yes' from t1 C;

explain 

select * from t2 where a NOT IN (

'2006-04-25 10:00:00','2006-04-25 10:02:00','2006-04-25 10:04:00', 

'2006-04-25 10:06:00', '2006-04-25 10:08:00');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	range	a	a	9	NULL	18	Using where

select * from t2 where a NOT IN (

'2006-04-25 10:00:00','2006-04-25 10:02:00','2006-04-25 10:04:00', 

'2006-04-25 10:06:00', '2006-04-25 10:08:00');

a	filler

2006-04-25 10:01:00	yes

2006-04-25 10:03:00	yes

2006-04-25 10:05:00	yes

2006-04-25 10:07:00	yes

2006-04-25 10:09:00	yes

2006-04-25 10:11:00	yes

2006-04-25 10:13:00	yes

2006-04-25 10:15:00	yes

2006-04-25 10:17:00	yes

2006-04-25 10:19:00	yes

drop table t2;

create table t2 (a varchar(10), filler char(200), key(a));

insert into t2 select 'foo', 'no' from t1 A, t1 B;

insert into t2 select 'barbar', 'no' from t1 A, t1 B;

insert into t2 select 'bazbazbaz', 'no' from t1 A, t1 B;

insert into t2 values ('fon', '1'), ('fop','1'), ('barbaq','1'), 

('barbas','1'), ('bazbazbay', '1'),('zz','1');

explain select * from t2 where a not in('foo','barbar', 'bazbazbaz');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	range	a	a	13	NULL	7	Using where

drop table t2;

create table t2 (a decimal(10,5), filler char(200), key(a));

insert into t2 select 345.67890, 'no' from t1 A, t1 B;

insert into t2 select 43245.34, 'no' from t1 A, t1 B;

insert into t2 select 64224.56344, 'no' from t1 A, t1 B;

insert into t2 values (0, '1'), (22334.123,'1'), (33333,'1'), 

(55555,'1'), (77777, '1');

explain

select * from t2 where a not in (345.67890, 43245.34, 64224.56344);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	range	a	a	7	NULL	7	Using where

select * from t2 where a not in (345.67890, 43245.34, 64224.56344);

a	filler

0.00000	1

22334.12300	1

33333.00000	1

55555.00000	1

77777.00000	1

drop table t2;

create table t2 (a int, key(a), b int);

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

set @cnt= 1;

set @str="update t2 set b=1 where a not in (";

select count(*) from (

select @str:=concat(@str, @cnt:=@cnt+1, ",") 

from t1 A, t1 B, t1 C, t1 D) Z;

count(*)

10000

set @str:=concat(@str, "10000)");

select substr(@str, 1, 50);

substr(@str, 1, 50)

update t2 set b=1 where a not in (2,3,4,5,6,7,8,9,

prepare s from @str;

execute s;

deallocate prepare s;

set @str=NULL;

drop table t2;

drop table t1;

mysql-test/t/func_in.test

+93 −1
Original line number Diff line number Diff line 
# Initialise

--disable_warnings

drop table if exists t1;

drop table if exists t1, t2;

--enable_warnings

#

# test of IN (NULL)
@@ -128,3 +128,95 @@ SELECT * FROM v1; 


DROP VIEW v1;

DROP TABLE t1;



# BUG#15872: Excessive memory consumption of range analysis of NOT IN

create table t1 (a int);

insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); 

create table t2 (a int, filler char(200), key(a));



insert into t2 select C.a*2,   'no'  from t1 A, t1 B, t1 C;

insert into t2 select C.a*2+1, 'yes' from t1 C;



explain 

select * from t2 where a NOT IN (0, 2,4,6,8,10,12,14,16,18);

select * from t2 where a NOT IN (0, 2,4,6,8,10,12,14,16,18);



explain select * from t2 force index(a) where a NOT IN (2,2,2,2,2,2);

explain select * from t2 force index(a) where a <> 2;



drop table t2;



#

# Repeat the test for DATETIME

#

create table t2 (a datetime, filler char(200), key(a));



insert into t2 select '2006-04-25 10:00:00' + interval C.a minute,

               'no'  from t1 A, t1 B, t1 C where C.a % 2 = 0;



insert into t2 select '2006-04-25 10:00:00' + interval C.a*2+1 minute,

               'yes' from t1 C;



explain 

select * from t2 where a NOT IN (

  '2006-04-25 10:00:00','2006-04-25 10:02:00','2006-04-25 10:04:00', 

  '2006-04-25 10:06:00', '2006-04-25 10:08:00');

select * from t2 where a NOT IN (

  '2006-04-25 10:00:00','2006-04-25 10:02:00','2006-04-25 10:04:00', 

  '2006-04-25 10:06:00', '2006-04-25 10:08:00');

drop table t2;



#

# Repeat the test for CHAR(N)

#

create table t2 (a varchar(10), filler char(200), key(a));



insert into t2 select 'foo', 'no' from t1 A, t1 B;

insert into t2 select 'barbar', 'no' from t1 A, t1 B;

insert into t2 select 'bazbazbaz', 'no' from t1 A, t1 B;



insert into t2 values ('fon', '1'), ('fop','1'), ('barbaq','1'), 

  ('barbas','1'), ('bazbazbay', '1'),('zz','1');



explain select * from t2 where a not in('foo','barbar', 'bazbazbaz');



drop table t2;



#

# Repeat for DECIMAL

#

create table t2 (a decimal(10,5), filler char(200), key(a));



insert into t2 select 345.67890, 'no' from t1 A, t1 B;

insert into t2 select 43245.34, 'no' from t1 A, t1 B;

insert into t2 select 64224.56344, 'no' from t1 A, t1 B;



insert into t2 values (0, '1'), (22334.123,'1'), (33333,'1'), 

  (55555,'1'), (77777, '1');



explain

select * from t2 where a not in (345.67890, 43245.34, 64224.56344);

select * from t2 where a not in (345.67890, 43245.34, 64224.56344);



drop table t2;



# Try a very big IN-list

create table t2 (a int, key(a), b int);

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



set @cnt= 1; 

set @str="update t2 set b=1 where a not in (";

select count(*) from (

  select @str:=concat(@str, @cnt:=@cnt+1, ",") 

  from t1 A, t1 B, t1 C, t1 D) Z;



set @str:=concat(@str, "10000)");

select substr(@str, 1, 50);

prepare s from @str;

execute s;

deallocate prepare s;

set @str=NULL;



drop table t2;

drop table t1;

sql/item.cc

+10 −0
Original line number Diff line number Diff line
@@ -1991,6 +1991,16 @@ bool Item_decimal::eq(const Item *item, bool binary_cmp) const 
}





void Item_decimal::set_decimal_value(my_decimal *value_par)

{

  my_decimal2decimal(value_par, &decimal_value);

  decimals= (uint8) decimal_value.frac;

  unsigned_flag= !decimal_value.sign();

  max_length= my_decimal_precision_to_length(decimal_value.intg + decimals,

                                             decimals, unsigned_flag);

}





String *Item_float::val_str(String *str)

{

  // following assert is redundant, because fixed=1 assigned in constructor

sql/item.h

+1 −0
Original line number Diff line number Diff line
@@ -1442,6 +1442,7 @@ class Item_decimal :public Item_num 
  }

  uint decimal_precision() const { return decimal_value.precision(); }

  bool eq(const Item *, bool binary_cmp) const;

  void set_decimal_value(my_decimal *value_par);

};

sql/item_cmpfunc.h

+74 −3
Original line number Diff line number Diff line
@@ -623,15 +623,17 @@ class Item_func_case :public Item_func 


/* Functions to handle the optimized IN */





/* A vector of values of some type  */



class in_vector :public Sql_alloc

{

 protected:

public:

  char *base;

  uint size;

  qsort2_cmp compare;

  CHARSET_INFO *collation;

  uint count;

public:

  uint used_count;

  in_vector() {}

  in_vector(uint elements,uint element_length,qsort2_cmp cmp_func,
@@ -647,6 +649,32 @@ class in_vector :public Sql_alloc 
    qsort2(base,used_count,size,compare,collation);

  }

  int find(Item *item);

  

  /* 

    Create an instance of Item_{type} (e.g. Item_decimal) constant object

    which type allows it to hold an element of this vector without any

    conversions.

    The purpose of this function is to be able to get elements of this

    vector in form of Item_xxx constants without creating Item_xxx object

    for every array element you get (i.e. this implements "FlyWeight" pattern)

  */

  virtual Item* create_item() { return NULL; }

  

  /*

    Store the value at position #pos into provided item object

    SYNOPSIS

      value_to_item()

        pos   Index of value to store

        item  Constant item to store value into. The item must be of the same

              type that create_item() returns.

  */

  virtual void value_to_item(uint pos, Item *item) { }

  

  /* Compare values number pos1 and pos2 for equality */

  bool compare_elems(uint pos1, uint pos2)

  {

    return test(compare(collation, base + pos1*size, base + pos2*size));

  }

};



class in_string :public in_vector
@@ -658,6 +686,16 @@ class in_string :public in_vector 
  ~in_string();

  void set(uint pos,Item *item);

  byte *get_value(Item *item);

  Item* create_item()

  { 

    return new Item_string(collation);

  }

  void value_to_item(uint pos, Item *item)

  {    

    String *str=((String*) base)+pos;

    Item_string *to= (Item_string*)item;

    to->str_value= *str;

  }

};



class in_longlong :public in_vector
@@ -667,6 +705,19 @@ class in_longlong :public in_vector 
  in_longlong(uint elements);

  void set(uint pos,Item *item);

  byte *get_value(Item *item);

  

  Item* create_item()

  { 

    /* 

      We're created a signed INT, this may not be correct in 

      general case (see BUG#19342).

    */

    return new Item_int(0);

  }

  void value_to_item(uint pos, Item *item)

  {

    ((Item_int*)item)->value= ((longlong*)base)[pos];

  }

};



class in_double :public in_vector
@@ -676,6 +727,15 @@ class in_double :public in_vector 
  in_double(uint elements);

  void set(uint pos,Item *item);

  byte *get_value(Item *item);

  Item *create_item()

  { 

    return new Item_float(0.0);

  }

  void value_to_item(uint pos, Item *item)

  {

    ((Item_float*)item)->value= ((double*) base)[pos];

  }



};



class in_decimal :public in_vector
@@ -685,6 +745,16 @@ class in_decimal :public in_vector 
  in_decimal(uint elements);

  void set(uint pos, Item *item);

  byte *get_value(Item *item);

  Item *create_item()

  { 

    return new Item_decimal(0, FALSE);

  }

  void value_to_item(uint pos, Item *item)

  {

    my_decimal *dec= ((my_decimal *)base) + pos;

    Item_decimal *item_dec= (Item_decimal*)item;

    item_dec->set_decimal_value(dec);

  }

};
@@ -864,12 +934,13 @@ class cmp_item_sort_string_in_static :public cmp_item_string 


class Item_func_in :public Item_func_opt_neg

{

public:

  Item_result cmp_type;

  in_vector *array;

  cmp_item *in_item;

  bool have_null;

  DTCollation cmp_collation;

 public:



  Item_func_in(List<Item> &list)

    :Item_func_opt_neg(list), array(0), in_item(0), have_null(0)

  {