summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2009-12-16 11:33:54 +0300
committerKonstantin Osipov <kostja@sun.com>2009-12-16 11:33:54 +0300
commit980e8b413e89175d8fc7f867415712589bead9ff (patch)
tree765dbf44bc16c28e3d63a3439bed89b86e4b92fc /libmysqld
parentd1dfce06b254548e108deabfe8a7e6b759984d5d (diff)
parent376cf4275f28f6b8167eaf19b2c66dee41fbc5c5 (diff)
downloadmariadb-git-980e8b413e89175d8fc7f867415712589bead9ff.tar.gz
Merge next-mr -> next-4284.
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 9717c2fcfb6..1d6c3ee18bf 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -119,7 +119,6 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
thd->current_stmt= stmt;
thd->store_globals(); // Fix if more than one connect
- lex_start(thd);
/*
We have to call free_old_query before we start to fill mysql->fields
for new query. In the case of embedded server we collect field data