Fix after merge

BitKeeper/etc/ignore:
  added libmysqld/protocol.cc
This commit is contained in:
unknown 2002-12-14 18:30:28 +02:00
parent 5a9437ac05
commit 4381cd8565
2 changed files with 2 additions and 1 deletions

View File

@ -579,3 +579,4 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
libmysqld/protocol.cc

View File

@ -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);