database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/kostja/mysql/tmp_merge

Browse Source 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


mysql-test/r/information_schema_db.result:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/information_schema.result:
  SCCS merged
This commit is contained in:
unknown
2006-02-07 15:26:58 +03:00
parent 6a9a35c0d4 ef0cd2f58a
commit 02576c95d1
12 changed files with 113 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_select.cc
View File

@ -2214,7 +2214,8 @@ make_join_statistics(JOIN *join, TABLE_LIST *tables, COND *conds,
if (eq_part.is_prefix(table->key_info[key].key_parts) &&
((table->key_info[key].flags & (HA_NOSAME | HA_END_SPACE_KEY)) ==
HA_NOSAME) &&
!table->fulltext_searched)
!table->fulltext_searched &&
!table->pos_in_table_list->embedding)
{
if (const_ref == eq_part)
{ // Found everything for ref.