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.

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

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-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

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.

Problem #1: INSERT...SELECT, Version for 5.0.
Extended the unique table check by a check of lock data.
Merge sub-tables cannot be detected by doing name checks only.


mysql-test/r/create.result:
  BUG#5390 - problems with merge tables
  Removed a duplicate test.
mysql-test/r/merge.result:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT
  Added test results.
mysql-test/t/create.test:
  BUG#5390 - problems with merge tables
  Removed a duplicate test.
mysql-test/t/merge.test:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT
  Added tests.
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added a new function to find a duplicate lock in a list of tables.
sql/mysql_priv.h:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
  Added a declaration for the new function.
sql/sql_base.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
  Added a call to the new mysql_lock_have_duplicate(),
  which needs the thread handle, to unique_table().
sql/sql_delete.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
sql/sql_insert.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
sql/sql_load.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
sql/sql_parse.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
sql/sql_update.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
  Replaced a call to find_table_in_local_list() by
  the newly extended unique_table().

  - Report error when there is nothing to read after wait.


extra/yassl/src/handshake.cpp:
  Report error if there is nothing to read after a blocking read

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

  set character_octet_length, character_maximum_length for
  binary and varbinary field types


mysql-test/r/information_schema.result:
  Fix for bug#14271 I_S: columns has no size for (var)binary columns
    test case
mysql-test/t/information_schema.test:
  Fix for bug#14271 I_S: columns has no size for (var)binary columns
    test case

  Create tmp table filed using original item name when it's necessary


mysql-test/r/view.result:
  Fix for bug#14861 aliased column names are not preserved.
    test case
mysql-test/t/view.test:
  Fix for bug#14861 aliased column names are not preserved.
    test case

Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
Bug#15224 SHOW INDEX from temporary table doesn't work.
  Restore thd->temporary_tables to be able to process
  temporary tables(only for 'show index' & 'show columns').
  This should be changed when processing of temporary tables for
  I_S tables will be done.


mysql-test/r/information_schema.result:
  Bug#12770 DESC cannot display the info. about temporary table
  Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
  Bug#15224 SHOW INDEX from temporary table doesn't work.
    test case
mysql-test/t/information_schema.test:
  Bug#12770 DESC cannot display the info. about temporary table
  Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
  Bug#15224 SHOW INDEX from temporary table doesn't work.
    test case

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

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


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

  Script "my_print_defaults" is to be searched for as executable


mysql-test/mysql-test-run.pl:
  Script "my_print_defaults" is to be searched for as executable

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

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