summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-11-20 02:57:02 +0200
committerunknown <monty@donna.mysql.com>2000-11-20 02:57:02 +0200
commit89ee326c1d27f3bee4acba67060a475811ebd842 (patch)
treed3f52866508b583c2d4549b66887b4b50aa9fe22 /sql/sql_base.cc
parent5dae19b394e3385c0e48d896fec1174437f2308a (diff)
downloadmariadb-git-89ee326c1d27f3bee4acba67060a475811ebd842.tar.gz
Bug fix for NATURAL JOIN, Split manual sections and more statistic variables
Docs/manual.texi: Split BDB into different sections Added MySQL developers section Changed an SQL to a SQL include/my_sys.h: More statistic variables libmysql/libmysql.c: Added option "interactive-timeout" mysys/mf_tempfile.c: More statistic variables mysys/my_static.c: More statistic variables sql-bench/crash-me.sh: Fixed bug in truncate table test sql-bench/limits/mysql-3.23.cfg: Updated to crash-me 1.51 sql-bench/limits/mysql.cfg: Updated to crash-me 1.51 sql/filesort.cc: More statistics sql/mysql_priv.h: More statistics sql/mysqld.cc: More statistics sql/sql_base.cc: Fix for NATURAL JOIN sql/sql_delete.cc: cleanup + Added logging if one doesn't use index sql/sql_parse.cc: Logging if one doesn't use index sql/sql_select.cc: Logging if one doesn't use index sql/sql_update.cc: cleanup + Added logging if one doesn't use index sql/structs.h: Fix for NATURAL JOIN support-files/my-huge.cnf.sh: Added interactive-timeout to [mysqlhotcopy] support-files/my-large.cnf.sh: Added interactive-timeout to [mysqlhotcopy] support-files/my-medium.cnf.sh: Added interactive-timeout to [mysqlhotcopy] support-files/my-small.cnf.sh: Added interactive-timeout to [mysqlhotcopy]
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index d0877aed1bd..4a5f5e582f3 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1783,6 +1783,8 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
DBUG_RETURN(1);
tmp->fix_length_and_dec(); // Update cmp_type
tmp->const_item_cache=0;
+ /* Mark field used for table cache */
+ t1->field[i]->query_id=t2->field[j]->query_id=thd->query_id;
cond_and->list.push_back(tmp);
if ((tmp_map=t1->field[i]->part_of_key))
{