Commit fdf5e583 authored by unknown's avatar unknown
Browse files

After merge fix.

parent f74f3776

mysql-test/r/index_merge_myisam.result

+31 −0
Original line number Diff line number Diff line
@@ -426,6 +426,37 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t3	index_merge	a,b	a,b	5,5	NULL	#	Using intersect(a,b); Using where

drop table t3;

drop table t0, t1, t2;

CREATE TABLE t1(a INT);

INSERT INTO t1 VALUES(1);

CREATE TABLE t2(a INT, b INT, dummy CHAR(16) DEFAULT '', KEY(a), KEY(b));

INSERT INTO t2(a,b) VALUES

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),(0,0),

(1,2);

LOCK TABLES t1 WRITE, t2 WRITE;

INSERT INTO t2(a,b) VALUES(1,2);

SELECT t2.a FROM t1,t2 WHERE t2.b=2 AND t2.a=1;

a

1

1

UNLOCK TABLES;

DROP TABLE t1, t2;

#---------------- ROR-index_merge tests -----------------------

SET SESSION STORAGE_ENGINE = MyISAM;

drop table if exists  t0,t1,t2;

sql/handler.cc

+4 −2
Original line number Diff line number Diff line
@@ -1418,8 +1418,10 @@ int ha_delete_table(THD *thd, handlerton *table_type, const char *path, 
****************************************************************************/

handler *handler::clone(MEM_ROOT *mem_root)

{

  handler *new_handler= get_new_handler(table, mem_root, table->s->db_type);

  if (new_handler && !new_handler->ha_open(table->s->path, table->db_stat,

  handler *new_handler= get_new_handler(table->s, mem_root, table->s->db_type);

  if (new_handler && !new_handler->ha_open(table,

                                           table->s->normalized_path.str,

                                           table->db_stat,

                                           HA_OPEN_IGNORE_IF_LOCKED))

    return new_handler;

  return NULL;