Merge paul@work.mysql.com:/home/bk/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0

include/Makefile.am

@@ -19,7 +19,7 @@ BUILT_SOURCES =		mysql_version.h m_ctype.h my_config.h
 pkginclude_HEADERS =	dbug.h m_string.h my_sys.h my_list.h \
 			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
 		        my_pthread.h my_no_pthread.h raid.h errmsg.h \
-			my_global.h my_net.h \
+			my_global.h my_net.h my_alloc.h\
 			sslopt-case.h sslopt-longopts.h sslopt-usage.h \
 			sslopt-vars.h $(BUILT_SOURCES)
 noinst_HEADERS =	config-win.h \

include/my_sys.h

@@ -464,7 +464,7 @@ typedef struct st_changeable_var {
 } CHANGEABLE_VAR;
 
 
-#include "my_alloc.h"
+#include <my_alloc.h>
 
 	/* Prototypes for mysys and my_func functions */
 

include/mysql.h

@@ -100,7 +100,7 @@ typedef struct st_mysql_rows {
 
 typedef MYSQL_ROWS *MYSQL_ROW_OFFSET;	/* offset to current row */
 
-#include "my_alloc.h"
+#include <my_alloc.h>
 
 typedef struct st_mysql_data {
   my_ulonglong rows;