Commit 49c8409c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1-fix 

into mysql.com:/home/jonas/src/mysql-4.1


mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents ecfe759e 94a5379f

mysql-test/r/ndb_index_unique.result

+36 −0
Original line number Diff line number Diff line
@@ -574,3 +574,39 @@ uid gid rid cid 
1	1	2	3

1	1	2	4

drop table t1,t2,t3,t4,t5,t6,t7;

CREATE TABLE t1 (   

a int unsigned NOT NULL PRIMARY KEY,

b int unsigned,   

c int unsigned, 

UNIQUE bc(b,c) ) engine = ndb;

insert into t1 values(1,1,1),(2,NULL,2),(3,NULL,NULL),(4,4,NULL);

select * from t1 where b=1 and c=1;

a	b	c

1	1	1

select * from t1 where b is null and c is null;

a	b	c

3	NULL	NULL

select * from t1 where b is null and c = 2;

a	b	c

2	NULL	2

select * from t1 where b = 4 and c is null;

a	b	c

4	4	NULL

create table t8 as 

select * from t1 where (b = 1 and c = 1)

or (b is null and c is null) 

or (b is null and c = 2)

or (b = 4 and c is null);

select * from t8 order by a;

a	b	c

1	1	1

2	NULL	2

3	NULL	NULL

4	4	NULL

select * from t1 order by a;

a	b	c

1	1	1

2	NULL	2

3	NULL	NULL

4	4	NULL

drop table t1, t8;

mysql-test/t/ndb_index_unique.test

+20 −0
Original line number Diff line number Diff line
@@ -265,4 +265,24 @@ select * from t4 where rid = 2 order by cid; 


drop table t1,t2,t3,t4,t5,t6,t7;



# test null in indexes

CREATE TABLE t1 (   

   a int unsigned NOT NULL PRIMARY KEY,

   b int unsigned,   

   c int unsigned, 

   UNIQUE bc(b,c) ) engine = ndb;

 

insert into t1 values(1,1,1),(2,NULL,2),(3,NULL,NULL),(4,4,NULL);

select * from t1 where b=1 and c=1;

select * from t1 where b is null and c is null;

select * from t1 where b is null and c = 2;

select * from t1 where b = 4 and c is null;

create table t8 as 

select * from t1 where (b = 1 and c = 1)

                    or (b is null and c is null) 

                    or (b is null and c = 2)

                    or (b = 4 and c is null);

select * from t8 order by a;

select * from t1 order by a;

drop table t1, t8;

sql/ha_ndbcluster.cc

+38 −6
Original line number Diff line number Diff line
@@ -1197,9 +1197,10 @@ int ha_ndbcluster::unique_index_read(const byte *key, 


  for (i= 0; key_part != end; key_part++, i++) 

  {

    if (set_ndb_key(op, key_part->field, i, key_ptr))

    if (set_ndb_key(op, key_part->field, i, 

		    key_part->null_bit ? key_ptr + 1 : key_ptr))

      ERR_RETURN(trans->getNdbError());

    key_ptr+= key_part->length;

    key_ptr+= key_part->store_length;

  }



  // Get non-index attribute(s)
@@ -2287,6 +2288,28 @@ int ha_ndbcluster::index_end() 
  DBUG_RETURN(close_scan());

}



/**

 * Check if key contains null

 */

static

int

check_null_in_key(const KEY* key_info, const byte *key, uint key_len)

{

  KEY_PART_INFO *curr_part, *end_part;

  const byte* end_ptr = key + key_len;

  curr_part= key_info->key_part;

  end_part= curr_part + key_info->key_parts;

  



  for (; curr_part != end_part && key < end_ptr; curr_part++)

  {

    if(curr_part->null_bit && *key)

      return 1;



    key += curr_part->store_length;

  }

  return 0;

}



int ha_ndbcluster::index_read(byte *buf,

			      const byte *key, uint key_len,
@@ -2304,6 +2327,8 @@ int ha_ndbcluster::index_read(byte *buf, 
  case PRIMARY_KEY_INDEX:

    if (find_flag == HA_READ_KEY_EXACT && key_info->key_length == key_len)

    {

      if(m_active_cursor && (error= close_scan()))

	DBUG_RETURN(error);

      DBUG_RETURN(pk_read(key, key_len, buf));

    }

    else if (type == PRIMARY_KEY_INDEX)
@@ -2313,8 +2338,11 @@ int ha_ndbcluster::index_read(byte *buf, 
    break;

  case UNIQUE_ORDERED_INDEX:

  case UNIQUE_INDEX:

    if (find_flag == HA_READ_KEY_EXACT && key_info->key_length == key_len)

    if (find_flag == HA_READ_KEY_EXACT && key_info->key_length == key_len &&

	!check_null_in_key(key_info, key, key_len))

    {

      if(m_active_cursor && (error= close_scan()))

	DBUG_RETURN(error);

      DBUG_RETURN(unique_index_read(key, key_len, buf));

    }

    else if (type == UNIQUE_INDEX)
@@ -2418,6 +2446,8 @@ int ha_ndbcluster::read_range_first_to_buf(const key_range *start_key, 
	start_key->length == key_info->key_length &&

	start_key->flag == HA_READ_KEY_EXACT)

    {

      if(m_active_cursor && (error= close_scan()))

	DBUG_RETURN(error);

      error= pk_read(start_key->key, start_key->length, buf);      

      DBUG_RETURN(error == HA_ERR_KEY_NOT_FOUND ? HA_ERR_END_OF_FILE : error);

    }
@@ -2425,10 +2455,12 @@ int ha_ndbcluster::read_range_first_to_buf(const key_range *start_key, 
  case UNIQUE_ORDERED_INDEX:

  case UNIQUE_INDEX:

    key_info= table->key_info + active_index;

    if (start_key && 

	start_key->length == key_info->key_length &&

	start_key->flag == HA_READ_KEY_EXACT)

    if (start_key && start_key->length == key_info->key_length &&

	start_key->flag == HA_READ_KEY_EXACT && 

	!check_null_in_key(key_info, start_key->key, start_key->length))

    {

      if(m_active_cursor && (error= close_scan()))

	DBUG_RETURN(error);

      error= unique_index_read(start_key->key, start_key->length, buf);

      DBUG_RETURN(error == HA_ERR_KEY_NOT_FOUND ? HA_ERR_END_OF_FILE : error);

    }