mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge

Browse source 
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
innobase/row/row0mysql.c:
  merge (no changes)
innobase/row/row0sel.c:
  merge (no changes)
sql/item_subselect.cc:
  Use sanjas patch instead
This commit is contained in:
unknown 2003-10-07 21:41:07 +03:00
commit 118d532134
168 changed files with 2860 additions and 6746 deletions
Download patch file Download diff file Expand all files Collapse all files

5
innobase/row/row0sel.c
View file

@ -2895,6 +2895,8 @@ row_search_for_mysql(
mtr_start(&mtr);
mtr_start(&mtr);
/*-------------------------------------------------------------*/
/* PHASE 2: Try fast adaptive hash index search if possible */
@ -2904,8 +2906,9 @@ row_search_for_mysql(
cannot use the adaptive hash index in a search in the case the row
may be long and there may be externally stored fields */
if (unique_search
if (unique_search
&& index->type & DICT_CLUSTERED
&& direction == 0
&& !prebuilt->templ_contains_blob
&& !prebuilt->used_in_HANDLER
&& (prebuilt->mysql_row_len < UNIV_PAGE_SIZE / 8)) {