Commit 2f863451 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/t/merge.test:
  Auto merged
mysql-test/r/merge.result:
  Bug#26464 - insert delayed + update + merge = corruption
  Manual merge from 4.1
sql/ha_myisammrg.h:
  Bug#26464 - insert delayed + update + merge = corruption
  Manual merge from 4.1
parents af44be2d da9c659c

mysql-test/r/merge.result

+5 −0
Original line number Diff line number Diff line
@@ -803,6 +803,11 @@ CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1); 
SELECT * FROM tm1;

ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist

DROP TABLE t1, tm1;

CREATE TABLE t1(c1 INT) ENGINE=MyISAM;

CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1);

INSERT DELAYED INTO t2 VALUES(1);

ERROR HY000: Table storage engine for 't2' doesn't have this option

DROP TABLE t1, t2;

create table t1 (b bit(1));

create table t2 (b bit(1));

create table tm (b bit(1)) engine = merge union = (t1,t2);

mysql-test/t/merge.test

+9 −0
Original line number Diff line number Diff line
@@ -430,6 +430,15 @@ CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1); 
SELECT * FROM tm1;

DROP TABLE t1, tm1;



#

# Bug#26464 - insert delayed + update + merge = corruption

#

CREATE TABLE t1(c1 INT) ENGINE=MyISAM;

CREATE TABLE t2(c1 INT) ENGINE=MERGE UNION=(t1);

--error 1031

INSERT DELAYED INTO t2 VALUES(1);

DROP TABLE t1, t2;



# End of 4.1 tests



#

sql/ha_myisammrg.h

+1 −2
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ class ha_myisammrg: public handler 
  {

    return (HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_READ_RND_SAME |

	    HA_NULL_IN_KEY | HA_CAN_INDEX_BLOBS | HA_FILE_BASED |

            HA_CAN_INSERT_DELAYED | HA_ANY_INDEX_MAY_BE_UNIQUE |

            HA_CAN_BIT_FIELD);

            HA_ANY_INDEX_MAY_BE_UNIQUE | HA_CAN_BIT_FIELD);

  }

  ulong index_flags(uint inx, uint part, bool all_parts) const

  {