diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-11-12 15:56:21 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-11-12 15:56:21 +0300 |
| commit | 4749b884942f464febbb8221b4a73f5b85e98090 (patch) | |
| tree | 47b1a5ab7416e5cc83776aa9a0543a058f35d724 /sql/sql_cursor.cc | |
| parent | 936bec8e2cf0362e0cf8902ab1f7ea8141b880cc (diff) | |
| download | mariadb-git-4749b884942f464febbb8221b4a73f5b85e98090.tar.gz | |
Implement a fix for Bug#57058 -- send SERVER_QUERY_WAS_SLOW over
network when a query was slow.
When a query is slow, sent a special flag to the client
indicating this fact.
Add a test case.
Implement review comments.
Diffstat (limited to 'sql/sql_cursor.cc')
| -rw-r--r-- | sql/sql_cursor.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc index 7a9834b4cde..acc591f1ea2 100644 --- a/sql/sql_cursor.cc +++ b/sql/sql_cursor.cc @@ -277,7 +277,6 @@ int Materialized_cursor::open(JOIN *join __attribute__((unused))) rc= result->send_result_set_metadata(item_list, Protocol::SEND_NUM_ROWS); thd->server_status|= SERVER_STATUS_CURSOR_EXISTS; result->send_eof(); - thd->server_status&= ~SERVER_STATUS_CURSOR_EXISTS; } return rc; } @@ -318,12 +317,10 @@ void Materialized_cursor::fetch(ulong num_rows) case 0: thd->server_status|= SERVER_STATUS_CURSOR_EXISTS; result->send_eof(); - thd->server_status&= ~SERVER_STATUS_CURSOR_EXISTS; break; case HA_ERR_END_OF_FILE: thd->server_status|= SERVER_STATUS_LAST_ROW_SENT; result->send_eof(); - thd->server_status&= ~SERVER_STATUS_LAST_ROW_SENT; close(); break; default: |