Commit 42422d0e authored by unknown's avatar unknown
Browse files

Merge chilla.local:/home/mydev/mysql-4.1-bug24985 

into  chilla.local:/home/mydev/mysql-5.0-bug24985


mysql-test/r/heap_btree.result:
  Auto merged
sql/ha_heap.cc:
  Auto merged
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge from 4.1
parents 578d29d6 1fd0ba89

mysql-test/r/heap_btree.result

+12 −0
Original line number Diff line number Diff line
@@ -280,6 +280,18 @@ a 
1

1

drop table t1;

CREATE TABLE t1 (

c1 ENUM('1', '2'),

UNIQUE USING BTREE(c1)

) ENGINE= MEMORY DEFAULT CHARSET= utf8;

INSERT INTO t1 VALUES('1'), ('2');

DROP TABLE t1;

CREATE TABLE t1 (

c1 SET('1', '2'),

UNIQUE USING BTREE(c1)

) ENGINE= MEMORY DEFAULT CHARSET= utf8;

INSERT INTO t1 VALUES('1'), ('2');

DROP TABLE t1;

End of 4.1 tests

CREATE TABLE t1(val INT, KEY USING BTREE(val)) ENGINE=memory;

INSERT INTO t1 VALUES(0);

mysql-test/t/heap_btree.test

+18 −0
Original line number Diff line number Diff line
@@ -204,4 +204,22 @@ CREATE TABLE t1 (a INT, UNIQUE USING BTREE(a)) ENGINE=MEMORY; 
INSERT INTO t1 VALUES(NULL),(NULL);

DROP TABLE t1;



#

# Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE

#             causes incorrect duplicate entries

#

CREATE TABLE t1 (

  c1 ENUM('1', '2'),

  UNIQUE USING BTREE(c1)

) ENGINE= MEMORY DEFAULT CHARSET= utf8;

INSERT INTO t1 VALUES('1'), ('2');

DROP TABLE t1;

CREATE TABLE t1 (

  c1 SET('1', '2'),

  UNIQUE USING BTREE(c1)

) ENGINE= MEMORY DEFAULT CHARSET= utf8;

INSERT INTO t1 VALUES('1'), ('2');

DROP TABLE t1;



--echo End of 4.1 tests

--echo End of 5.0 tests

sql/ha_heap.cc

+4 −1
Original line number Diff line number Diff line
@@ -604,6 +604,9 @@ int ha_heap::create(const char *name, TABLE *table_arg, 
      seg->length=  (uint) key_part->length;

      seg->flag=    key_part->key_part_flag;



      if (field->flags & (ENUM_FLAG | SET_FLAG))

        seg->charset= &my_charset_bin;

      else

        seg->charset= field->charset();

      if (field->null_ptr)

      {