diff options
Diffstat (limited to 'libmysqld/emb_qcache.cc')
| -rw-r--r-- | libmysqld/emb_qcache.cc | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc index 0374ab58784..4dac154ab80 100644 --- a/libmysqld/emb_qcache.cc +++ b/libmysqld/emb_qcache.cc @@ -284,11 +284,18 @@ uint emb_count_querycache_size(THD *thd) MYSQL *mysql= thd->mysql; MYSQL_FIELD *field= mysql->fields; MYSQL_FIELD *field_end= field + mysql->field_count; + MYSQL_ROWS *cur_row=NULL; + my_ulonglong n_rows=0; - *thd->data->prev_ptr= NULL; // this marks the last record - MYSQL_ROWS *cur_row= thd->data->data; - - result= 4+8 + (42 + 4*thd->data->rows)*mysql->field_count; + if (!field) + return 0; + if (thd->data) + { + *thd->data->prev_ptr= NULL; // this marks the last record + cur_row= thd->data->data; + n_rows= thd->data->rows; + } + result= 4+8 + (42 + 4*n_rows)*mysql->field_count; for(; field < field_end; field++) { @@ -315,12 +322,21 @@ void emb_store_querycache_result(Querycache_stream *dst, THD *thd) MYSQL *mysql= thd->mysql; MYSQL_FIELD *field= mysql->fields; MYSQL_FIELD *field_end= field + mysql->field_count; - - *thd->data->prev_ptr= NULL; // this marks the last record - MYSQL_ROWS *cur_row= thd->data->data; + MYSQL_ROWS *cur_row= NULL; + my_ulonglong n_rows= 0; + + if (!field) + return; + + if (thd->data) + { + *thd->data->prev_ptr= NULL; // this marks the last record + cur_row= thd->data->data; + n_rows= thd->data->rows; + } dst->store_int((uint)mysql->field_count); - dst->store_ll((uint)thd->data->rows); + dst->store_ll((uint)n_rows); for(; field < field_end; field++) { |