Commit 6fe40f76 authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/r/view.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
configure.in:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
storage/ndb/src/mgmsrv/Services.cpp:
  manual merge
parents 09999bc2 2f955d19

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/r/view.result

+1 −1
Original line number Diff line number Diff line
@@ -2606,7 +2606,7 @@ create view v2 as select * from v1; 
drop table t1;

rename table v2 to t1;

select * from v1;

ERROR HY000: `test`.`v1` contain view recursion

ERROR HY000: `test`.`v1` contains view recursion

drop view t1, v1;

create table t1 (a int);

create function f1() returns int

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/ha_ndbcluster.cc

+29 −6
Original line number Diff line number Diff line
@@ -7267,11 +7267,24 @@ ndb_get_table_statistics(Ndb* ndb, const char * table, 
{

  DBUG_ENTER("ndb_get_table_statistics");

  DBUG_PRINT("enter", ("table: %s", table));

  NdbTransaction* pTrans= ndb->startTransaction();

  if (pTrans == NULL)

    ERR_RETURN(ndb->getNdbError());

  NdbTransaction* pTrans;

  int retries= 10;

  int retry_sleep= 30 * 1000; /* 30 milliseconds */



  do

  {

    pTrans= ndb->startTransaction();

    if (pTrans == NULL)

    {

      if (ndb->getNdbError().status == NdbError::TemporaryError &&

          retries--)

      {

        my_sleep(retry_sleep);

        continue;

      }

      ERR_RETURN(ndb->getNdbError());

    }



    NdbScanOperation* pOp= pTrans->getNdbScanOperation(table);

    if (pOp == NULL)

      break;
@@ -7294,7 +7307,17 @@ ndb_get_table_statistics(Ndb* ndb, const char * table, 
                           NdbTransaction::AbortOnError,

                           TRUE);

    if (check == -1)

    {

      if (pTrans->getNdbError().status == NdbError::TemporaryError &&

          retries--)

      {

        ndb->closeTransaction(pTrans);

        pTrans= 0;

        my_sleep(retry_sleep);

        continue;

      }

      break;

    }



    Uint32 count= 0;

    Uint64 sum_rows= 0;
@@ -7329,7 +7352,7 @@ ndb_get_table_statistics(Ndb* ndb, const char * table, 
                        sum_mem, count));



    DBUG_RETURN(0);

  } while (0);

  } while(1);



  if (pTrans)

    ndb->closeTransaction(pTrans);

sql/item.cc

+10 −0
Original line number Diff line number Diff line
@@ -1998,6 +1998,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