diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-19 00:22:30 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-19 00:22:30 +0300 |
| commit | 0ba080c87a89f96837dc9d413ee6f5c59ad82722 (patch) | |
| tree | df0fd78ddd1c83d577e830a40da77487a62451b7 /sql/sql_select.cc | |
| parent | 12f12be1fc5596617e5d56a7b6a417eb79ab182d (diff) | |
| download | mariadb-git-0ba080c87a89f96837dc9d413ee6f5c59ad82722.tar.gz | |
Made keyread (key scanning) a key specific attribute.
This avoids using fulltext keys for table scanning.
This also reverts Sinisa's original fix for this problem.
Docs/manual.texi:
Update of SQL_JOIN_MAX_SIZE information3602
client/mysqldump.c:
comment cleanup
include/my_aes.h:
General cleanup for new file
include/rijndael.h:
General cleanup for new file
include/sha1.h:
General cleanup for new file
mysys/my_aes.c:
General cleanup for new file
mysys/rijndael.c:
General cleanup for new file
mysys/sha1.c:
General cleanup for new file
sql/ha_berkeley.h:
Made keyread (key scanning) a key specific attribute.
sql/ha_innodb.cc:
Merge with 3.23.x
sql/ha_innodb.h:
Made keyread (key scanning) a key specific attribute.
sql/ha_isam.cc:
Moved things to table_flags()
sql/ha_isam.h:
Made keyread (key scanning) a key specific attribute.
sql/ha_myisam.cc:
Made keyread (key scanning) a key specific attribute.
sql/ha_myisam.h:
Made keyread (key scanning) a key specific attribute.
sql/ha_myisammrg.h:
Made keyread (key scanning) a key specific attribute.
sql/handler.h:
Made keyread (key scanning) a key specific attribute.
sql/item_strfunc.cc:
Cleanup of AES_xxx code
sql/opt_range.cc:
Made keyread (key scanning) a key specific attribute.
sql/sql_base.cc:
Made keyread (key scanning) a key specific attribute.
sql/sql_cache.cc:
Removed compiler warning
sql/sql_select.cc:
Removed wrong patch to fulltext problem
sql/table.cc:
Made keyread (key scanning) a key specific attribute.
sql/table.h:
Made keyread (key scanning) a key specific attribute.
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 94fa08b769a..0af91c443a8 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -233,7 +233,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, and no GROUP BY. TODO: Add check of calculation of GROUP functions and fields: SELECT COUNT(*)+table.col1 from table1; - */ + */ join.table=0; join.tables=0; { @@ -257,14 +257,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, } TABLE_LIST *table; for (table=tables ; table ; table=table->next) - { join.tables++; - if (!thd->used_tables) - { - TABLE *tbl=table->table; - tbl->keys_in_use_for_query=tbl->used_keys= tbl->keys_in_use=0; - } - } } procedure=setup_procedure(thd,proc_param,result,fields,&error); if (error) |