diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-10-11 23:35:52 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-10-11 23:35:52 -0600 |
| commit | e9b7cc09e5ab9ee8d4b6a879a7ed2282f45c6f8a (patch) | |
| tree | 324081b33e7446197a568ae0770ef4226659929e /sql/sql_parse.cc | |
| parent | 0d833887e2cf72e99168649165fdd6dd94425b95 (diff) | |
| download | mariadb-git-e9b7cc09e5ab9ee8d4b6a879a7ed2282f45c6f8a.tar.gz | |
Revert patch for bug #19764, which did not work with prepared statements.
BitKeeper/deleted/.del-show_check-master.opt:
Delete: mysql-test/t/show_check-master.opt
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 90cef7796fb..18d048df393 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2150,10 +2150,10 @@ void log_slow_statement(THD *thd) thd->end_time(); // Set start time /* - Do not log administrative or SHOW statements unless the appropriate - option is set; do not log into slow log if reading from backup. + Do not log administrative statements unless the appropriate option is + set; do not log into slow log if reading from backup. */ - if (thd->enable_slow_log && !thd->user_time && !thd->lex->is_show_command) + if (thd->enable_slow_log && !thd->user_time) { thd->proc_info="logging slow query"; |