Merge work.mysql.com:/home/bk/mysql-4.1

into myvenu.com:/home/venu/bk/src-4.1

client/insert_test.c

@@ -16,7 +16,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <my_global.h>
 #include "mysql.h"
 
 #define INSERT_QUERY "insert into test (name,num) values ('item %d', %d)"

client/select_test.c

@@ -19,7 +19,6 @@
 #endif
 #include <stdio.h>
 #include <stdlib.h>
-#include "my_global.h"
 #include "mysql.h"
 
 #define SELECT_QUERY "select name from test where num = %d"

include/my_list.h

@@ -32,7 +32,7 @@ extern LIST *list_add(LIST *root,LIST *element);
 extern LIST *list_delete(LIST *root,LIST *element);
 extern LIST *list_cons(void *data,LIST *root);
 extern LIST *list_reverse(LIST *root);
-extern void list_free(LIST *root,pbool free_data);
+extern void list_free(LIST *root,uint free_data);
 extern uint list_length(LIST *list);
 extern int list_walk(LIST *list,list_walk_action action,gptr argument);
 

mysys/list.c

@@ -55,7 +55,7 @@ LIST *list_delete(LIST *root, LIST *element)
 }
 
 
-void list_free(LIST *root, pbool free_data)
+void list_free(LIST *root, uint free_data)
 {
   LIST *next;
   while (root)