Commit 7a223fe8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-4.1 

into mysql.com:/home/mydev/mysql-4.1-4100
parents d104149c 0461b482

mysql-test/r/merge.result

+10 −0
Original line number Diff line number Diff line
@@ -681,3 +681,13 @@ t3 1 a 1 a A NULL NULL NULL YES BTREE 
t3	1	a	2	b	A	NULL	NULL	NULL	YES	BTREE	

t3	1	a	3	c	A	NULL	NULL	NULL	YES	BTREE	

drop table t1, t2, t3;

CREATE TABLE t1 ( a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(10), UNIQUE (b) )

ENGINE=MyISAM;

CREATE TABLE t2 ( a INT AUTO_INCREMENT, b VARCHAR(10), INDEX (a), INDEX (b) )

ENGINE=MERGE UNION (t1) INSERT_METHOD=FIRST;

INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=2;

INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=3;

SELECT b FROM t2;

b

3

DROP TABLE t1, t2;

mysql-test/t/merge.test

+12 −0
Original line number Diff line number Diff line
@@ -306,3 +306,15 @@ show index from t3; 


drop table t1, t2, t3;



#

# Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE

#

CREATE TABLE t1 ( a INT AUTO_INCREMENT PRIMARY KEY, b VARCHAR(10), UNIQUE (b) )

  ENGINE=MyISAM;

CREATE TABLE t2 ( a INT AUTO_INCREMENT, b VARCHAR(10), INDEX (a), INDEX (b) )

  ENGINE=MERGE UNION (t1) INSERT_METHOD=FIRST;

INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=2;

INSERT INTO t2 (b) VALUES (1) ON DUPLICATE KEY UPDATE b=3;

SELECT b FROM t2;

DROP TABLE t1, t2;

sql/ha_myisammrg.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,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_CAN_INSERT_DELAYED | HA_ANY_INDEX_MAY_BE_UNIQUE);

  }

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

  {

sql/handler.h

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#define HA_HAS_CHECKSUM        (1 << 24)

/* Table data are stored in separate files (for lower_case_table_names) */

#define HA_FILE_BASED	       (1 << 26)

#define HA_ANY_INDEX_MAY_BE_UNIQUE (1 << 30)





/* bits in index_flags(index_number) for what you can do with index */

sql/sql_insert.cc

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ int write_record(TABLE *table,COPY_INFO *info) 


err:

  if (key)

    my_afree(key);

    my_safe_afree(key,table->max_unique_length,MAX_KEY_LENGTH);

  info->last_errno= error;

  table->file->print_error(error,MYF(0));

  DBUG_RETURN(1);