From 3693aa4715119b0f8a5e58df241685b8272c1bac Mon Sep 17 00:00:00 2001
From: unknown <monty@mysql.com>
Date: Wed, 3 Nov 2004 20:07:17 +0200
Subject: After merge fixes

libmysqld/lib_sql.cc:
  After merge fix
sql/handler.cc:
  Cleanup
---
 libmysqld/lib_sql.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libmysqld')

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index fdc1acea09b..9fba0327525 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -591,7 +591,7 @@ err:
 
 C_MODE_END
 
-bool Protocol::send_fields(List<Item> *list, int flags)
+bool Protocol::send_fields(List<Item> *list, uint flags)
 {
   List_iterator_fast<Item> it(*list);
   Item                     *item;
-- 
cgit v1.2.1