Prefer not automatic keys before automatic keys. If there is two conf

into build.mysql.com:/users/tsmith/m/41/mysql-4.1

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/space/my/mysql-4.1

  Logging to logging@openlogging.org accepted
item_cmpfunc.cc, ctype_recoding.test, ctype_recoding.result:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() (but #3704)

into mysql.com:/home/my/mysql-4.1

into mysql.com:/space/my/mysql-4.1-build

   /Library/StartupItems/MySQL to /Library/StartupItems/MySQLCOM
   to avoid a name space collision with the MySQL Startup Item shipped
   with Mac OS X Server, updated the MySQLStartupItem PKG version
   number to reflect the change.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/my/mysql-4.1

Remove wrong redefine of vio_reset() (to compile libmysqld on windows)

into mc05.(none):/space/tomas/mysql-4.1

  slim make for ndb

into hundin.mysql.fi:/home/marko/j/mysql-4.1

into hundin.mysql.fi:/home/marko/j/mysql-4.1

to allow binding of userland functions in PHP.

into hundin.mysql.fi:/home/marko/j/mysql-4.1

into mysql.com:/home/mydev/mysql-4.1-wl1687

  Czech collations were renamed to _cs
Index.xml:
  Czech collation were renamed to _cs

Portablity fix for system with case insenstive table names. (Without this ALTER TABLE can fail for InnoDB)

into mysql.com:/home/my/mysql-4.1

Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)

into hegel.local:/home/miguel/bk/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1

item_list for fake_select will be created only once
(problem reported by valgrind in test_union2 fixed)

into mysql.com:/space/my/mysql-4.1-build

   that was accidently added by the last BK auto merge

into mysql.com:/home/pem/work/mysql-4.1