diff options
| author | unknown <kostja@bodhi.(none)> | 2007-12-13 23:58:55 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-12-13 23:58:55 +0300 |
| commit | 37a2c4590a7453d5c8e5b67c2f512162323ac738 (patch) | |
| tree | 5b1e35ecfb3c06d25e3fab02b488f661e7c476d0 /libmysqld/emb_qcache.h | |
| parent | a3a0d4359fef580a30704797ceeed613600deedc (diff) | |
| download | mariadb-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.h')
| -rw-r--r-- | libmysqld/emb_qcache.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/emb_qcache.h b/libmysqld/emb_qcache.h index 6e320fbd967..e1c219ec461 100644 --- a/libmysqld/emb_qcache.h +++ b/libmysqld/emb_qcache.h @@ -79,3 +79,4 @@ public: uint emb_count_querycache_size(THD *thd); int emb_load_querycache_result(THD *thd, Querycache_stream *src); void emb_store_querycache_result(Querycache_stream *dst, THD* thd); +void net_send_eof(THD *thd, uint server_status, uint total_warn_count); |