mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-5138 Numerous test failures in "mtr --ps --embedded".

Browse source 
As Davi added code like
          sav_protocol= thd->protocol
          thd->protocol= &thd->protocol_binary
          ...
          thd->protocol= sav_protocol
  the fucntions like emb_store_querycache_result() cannot determine
  the used protocol testing thd->protocol == &thd->protocol_binary.
  Fixed by additional check thd->command == COM_STMT_EXECUTE.
This commit is contained in:
Alexey Botchkov 2014-04-15 18:09:58 +05:00
parent 7d1033115a
commit 365960a068
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libmysqld/emb_qcache.cc
View file

@ -316,7 +316,8 @@ uint emb_count_querycache_size(THD *thd)
result+= field->def_length;
}
if (thd->protocol == &thd->protocol_binary)
if (thd->protocol == &thd->protocol_binary ||
thd->command == COM_STMT_EXECUTE)
{
result+= (uint) (4*n_rows);
for (; cur_row; cur_row=cur_row->next)
@ -379,7 +380,8 @@ void emb_store_querycache_result(Querycache_stream *dst, THD *thd)
dst->store_safe_str(field->def, field->def_length);
}
if (thd->protocol == &thd->protocol_binary)
if (thd->protocol == &thd->protocol_binary ||
thd->command == COM_STMT_EXECUTE)
{
for (; cur_row; cur_row=cur_row->next)
dst->store_str((char *) cur_row->data, cur_row->length);
@ -447,7 +449,8 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src)
data->rows= rows;
if (!rows)
goto return_ok;
if (thd->protocol == &thd->protocol_binary)
if (thd->protocol == &thd->protocol_binary ||
thd->command == COM_STMT_EXECUTE)
{
uint length;
row= (MYSQL_ROWS *)alloc_root(&data->alloc,

6
mysql-test/r/ctype_ucs2_query_cache.result
View file

@ -13,6 +13,12 @@ a
2
3
4
SELECT * FROM t1;
a
1
2
3
4
DROP TABLE t1;
#
# End of 5.5 tests

1
mysql-test/t/ctype_ucs2_query_cache.test
View file

@ -12,6 +12,7 @@
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (1),(2),(3),(4);
SELECT * FROM t1;
SELECT * FROM t1;
DROP TABLE t1;
--echo #