1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

upmerge 20304

This commit is contained in:
Bjorn Munch
2010-10-01 15:55:49 +02:00

View File

@ -7427,6 +7427,9 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
if (cn->pending && (flags & QUERY_SEND_FLAG))
die ("Cannot run query on connection between send and reap");
if (!(flags & QUERY_SEND_FLAG) && !cn->pending)
die ("Cannot reap on a connection without pending send");
init_dynamic_string(&ds_warnings, NULL, 0, 256);
/*
Evaluate query if this is an eval command