Commit b2f028c5 authored by unknown's avatar unknown
Browse files

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  c-5608e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
parents 9f2a2b9a ab204bf6

heap/hp_create.c

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
      DBUG_RETURN(1);

    }

    share->keydef= (HP_KEYDEF*) (share + 1);

    share->key_stat_version= 1;

    keyseg= (HA_KEYSEG*) (share->keydef + keys);

    init_block(&share->block, reclength + 1, min_records, max_records);

	/* Fix keys */

include/heap.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ typedef struct st_heap_share 
  HP_KEYDEF  *keydef;

  ulong min_records,max_records;	/* Params to open */

  ulong data_length,index_length,max_table_size;

  uint key_stat_version;                /* version to indicate insert/delete */

  uint records;				/* records */

  uint blength;				/* records rounded up to 2^n */

  uint deleted;				/* Deleted records in database */

mysql-test/r/heap.result

+11 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ SELECT * FROM t1 WHERE a=NULL; 
a	b

explain SELECT * FROM t1 WHERE a IS NULL;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	a	a	5	const	1	Using where

1	SIMPLE	t1	ref	a	a	5	const	2	Using where

SELECT * FROM t1 WHERE a<=>NULL;

a	b

NULL	99
@@ -296,3 +296,13 @@ insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd 
insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");

ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl' for key 1

drop table t1;

CREATE TABLE t1 (a int, key(a)) engine=heap;

insert delayed into t1 values (0);

delete from t1;

select * from t1;

a

insert delayed into t1 values (0), (1);

select * from t1 where a = 0;

a

0

drop table t1;

mysql-test/t/heap.test

+11 −0
Original line number Diff line number Diff line
@@ -234,4 +234,15 @@ insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd 
insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");

drop table t1;



#

# Bug 12796: Record doesn't show when selecting through index

#

CREATE TABLE t1 (a int, key(a)) engine=heap;

insert delayed into t1 values (0);

delete from t1;

select * from t1;

insert delayed into t1 values (0), (1);

select * from t1 where a = 0;

drop table t1;



# End of 4.1 tests

mysql-test/t/test_heap.test

0 → 100644
+20 −0
Original line number Diff line number Diff line 
#

# Test of heap tables.

#



--disable_warnings

drop table if exists t1;

--enable_warnings



#

# Bug 12796: Record doesn't show when selecting through index

#

CREATE TABLE t1 (a int, key(a)) engine=heap;

insert delayed into t1 values (0);

delete from t1;

select * from t1;

insert delayed into t1 values (0), (1);

select * from t1 where a = 0;

drop table t1;



# End of 4.1 tests