From cb77a6accbc591246de00f607d9ebd8e91c187f7 Mon Sep 17 00:00:00 2001
From: "joerg@mysql.com" <>
Date: Thu, 22 Sep 2005 18:57:07 +0200
Subject: [PATCH] Fixes needed to build 5.0.13 on Windows: - reflect two
 "Makefile.am" changes in the respective "VC project" files, - correct a typo
 in a (normally) unused macro parameter.

---
 VC++Files/libmysqld/libmysqld.vcproj | 2 +-
 VC++Files/sql/mysqld.vcproj          | 2 +-
 sql/ha_federated.cc                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VC++Files/libmysqld/libmysqld.vcproj b/VC++Files/libmysqld/libmysqld.vcproj
index 4dcd6f0714c..eb411f79362 100755
--- a/VC++Files/libmysqld/libmysqld.vcproj
+++ b/VC++Files/libmysqld/libmysqld.vcproj
@@ -2299,7 +2299,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\sql\protocol_cursor.cpp">
+			RelativePath="..\sql\sql_cursor.cpp">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
diff --git a/VC++Files/sql/mysqld.vcproj b/VC++Files/sql/mysqld.vcproj
index db84f081ac8..26d23022a50 100755
--- a/VC++Files/sql/mysqld.vcproj
+++ b/VC++Files/sql/mysqld.vcproj
@@ -4578,7 +4578,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="protocol_cursor.cpp">
+			RelativePath="sql_cursor.cpp">
 			<FileConfiguration
 				Name="classic nt|Win32">
 				<Tool
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc
index 6d5c5b48ab6..08bfb6f2be7 100644
--- a/sql/ha_federated.cc
+++ b/sql/ha_federated.cc
@@ -1378,7 +1378,7 @@ static int free_share(FEDERATED_SHARE *share)
   if (!--share->use_count)
   {
     hash_delete(&federated_open_tables, (byte*) share);
-    my_free((gptr) share->scheme, MYF(MY_ALLOW_ZERO_PTR0));
+    my_free((gptr) share->scheme, MYF(MY_ALLOW_ZERO_PTR));
     share->scheme= 0;
     thr_lock_delete(&share->lock);
     VOID(pthread_mutex_destroy(&share->mutex));