From: Date: December 10 2008 6:32am Subject: bzr push into mysql-6.0-bugteam branch (satya.bn:2937) List-Archive: http://lists.mysql.com/commits/61140 Message-Id: <0KBN00C5FBEPWDMS@mail-apac.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7BIT 2937 Satya B 2008-12-10 [merge] merging to latest 6.0-bugteam removed: mysql-test/suite/parts/r/partition_bit_ndb.result mysql-test/suite/parts/t/partition_bit_ndb.test mysql-test/suite/parts/t/partition_sessions.test mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test added: mysql-test/include/have_one-thread-per-connection.inc mysql-test/suite/binlog/r/binlog_innodb_row.result mysql-test/suite/binlog/t/binlog_innodb_row.test mysql-test/suite/sys_vars/r/tmp_table_size_basic.result mysql-test/suite/sys_vars/t/tmp_table_size_basic.test modified: client/mysql_upgrade.c extra/yassl/include/openssl/ssl.h include/config-win.h include/my_global.h mysql-test/r/alter_table.result mysql-test/r/ctype_ldml.result mysql-test/r/fulltext.result mysql-test/r/func_str.result mysql-test/r/innodb_mysql.result mysql-test/r/myisampack.result mysql-test/r/partition.result mysql-test/r/partition_datatype.result mysql-test/r/partition_mgm_err.result mysql-test/r/type_bit.result mysql-test/r/type_float.result mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-test/suite/funcs_2/t/disabled.def mysql-test/suite/ndb/t/disabled.def mysql-test/suite/parts/r/partition_bit_innodb.result mysql-test/suite/parts/r/partition_bit_myisam.result mysql-test/suite/parts/r/partition_mgm_lc0_archive.result mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result mysql-test/suite/parts/r/partition_mgm_lc0_memory.result mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result mysql-test/suite/parts/r/partition_mgm_lc1_archive.result mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result mysql-test/suite/parts/r/partition_mgm_lc1_memory.result mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result mysql-test/suite/parts/r/partition_mgm_lc2_archive.result mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result mysql-test/suite/parts/r/partition_mgm_lc2_memory.result mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result mysql-test/suite/parts/t/disabled.def mysql-test/suite/parts/t/partition_value_innodb.test mysql-test/suite/parts/t/partition_value_myisam.test mysql-test/suite/parts/t/partition_value_ndb.test mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_row_create_table.result mysql-test/suite/rpl/r/rpl_slave_skip.result mysql-test/suite/rpl/r/rpl_trigger.result mysql-test/suite/rpl/t/rpl_packet.test mysql-test/suite/rpl/t/rpl_row_create_table.test mysql-test/suite/rpl/t/rpl_slave_skip.test mysql-test/suite/rpl/t/rpl_trigger.test mysql-test/suite/sys_vars/t/disabled.def mysql-test/t/alter_table.test mysql-test/t/ctype_ldml.test mysql-test/t/disabled.def mysql-test/t/fulltext.test mysql-test/t/func_str.test mysql-test/t/innodb_mysql.test mysql-test/t/myisampack.test mysql-test/t/partition.test mysql-test/t/thread_cache_size_func.test mysql-test/t/type_bit.test mysql-test/t/type_float.test mysys/charset.c sql/field.cc sql/ha_partition.cc sql/ha_partition.h sql/item.cc sql/item_strfunc.cc sql/log.cc sql/mysql_priv.h sql/mysqld.cc sql/share/errmsg.txt sql/sql_partition.cc sql/sql_select.cc sql/sql_show.cc sql/sql_table.cc sql/table.cc storage/myisam/ft_boolean_search.c === modified file 'mysql-test/r/archive.result' --- a/mysql-test/r/archive.result 2007-12-13 12:59:16 +0000 +++ b/mysql-test/r/archive.result 2008-11-24 15:53:30 +0000 @@ -12698,3 +12698,13 @@ SELECT * FROM t1 ORDER BY a; a b 1 NULL 2 NULL +DROP TABLE t1; +CREATE TABLE t1(id INT NOT NULL AUTO_INCREMENT, name VARCHAR(128) NOT NULL, PRIMARY KEY(id)) ENGINE=archive; +INSERT INTO t1 VALUES(NULL,'a'),(NULL,'a'); +CREATE TABLE t2(id INT NOT NULL AUTO_INCREMENT, name VARCHAR(128) NOT NULL, PRIMARY KEY(id)) ENGINE=archive; +INSERT INTO t2 VALUES(NULL,'b'),(NULL,'b'); +SELECT t1.id, t2.id, t1.name, t2.name FROM t1,t2 WHERE t1.id = t2.id; +id id name name +1 1 a b +2 2 a b +DROP TABLE t1,t2; === modified file 'mysql-test/t/archive.test' --- a/mysql-test/t/archive.test 2007-11-29 12:05:51 +0000 +++ b/mysql-test/t/archive.test 2008-11-24 15:53:30 +0000 @@ -1600,3 +1600,14 @@ CREATE TABLE t1(a INT NOT NULL AUTO_INCR INSERT INTO t1 VALUES (NULL, NULL),(NULL, NULL); FLUSH TABLE t1; SELECT * FROM t1 ORDER BY a; +DROP TABLE t1; + +# +# BUG#40677 - Archive tables joined on primary return no result +# +CREATE TABLE t1(id INT NOT NULL AUTO_INCREMENT, name VARCHAR(128) NOT NULL, PRIMARY KEY(id)) ENGINE=archive; +INSERT INTO t1 VALUES(NULL,'a'),(NULL,'a'); +CREATE TABLE t2(id INT NOT NULL AUTO_INCREMENT, name VARCHAR(128) NOT NULL, PRIMARY KEY(id)) ENGINE=archive; +INSERT INTO t2 VALUES(NULL,'b'),(NULL,'b'); +SELECT t1.id, t2.id, t1.name, t2.name FROM t1,t2 WHERE t1.id = t2.id; +DROP TABLE t1,t2; === modified file 'storage/archive/ha_archive.cc' --- a/storage/archive/ha_archive.cc 2008-11-06 06:18:15 +0000 +++ b/storage/archive/ha_archive.cc 2008-11-24 15:53:30 +0000 @@ -950,7 +950,11 @@ int ha_archive::index_read_idx(uchar *bu } if (found) + { + /* notify handler that a record has been found */ + table->status= 0; DBUG_RETURN(0); + } error: DBUG_RETURN(rc ? rc : HA_ERR_END_OF_FILE);