From eb0ddb21840c8f363739aabab820d5bff5890da6 Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Mon, 19 Mar 2007 20:44:46 +0100
Subject: [PATCH 1/3] BUG#27270 Can't compile latest 5.1-main

---
 sql/sql_yacc.yy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 7da1ddc7cad..96c4588e57c 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -7561,13 +7561,13 @@ index_hint_definition:
        {
          Select->set_index_hint_type($1, $3);
        }
-       '(' key_usage_list ')';
+       '(' key_usage_list ')'
        | USE_SYM key_or_index index_hint_clause
        {
          Select->set_index_hint_type(INDEX_HINT_USE, $3);
        }
-       '(' opt_key_usage_list ')';
-
+       '(' opt_key_usage_list ')'
+       ;
 
 index_hints_list:
        index_hint_definition         

From 8161dcaacb6fd6fd6137e526879af34493b0c337 Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Tue, 20 Mar 2007 13:32:49 +0100
Subject: [PATCH 2/3] build fix for netware

---
 include/my_global.h | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/include/my_global.h b/include/my_global.h
index b6c6ff13405..9bf411f5c82 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1489,11 +1489,24 @@ do { doubleget_union _tmp; \
 #define dlerror() ""
 #endif
 
+#ifndef __NETWARE__
 /*
-  Include standard definitions of operator new and delete.
+ *  Include standard definitions of operator new and delete.
  */
 #ifdef __cplusplus
 #include <new>
 #endif
+#else
+/*
+ *  Define placement versions of operator new and operator delete since
+ *  we don't have <new> when building for Netware.
+ */
+#ifdef __cplusplus
+inline void *operator new(size_t, void *ptr) { return ptr; }
+inline void *operator new[](size_t, void *ptr) { return ptr; }
+inline void  operator delete(void*, void*) { /* Do nothing */ }
+inline void  operator delete[](void*, void*) { /* Do nothing */ }
+#endif
+#endif
 
 #endif /* my_global_h */

From 56856d6f312a7b3651e45a5e946da6b913357232 Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Tue, 20 Mar 2007 13:33:17 +0100
Subject: [PATCH 3/3] small build fix

---
 netware/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netware/Makefile.am b/netware/Makefile.am
index de39376f6a1..8326b30d5b5 100644
--- a/netware/Makefile.am
+++ b/netware/Makefile.am
@@ -54,7 +54,7 @@ DISTCLEANFILES =                $(BUILT_SOURCES)
 
 # Create the libmysql.imp from libmysql/libmysql.def
 libmysql.imp: $(top_srcdir)/libmysql/libmysql.def
-	awk 'BEGIN{x=0;} \
+	$(AWK) 'BEGIN{x=0;} \
              END{printf("\n");} \
              x==1 {printf(" %s",$$1); x++; next} \
              x>1 {printf(",\n %s", $$1); next} \