Commit 9068a78c authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

myrg_open.c empty MRG bug fixed again (fix from 1.8 was removed in 1.9)

parent 502149c3

myisammrg/myrg_open.c

+3 −1
Original line number Diff line number Diff line
@@ -110,7 +110,9 @@ int handle_locking; 
    my_errno=HA_ERR_RECORD_FILE_FULL;

    goto err;

  }

  if (files)

    m_info->keys=m_info->open_tables->table->s->base.keys;



  bzero((char*) &m_info->by_key,sizeof(m_info->by_key));



  m_info->end_table=m_info->open_tables+files;

mysql-test/t/ft0000001.test

+3 −3
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ INSERT INTO test (message) VALUES ("Testing"),("table"),("testbug"), 
        ("steve"),("is"),("cool"),("steve is cool");

# basic MATCH

@r/ft0000001.a.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE MATCH (message) AGAINST ('steve');

# MATCH + ORDER BY (w/o ft-ranges)

@r/ft0000001.b.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE MATCH (message) AGAINST ('steve') +0 ORDER BY a;

# MATCH + ORDER BY (w/ ft-ranges) + UNIQUE

# MATCH + ORDER BY (with ft-ranges)

@r/ft0000001.b.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE MATCH (message) AGAINST ('steve') ORDER BY a;

# MATCH + ORDER BY (with normal ranges) + UNIQUE

@r/ft0000001.c.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE a in (2,7,4) and MATCH (message) AGAINST ('steve') ORDER BY a DESC;

# MATCH + ORDER BY + UNIQUE (const_table)

@r/ft0000001.d.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE a=7 and MATCH (message) AGAINST ('steve') ORDER BY 1;