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 /client | |
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 'client')
-rw-r--r-- | client/mysqltest.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index cca2420d498..1876e2e0144 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -8018,7 +8018,6 @@ REPLACE *init_replace(char * *from, char * *to,uint count, if (!len) { errno=EINVAL; - my_message(0,"No to-string for last from-string",MYF(ME_BELL)); DBUG_RETURN(0); } states+=len+1; |