into  mysql.com:/home/mydev/mysql-5.0-bug15591

into  mysql.com:/home/mydev/mysql-5.0-bug15591

into  mysql.com:/usr/home/ram/work/5.0.b15108

If the server is started with --port-open-timeout=# 
retry to bind the TCP port if it fails with EADDRINUSE.
Use the new option in mysql-test-run.sh.


mysql-test/mysql-test-run.sh:
  Bug#15591 Occasional test suite abort due to port in use
  Use the new option --port-open-timeout=# for server starts.
  This should fix occasionally late closed TCP ports.
sql/mysqld.cc:
  Bug#15591 Occasional test suite abort due to port in use
  If the server is started with --port-open-timeout=# 
  retry to bind the TCP port if it fails with EADDRINUSE.

  Backported Windows MAX_INDEXES handling from 5.1


include/config-win.h:
  Backported Windows MAX_INDEXES handling from 5.1

into  devsrv-b.mysql.com:/space/magnus/my50-bug15775_part2

mysql-test/t/ctype_ucs.test:
  Auto merged
sql/sql_update.cc:
  Auto merged
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged

 - Update patch for 5.0 
 - Added common function to be called when 'acl_users' has been modified


mysql-test/r/grant2.result:
  Use "create user" to avoid warnings about missing fields
mysql-test/t/grant2.test:
  Use "create user" to avoid warnings about missing fields
sql/sql_acl.cc:
  Add new function "rebuild_check_host" that is to be called when the 'acl_users'
  list has changed.
  Call function "rebuild_check_host" from mysql_drop_user, mysql_rename_user and acl_insert_user.
  Use "acl_user->host.hostname" as key when searching the acl_check_hosts in init_check_host.

into moonbone.local:/work/14583-bug-4.1-mysql

into  mysql.com:/usr/home/ram/work/5.0.b15108

into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2


mysql-test/r/grant2.result:
  Merge test results
mysql-test/t/grant2.test:
  Merge tests
sql/sql_acl.cc:
  Removing the 4.1 version patch

   - DROP USER command didn't reload the acl_check_hosts cache causing subsequent 
     connect's via TCP to fail randomly.
   - 4.1 version


mysql-test/r/grant2.result:
  Update test results
mysql-test/t/grant2.test:
  Add test for to check that connect via TCP work after "drop user"
sql/sql_acl.cc:
  Reload acl_check_hosts as its memory is mapped to acl_user
  Use acl_user->host.hostname when searching the acl_check_hosts list

into  mysql.com:/home/mydev/mysql-5.0-bug5390

into  mysql.com:/home/mydev/mysql-5.0-bug5390

into  mysql.com:/space/pekka/ndb/version/my50

When InnoDB compares varchar field in ucs2 with given key using bin collation,
it calls my_strnncollsp_ucs2_bin() to perform comparison.
Because field length was lesser than length of key field should be padded
with trailing spaces in order to get correct result. 
Because  my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
doesn't pads field, wrong comparison result was returned. This results in
wrong result set.

my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
but using binary collation.


mysql-test/t/ctype_ucs.test:
  Test case for bug#14583  Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping
  correct records.
mysql-test/r/ctype_ucs.result:
  Test case for bug#14583  Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping correct records.
strings/ctype-ucs2.c:
  Fix bug#14583 Wrong my_strnncollsp_ucs2_bin() behaviour results in skipping
  correct records.my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
  but using binary collation.

ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  error code 4709 was set outside if()
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  fix opType for detached triggers (accidental miss since v21x?)
ndb/test/ndbapi/Makefile.am:
  test_event_merge v5.0
ndb/test/ndbapi/test_event_merge.cpp:
  test_event_merge v5.0

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  build fix for 5.0

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


client/mysql.cc:
  Auto merged
myisam/mi_delete.c:
  Auto merged
mysql-test/r/fulltext2.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/mysqld.cc:
  Auto merged

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


libmysqld/ha_blackhole.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.0-bug5390


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.0-bug5390


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
mysql-test/r/create.result:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
mysql-test/r/merge.result:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
mysql-test/t/create.test:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
mysql-test/t/merge.test:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/mysql_priv.h:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/sql_parse.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/sql_update.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0

into  mysql.com:/usr/home/ram/work/5.0.b15108


sql/ha_innodb.cc:
  Auto merged

remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source


include/config-netware.h:
  put undef HAVE_ARCHIVE_DB where it belongs

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

test for LONGLONG_MIN in decimal.c


myisam/mi_create.c:
  lock THR_LOCK_myisam later
mysys/thr_alarm.c:
  remove misplaced comment and "safety" if()
server-tools/instance-manager/instance.cc:
  add unlock
strings/decimal.c:
  correct the test for LONGLONG_MIN. fix debug sprintf

  Adding test case.
charset-def.c:
  Initialize new collation.
ctype-uca.c:
  Adding simplified Hungarian collation.


strings/ctype-uca.c:
  Adding simplified Hungarian collation.
mysys/charset-def.c:
  Initialize new collation.
mysql-test/t/ctype_uca.test:
  Adding test case.
mysql-test/r/ctype_uca.result:
  Adding test case.

into  frost.snake.net:/Users/paul/bk/mysql-5.0


client/mysqltest.c:
  Auto merged

  Put options in order.
  Add #ifdef around --debug for non-debug builds.


client/mysqltest.c:
  Put options in order.
  Add #ifdef around --debug for non-debug builds.

into  mysql.com:/usr/local/mysql/mysql-5.0


sql/sql_trigger.cc:
  Auto merged

Fix: make explicit conversion to non-constant string (char *).
Backported from 5.1 changeset 1.1968 05/12/19 17:36:20 kent@mysql.com +2 -0


sql/item.cc:
  Make explicit conversion to non-constant string (char *).
sql/sql_trigger.cc:
  Make explicit conversion to non-constant string (char *).

into  mysql.com:/home/dlenev/src/mysql-5.0-bg14836

into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup

  Typo in help message.


client/mysql.cc:
  Typo in help message.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

  Fix typo.


sql/share/errmsg.txt:
  Fix typo.