auto merge

This commit is contained in:
Georgi Kodinov 2009-01-16 16:48:41 +02:00
commit 7fc8286257
6 changed files with 49 additions and 1 deletions

View file

@ -1302,6 +1302,7 @@ public:
longlong val_int_result();
String *str_result(String *str);
my_decimal *val_decimal_result(my_decimal *);
bool is_null_result();
bool update_hash(void *ptr, uint length, enum Item_result type,
CHARSET_INFO *cs, Derivation dv, bool unsigned_arg);
bool send(Protocol *protocol, String *str_arg);