summaryrefslogtreecommitdiff
path: root/libmysqld/emb_qcache.cc
diff options
context:
space:
mode:
authorunknown <kostja@bodhi.(none)>2007-12-13 23:58:55 +0300
committerunknown <kostja@bodhi.(none)>2007-12-13 23:58:55 +0300
commit37a2c4590a7453d5c8e5b67c2f512162323ac738 (patch)
tree5b1e35ecfb3c06d25e3fab02b488f661e7c476d0 /libmysqld/emb_qcache.cc
parenta3a0d4359fef580a30704797ceeed613600deedc (diff)
downloadmariadb-git-37a2c4590a7453d5c8e5b67c2f512162323ac738.tar.gz
Fix broken embedded build (broken by the patch for Bug#12713, first part).
client/mysqltest.c: Remove a call to my_message() (server call) in case of a client error. It asserts in the embedded build now, since is called after send_ok(). libmysqld/emb_qcache.cc: Use net_send_eof (embedded implementation) in embedded query cache/ send result to client, since send_eof currently does not send anything. libmysqld/emb_qcache.h: Declare net_send_eof. libmysqld/lib_sql.cc: Fix the main loop of the embedded server to use the new Diagnostics_area API. sql/log.cc: Silence errors of open_performance_schema_table. This function is called for general logging, and it happens after the error has been sent to the client, and thus triggers an assert. storage/myisam/ha_myisam.cc: Remove an old hack that broke repair.test in embedded build: unless we clear an error here, the server attempts to send OK after ERROR. This currently asserts.
Diffstat (limited to 'libmysqld/emb_qcache.cc')
-rw-r--r--libmysqld/emb_qcache.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc
index 17549bfa96b..07b7d82a0cc 100644
--- a/libmysqld/emb_qcache.cc
+++ b/libmysqld/emb_qcache.cc
@@ -447,7 +447,7 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src)
*prev_row= NULL;
data->embedded_info->prev_ptr= prev_row;
return_ok:
- send_eof(thd);
+ net_send_eof(thd, thd->server_status, thd->total_warn_count);
DBUG_RETURN(0);
err:
DBUG_RETURN(1);