diff options
| author | unknown <hf@deer.(none)> | 2004-06-09 22:36:48 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-06-09 22:36:48 +0500 |
| commit | 8f61f709740588c1a41eacdc12e1481e6924ef33 (patch) | |
| tree | 1e5c535dd53d2210b408ac22dbeceb2f7fcd26a0 /sql/protocol.h | |
| parent | f01f2075ff7990aec2e317e1392771e3548d3d22 (diff) | |
| download | mariadb-git-8f61f709740588c1a41eacdc12e1481e6924ef33.tar.gz | |
Fix for the bug #4014 (prepared SELECT in embedded server)
Problem is that store_string_aux calls 'wrong' net_store_data
sql/protocol.h:
I tried not to do net_store_data virtual - it's going to work a bit slower -
using the fact that Protocol_simple and Protocol_prep have different
implementation for 'store' methods.
But now the store_string_aux method works for both.
Well we still can try to make separate versions for Protocol_prep and
Protocol_simple, but i prefer to make net_store_data virtual for
embedded server so we won't have similar problems in the future
Diffstat (limited to 'sql/protocol.h')
| -rw-r--r-- | sql/protocol.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/protocol.h b/sql/protocol.h index 43230983db7..d7ce5425ad1 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -35,8 +35,10 @@ protected: enum enum_field_types *field_types; #endif uint field_count; +#ifndef EMBEDDED_LIBRARY bool net_store_data(const char *from, uint length); -#ifdef EMBEDDED_LIBRARY +#else + virtual bool net_store_data(const char *from, uint length); char **next_field; MYSQL_FIELD *next_mysql_field; MEM_ROOT *alloc; |