Merge bk@192.168.21.1:mysql-5.0-kt

into  mysql.com:/home/hf/work/mysql-5.0.19452


client/mysql_upgrade.c:
  Auto merged

client/mysql_upgrade.c

@@ -73,7 +73,7 @@ static struct my_option my_long_options[]=
 };
 static const char *load_default_groups[]=
 {
-  "mysql_upgrade", "client", 0
+  "mysql_upgrade", 0
 };
 
 #include <help_end.h>