diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-07-09 10:20:45 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-07-09 10:20:45 +0500 |
| commit | b99786754fbd1fe8edf5442e5b0a8b31290e1d71 (patch) | |
| tree | 41a23d26a70ceb80f7f5914e7db67b0d14905b3a /sql/sql_parse.cc | |
| parent | 5c604181043035c3d3750180e821a85274517238 (diff) | |
| parent | 32c6341ea8df1a5a42c0b5d514a1becf10c81be2 (diff) | |
| download | mariadb-git-b99786754fbd1fe8edf5442e5b0a8b31290e1d71.tar.gz | |
Merge mysql.com:/home/ram/work/b28808/b28808.5.0
into mysql.com:/home/ram/work/b28808/b28808.5.1
sql/mysqld.cc:
Auto merged
sql/unireg.h:
Auto merged
mysql-test/t/show_check.test:
merging
sql/sql_parse.cc:
merging
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index aa661b64598..000a0a30de6 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1323,7 +1323,7 @@ void log_slow_statement(THD *thd) thd->variables.long_query_time || ((thd->server_status & (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) && - (specialflag & SPECIAL_LOG_QUERIES_NOT_USING_INDEXES))) + opt_log_queries_not_using_indexes)) { thd->status_var.long_query_count++; slow_log_print(thd, thd->query, thd->query_length, start_of_query); |