diff options
| author | unknown <jani@rhols221.adsl.netsonic.fi> | 2002-06-28 19:30:09 +0300 |
|---|---|---|
| committer | unknown <jani@rhols221.adsl.netsonic.fi> | 2002-06-28 19:30:09 +0300 |
| commit | e0d8d62e3934e85f2fc55e707a4c7eb546104991 (patch) | |
| tree | 238d79549e511ff13dfddc389128a4e11c3c7d1d /sql/sql_parse.cc | |
| parent | a6ca5cbb9172ba7fb56834d78d6527525a59d1c3 (diff) | |
| download | mariadb-git-e0d8d62e3934e85f2fc55e707a4c7eb546104991.tar.gz | |
Added interface for first set of dynamic variables.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 783a1631fad..2d564241019 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -559,7 +559,7 @@ check_connections(THD *thd) if (thd->client_capabilities & CLIENT_CONNECT_WITH_DB) db=strend(passwd)+1; if (thd->client_capabilities & CLIENT_INTERACTIVE) - thd->inactive_timeout=net_interactive_timeout; + thd->inactive_timeout= thd->variables.net_interactive_timeout; if ((thd->client_capabilities & CLIENT_TRANSACTIONS) && opt_using_transactions) thd->net.return_status= &thd->server_status; @@ -661,7 +661,7 @@ pthread_handler_decl(handle_one_connection,arg) free_root(&thd->mem_root,MYF(0)); if (net->error && net->vio != 0) { - if (!thd->killed && opt_warnings) + if (!thd->killed && thd->variables.opt_warnings) sql_print_error(ER(ER_NEW_ABORTING_CONNECTION), thd->thread_id,(thd->db ? thd->db : "unconnected"), thd->user ? thd->user : "unauthenticated", @@ -1192,7 +1192,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, { thd->proc_info="logging slow query"; - if ((ulong) (thd->start_time - thd->time_after_lock) > long_query_time || + if ((ulong) (thd->start_time - thd->time_after_lock) > + thd->variables.long_query_time || ((thd->lex.select_lex.options & (QUERY_NO_INDEX_USED | QUERY_NO_GOOD_INDEX_USED)) && (specialflag & SPECIAL_LONG_LOG_FORMAT))) @@ -2036,11 +2037,12 @@ mysql_execute_command(void) thd->priv_user,lex->verbose); break; case SQLCOM_SHOW_STATUS: - res= mysqld_show(thd,(lex->wild ? lex->wild->ptr() : NullS),status_vars); + res= mysqld_show(thd,(lex->wild ? lex->wild->ptr() : NullS),status_vars, + (struct system_variables*) 0); break; case SQLCOM_SHOW_VARIABLES: res= mysqld_show(thd, (lex->wild ? lex->wild->ptr() : NullS), - init_vars); + init_vars, lex->variable_values); break; case SQLCOM_SHOW_LOGS: { @@ -2147,7 +2149,7 @@ mysql_execute_command(void) else { if (!(thd->client_capabilities & CLIENT_LOCAL_FILES) || - ! opt_local_infile) + ! thd->variables.opt_local_infile) { send_error(&thd->net,ER_NOT_ALLOWED_COMMAND); goto error; |