summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorholyfoot/hf@mysql.com/deer.(none) <>2006-11-13 20:06:45 +0400
committerholyfoot/hf@mysql.com/deer.(none) <>2006-11-13 20:06:45 +0400
commit7ece4caad347127828547a3544640b85fe2be2a0 (patch)
tree24f445de7d3e3981e59c68744b1c7dda5f765e32 /libmysqld
parent5d66d7fb14143c6de942ebbb10f44297160b6c1a (diff)
downloadmariadb-git-7ece4caad347127828547a3544640b85fe2be2a0.tar.gz
several fixes to make tests pass in embedded-server mode
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index cfa90c2abce..0df7014ba16 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -770,6 +770,8 @@ MYSQL_DATA *THD::alloc_new_dataset()
static void write_eof_packet(THD *thd)
{
+ if (!thd->mysql) // bootstrap file handling
+ return;
/*
The following test should never be true, but it's better to do it
because if 'is_fatal_error' is set the server is not going to execute