From 66ecacb3c36f5fbe81f02b3594a3cc96a2afeea1 Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Wed, 18 Jun 2003 10:34:09 +0500
Subject: Last part of resolving conflicts after pull Some intersections with
 Monty encountered

---
 libmysql/client_settings.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'libmysql/client_settings.h')

diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h
index d4e8be84c48..43f341c7b1c 100644
--- a/libmysql/client_settings.h
+++ b/libmysql/client_settings.h
@@ -41,7 +41,3 @@ my_bool send_file_to_server(MYSQL *mysql, const char *filename);
 #define reset_sigpipe(mysql)
 #endif
 
-#define CLI_MYSQL_USE_RESULT cli_mysql_use_result
-
-MYSQL_RES * STDCALL cli_mysql_use_result(MYSQL *mysql);
-
-- 
cgit v1.2.1