summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
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
commit13348d3769735c4ed23df263e9c00e42d7a08aca (patch)
tree765dbf44bc16c28e3d63a3439bed89b86e4b92fc /sql/ha_ndbcluster.cc
parent58b24720b65ff817f5dd587922eb678a8473895a (diff)
parentbd1f8f5bfaf9748ca445401687cca97a89e0dfee (diff)
downloadmariadb-git-13348d3769735c4ed23df263e9c00e42d7a08aca.tar.gz
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 9501416f9be..b35746102c8 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -6956,7 +6956,6 @@ int ndb_create_table_from_engine(THD *thd, const char *db,
LEX *old_lex= thd->lex, newlex;
thd->lex= &newlex;
newlex.current_select= NULL;
- lex_start(thd);
int res= ha_create_table_from_engine(thd, db, table_name);
thd->lex= old_lex;
return res;
@@ -9317,7 +9316,6 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
thd->thread_stack= (char*)&thd; /* remember where our stack is */
if (thd->store_globals())
goto ndb_util_thread_fail;
- lex_start(thd);
thd->init_for_queries();
thd->version=refresh_version;
thd->main_security_ctx.host_or_ip= "";