include/my_base.h:
Auto merged
include/my_bitmap.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysys/my_bitmap.c:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_select.h:
Auto merged
mysql-test/r/index_merge.result:
Post-merge update of results. (Ok according to Sanja)
sql/opt_range.cc:
Post-merge fix provided by Sergey Petrunia.
sql/sql_select.cc:
Post-merge fix provided by Sergey Petrunia.
include/my_base.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/r/index_merge.result:
Auto merged
mysql-test/r/index_merge_innodb.result:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/opt_range.cc:
Hand merged
sql/opt_range.h:
Hand merged
* Fixed a problem with wrong query results for partially covering keys in ROR-index_merge
* ROR-intersection retrieval plan choice algorithm now uses less disk IO
- and properly processes clustered PK range scans
* Fixed several minor range optimizer problems
* Added more comments
* Code cleanup
mysql-test/r/index_merge.result:
New index_merge EXPLAIN output format changes
mysql-test/r/index_merge_innodb.result:
New index_merge EXPLAIN output format changes
mysql-test/r/index_merge_ror.result:
New index_merge EXPLAIN output format changes
Added test for scans on keys that cover fields partially
Fixed a minor ROR optimizer problem
mysql-test/r/index_merge_ror_cpk.result:
More tests added
mysql-test/t/index_merge_ror.test:
New index_merge EXPLAIN output format changes
Added test for scans on keys that cover fields partially
Fixed a minor ROR optimizer problem
mysql-test/t/index_merge_ror_cpk.test:
More tests added
mysys/my_bitmap.c:
Comments added, code cleanup
sql/opt_range.cc:
Comments added, code cleanup
Numerous fixes, see changeset description
sql/opt_range.h:
Comments added, code cleanup
New index_merge EXPLAIN output format related changes
sql/sql_select.cc:
Comments added, code cleanup
New index_merge EXPLAIN output
Note: One sp.test still fails (prime), and rpl_server_id2.test fails (will be fixed by guilhem ASAP).
mysql-test/r/index_merge.result:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/r/index_merge_bdb.result:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/r/index_merge_innodb.result:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/r/index_merge_innodb2.result:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/r/rpl_server_id1.result:
Update result after merge.
mysql-test/r/sp-error.result:
Update result after merge.
mysql-test/r/variables.result:
Update result after merge.
mysql-test/t/index_merge.test:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/t/index_merge_bdb.test:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/t/index_merge_innodb.test:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/t/index_merge_innodb2.test:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/t/sp-error.test:
Post-merge fix of error codes.
sql/opt_range.cc:
Manually merged by Monty.
sql/opt_range.h:
Manually merged by Monty.
sql/slave.cc:
Post-merge fixes with some help from Guilhem.
sql/slave.h:
Post-merge fixes with some help from Guilhem.
sql/sp_head.cc:
Got rid of warning (reordering initialization).
sql/sql_parse.cc:
Post-merge fix: Need to set/reset select_limit at SP CALL time as well.
tests/client_test.c:
Post-merge fix: key_len length in explain has changed.
into mysql.com:/home/psergey/mysql-5.0-imerge-unique
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/index_merge.result:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/handler.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Fixed inconsistency of values of used_tables_cache
and const_item_cache for Item_func_isnull objects (bug #1990).
mysql-test/r/index_merge.result:
Fixed inconsistency of values of used_tables_cache
and const_item_cache for Item_func_isnull objects (bug #1990).
