Fix after merge
BitKeeper/etc/ignore: added libmysqld/protocol.cc
This commit is contained in:
parent
5a9437ac05
commit
4381cd8565
@ -579,3 +579,4 @@ vio/test-ssl
|
||||
vio/test-sslclient
|
||||
vio/test-sslserver
|
||||
vio/viotest-ssl
|
||||
libmysqld/protocol.cc
|
||||
|
@ -137,7 +137,7 @@ public:
|
||||
{
|
||||
return (null_value=item->get_date(ltime, fuzzydate));
|
||||
}
|
||||
bool send(THD *thd, String *tmp) { return item->send(thd, tmp); }
|
||||
bool send(Protocol *prot, String *tmp) { return item->send(prot, tmp); }
|
||||
int save_in_field(Field *field, bool no_conversions)
|
||||
{
|
||||
return item->save_in_field(field, no_conversions);
|
||||
|
Loading…
x
Reference in New Issue
Block a user