database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge psergey-rh8.(none):/home/psergey/mysql-5.0-latest-pull

Browse Source 
into psergey-rh8.(none):/home/psergey/mysql-5.0-imerge-unique


mysql-test/r/index_merge_innodb.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown
2003-12-18 17:01:35 +03:00
parent 7dbdedcb72 1ca25d0e02
commit 29a669e663
277 changed files with 4035 additions and 2402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/opt_range.cc
View File

@ -1037,6 +1037,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
SEL_IMERGE *min_imerge= NULL;
double min_imerge_read_time;
ha_rows min_imerge_records;
LINT_INIT(min_imerge_records); // Protected by min_imerge
if (!head->used_keys.is_clear_all())
{