Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1

include/my_list.h

@@ -33,8 +33,8 @@ 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,unsigned int free_data);
-extern unsigned int list_length(LIST *list);
-extern int list_walk(LIST *list,list_walk_action action,gptr argument);
+extern unsigned int list_length(LIST *);
+extern int list_walk(LIST *,list_walk_action action,gptr argument);
 
 #define rest(a) ((a)->next)
 #define list_push(a,b) (a)=list_cons((b),(a))

tests/client_test.c

@@ -815,7 +815,6 @@ static my_bool thread_query(char *query)
 
 static void test_debug_example()
 {
-  DBUG_ENTER("fill_tables");
   int rc;
   MYSQL_RES *result;