Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build

into  trift2.:/MySQL/M51/push-5.1

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 */

netware/Makefile.am

@@ -57,7 +57,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} \

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