diff options
| author | monty@donna.mysql.com <> | 2000-11-22 04:24:54 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-11-22 04:24:54 +0200 |
| commit | f4df5cd2643ea359d4a3eb4e50ae74deafbcbd26 (patch) | |
| tree | 5cdcd57f1abf34e5c23602c7dc9c921516f17bd1 /sql/sql_parse.cc | |
| parent | 1ce0e50f4c6ce7c70185f9b82bd214b579058f07 (diff) | |
| download | mariadb-git-f4df5cd2643ea359d4a3eb4e50ae74deafbcbd26.tar.gz | |
Change storage of execution flags from thd->options to thd->lex.options
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index b2e68e914eb..8e9584bc9d7 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -826,7 +826,8 @@ bool do_command(THD *thd) if (!thd->user_time) { if ((ulong) (thd->start_time - thd->time_after_lock) > long_query_time || - ((thd->options & (OPTION_NO_INDEX_USED | OPTION_NO_GOOD_INDEX_USED)) && + ((thd->lex.options & + (OPTION_NO_INDEX_USED | OPTION_NO_GOOD_INDEX_USED)) && (specialflag & SPECIAL_LONG_LOG_FORMAT))) { long_query_count++; @@ -855,7 +856,7 @@ mysql_execute_command(void) { int res=0; THD *thd=current_thd; - LEX *lex=current_lex; + LEX *lex= &thd->lex; TABLE_LIST *tables=(TABLE_LIST*) lex->table_list.first; DBUG_ENTER("mysql_execute_command"); |