summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorChad MILLER <chad@mysql.com>2009-05-06 09:06:32 -0400
committerChad MILLER <chad@mysql.com>2009-05-06 09:06:32 -0400
commit767501a9b1c89e17986d8089131d935d63420ad7 (patch)
treeb7a5df1540af07a49f7d577804919b7027fc4edf /sql/sql_lex.cc
parent6bee08c61dbb89837edc04de8e49fed411f17770 (diff)
parent4822696ecb7302efc543e0be109f1c2a8f1bdf4e (diff)
downloadmariadb-git-767501a9b1c89e17986d8089131d935d63420ad7.tar.gz
Merge community up to enterprise, thus ending the community-server
adventure.
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 da31106648a..436f41dd209 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -200,7 +200,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;