into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build

'shutdown_delay' option name.

into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build

which accidentally got broken during the merge
on 16-Feb-2007.

into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt

Fix timeouts. Only test suite is changed.

into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merge

into  naruto.:C:/cpp/mysql-5.1-runtime

The cause of im_daemon_life_cycle.imtest random failures was the following
behaviour of some implementations of LINUX threads: let's suppose that a
process has several threads (in LINUX threads, there is a separate process for
each thread). When the main process gets killed, the parent receives SIGCHLD
before all threads (child processes) die. In other words, the parent receives
SIGCHLD, when its child is not completely dead.

In terms of IM, that means that IM-angel receives SIGCHLD when IM-main is not dead
and still holds some resources. After receiving SIGCHLD, IM-angel restarts
IM-main, but IM-main failed to initialize, because previous instance (copy) of
IM-main still holds server socket (TCP-port).

Another problem here was that IM-angel restarted IM-main only if it was killed
by signal. If it exited with error, IM-angel thought it's intended / graceful
shutdown and exited itself.

So, when the second instance of IM-main failed to initialize, IM-angel thought
it's intended shutdown and quit.

The fix is
  1. to change IM-angel so that it restarts IM-main if it exited with error code;
  2. to change IM-main so that it returns proper exit code in case of failure.

  1. use MySQL headers instead of system ones;
  2. move logical part of code into a separate function.

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime

- Merged from 5.0
- Removed redundant call to set_time(); now included in init_for_queries

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-runtime

into  kpdesk.mysql.com:/home/thek/dev/bug23240/my51-bug23240

- Starting time of a query sent by bootstrapping wasn't initialized
  and starting time defaulted to 0. This later used value by NOW-
  item and was translated to 1970-01-01 11:00:00.
- Marketing the time with thd->set_time() before the call to
  mysql_parse resolves this issue.
- set_time was refactored to be part of the thd->init_for_queries-
  process.

into  kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240

- Starting time of a query sent by file bootstrapping wasn't initialized
  and starting time defaulted to 0. This later used value by the Now-
  item and is translated to 1970-01-01 11:00:00.
- marking the time with thd->set_time() before the call to 
  mysql_parse resolves this issue.

im_daemon_life_cycle fails randomly.

1. Move IM-angel functionality into a separate file, create Angel class.
2. Be more verbose;
3. Fix typo in FLUSH INSTANCES implementation;
4. Polishing.

into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge

- The condition variable implementation "lost" a signal to
  WaitOnSingleObject when a semaphore was released.
- The signal could be consumed by a new call to pthread_cond_wait
  before all waiting threads had awoken.
- The new implementation of pthread_cond_* uses events
  instead of semaphores. It also uses an extra lock to protect entry
  into new cond wait before the broadcast has finished.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  olga.mysql.com:/home/igor/mysql-5.1-opt

into  olga.mysql.com:/home/igor/mysql-5.1-opt

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt