summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-07-02 10:46:46 -0400
committercmiller@zippy.cornsilk.net <>2007-07-02 10:46:46 -0400
commit681ee9694bc0d6203ffdd5175a2b6e7e77fc41d4 (patch)
treead2a11ebcf9c63780cf2788f9469dee1d50cd9c7 /sql/sql_lex.cc
parentc4b53b218c71aff3410ec4358dfec2b9d0e1e1b4 (diff)
parent01f572052d0d50a06745d5b6d96e20db81530d7b (diff)
downloadmariadb-git-681ee9694bc0d6203ffdd5175a2b6e7e77fc41d4.tar.gz
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index cbfba3d4d80..35569df5809 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -201,7 +201,7 @@ void lex_start(THD *thd)
lex->proc_list.first= 0;
lex->escape_used= FALSE;
lex->reset_query_tables_list(FALSE);
-
+ lex->profile_options= PROFILE_NONE;
lex->nest_level=0 ;
lex->allow_sum_func= 0;
lex->in_sum_func= NULL;