diff options
| author | unknown <hf@deer.(none)> | 2003-10-01 16:44:57 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-10-01 16:44:57 +0500 |
| commit | e50b19a04756a7aa6965d7797a21a04efd534b14 (patch) | |
| tree | 801af6a8599b4055c8948a7f7c06275ba1d543f2 /sql/item.h | |
| parent | 6fbd3da597615c94b2aab7b02fd9e1b8f9092c1b (diff) | |
| download | mariadb-git-e50b19a04756a7aa6965d7797a21a04efd534b14.tar.gz | |
Fix for #1430
there was an error about sendind prepared parameters to the server
libmysqld/lib_sql.cc:
parameter's length added as a parameter
sql/ha_berkeley.cc:
these lines sometimes crashes in embedded library
so i #ifdef-ed it
sql/item.h:
add the data_len parameter in the embedded case
sql/sql_prepare.cc:
i added macroses to make headers of store_param_xxx functions
they have different number of parameters in standalone an embedded servers
also get_param_length now is implemented differently in embedded server
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index b2d67a661a6..d10df759b28 100644 --- a/sql/item.h +++ b/sql/item.h @@ -346,7 +346,11 @@ public: void set_time(TIME *tm, timestamp_type type); bool get_time(TIME *tm); void reset() {} +#ifndef EMBEDDED_LIBRARY void (*setup_param_func)(Item_param *param, uchar **pos); +#else + void (*setup_param_func)(Item_param *param, uchar **pos, ulong data_len); +#endif enum Item_result result_type () const { return item_result_type; } String *query_val_str(String *str); |