diff options
| author | unknown <monty@donna.mysql.com> | 2000-11-20 02:57:02 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-11-20 02:57:02 +0200 |
| commit | 89ee326c1d27f3bee4acba67060a475811ebd842 (patch) | |
| tree | d3f52866508b583c2d4549b66887b4b50aa9fe22 /sql/sql_parse.cc | |
| parent | 5dae19b394e3385c0e48d896fec1174437f2308a (diff) | |
| download | mariadb-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_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 79c36431cb1..b2e68e914eb 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -825,7 +825,9 @@ bool do_command(THD *thd) /* If not reading from backup and if the query took too long */ if (!thd->user_time) { - if ((ulong) (thd->start_time - thd->time_after_lock) > long_query_time) + if ((ulong) (thd->start_time - thd->time_after_lock) > long_query_time || + ((thd->options & (OPTION_NO_INDEX_USED | OPTION_NO_GOOD_INDEX_USED)) && + (specialflag & SPECIAL_LONG_LOG_FORMAT))) { long_query_count++; mysql_slow_log.write(thd, thd->query, thd->query_length, start_of_query); |