From e4921f2159a279cfba37a9d3fbfa498141e81b69 Mon Sep 17 00:00:00 2001
From: unknown <monty@hundin.mysql.fi>
Date: Mon, 17 Dec 2001 23:24:51 +0200
Subject: Fix after merge

BitKeeper/etc/ignore:
  Added libmysqld/sql_do.cc to the ignore list
include/m_string.h:
  Fix for purify
libmysql/Makefile.shared:
  Fix for purify
libmysqld/Makefile.am:
  Fix for purify
sql/sql_handler.cc:
  Cleanup
---
 sql/sql_do.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_do.cc')

diff --git a/sql/sql_do.cc b/sql/sql_do.cc
index 8e197b47fd5..77be253766c 100644
--- a/sql/sql_do.cc
+++ b/sql/sql_do.cc
@@ -26,7 +26,7 @@ int mysql_do(THD *thd, List<Item> &values)
   List_iterator<Item> li(values);
   Item *value;
   DBUG_ENTER("mysql_do");
-  if (setup_fields(thd,0, values, 0, 0))
+  if (setup_fields(thd,0, values, 0, 0, 0))
     DBUG_RETURN(-1);
   while ((value = li++))
     value->val_int();
-- 
cgit v1.2.1