Merge work:/my/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1

heap/hp_write.c:
  Auto merged
include/my_tree.h:
  Auto merged
mysys/charset.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

heap/hp_write.c

@@ -89,7 +89,7 @@ err:
 */
 
 int hp_rb_write_key(HP_INFO *info, HP_KEYDEF *keyinfo, const byte *record, 
-                  byte *recpos)
+		    byte *recpos)
 {
   heap_rb_param custom_arg;