diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-11-30 22:17:11 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-11-30 22:17:11 +0400 |
| commit | 6959d20472f2452f4bedd600224ca565d0d5886e (patch) | |
| tree | 550b1e9c5f7ddad7a6f3c05485e1b51237d294cf /libmysqld/emb_qcache.h | |
| parent | 40eaa33c0d2fbc5409e1c5d9d2db0f5c9ce8ed85 (diff) | |
| download | mariadb-git-6959d20472f2452f4bedd600224ca565d0d5886e.tar.gz | |
Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
PS-protocol data is stored in different format - the MYSQL_RECORDS->data
contains the link to the record content, not to array of the links to
the field's contents. So we have to handle it separately for
embedded-server query cache.
libmysqld/emb_qcache.cc:
Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
ps_protocol data now stored in it's particular way.
libmysqld/emb_qcache.h:
Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
Querycache_stream::load_char/store_char ->
load_uchar/store_uchar
mysql-test/r/func_misc.result:
Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
test result
mysql-test/t/func_misc.test:
Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
the test uses t2 table, so let's make sure it doesn't exist befor the start
Diffstat (limited to 'libmysqld/emb_qcache.h')
| -rw-r--r-- | libmysqld/emb_qcache.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/emb_qcache.h b/libmysqld/emb_qcache.h index 6e320fbd967..a303273f7de 100644 --- a/libmysqld/emb_qcache.h +++ b/libmysqld/emb_qcache.h @@ -58,7 +58,7 @@ public: data_end= cur_data + (block->used-headers_len); } - void store_char(char c); + void store_uchar(uchar c); void store_short(ushort s); void store_int(uint i); void store_ll(ulonglong ll); @@ -66,7 +66,7 @@ public: void store_str(const char *str, uint str_len); void store_safe_str(const char *str, uint str_len); - char load_char(); + uchar load_uchar(); ushort load_short(); uint load_int(); ulonglong load_ll(); |