Fix after merge

64ed3570 · monty@mashka.mysql.fi · d783e184 · 64ed3570 · 64ed3570
Commit 64ed3570 authored Dec 14, 2002 by monty@mashka.mysql.fi
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.bzrignore .bzrignore +1 -0

sql/item.h sql/item.h +1 -1

No files found.
--- a/.bzrignore
+++ b/.bzrignore
@@ -579,3 +579,4 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
+libmysqld/protocol.cc
--- a/sql/item.h
+++ b/sql/item.h
@@ -137,7 +137,7 @@ class Item_wrapper :public Item
  {  
    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);