into  siva.hindu.god:/home/tsmith/m/bk/maint/40

into  production.mysql.com:/usersnfs/jamppa/mysql-4.0

Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms

Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms

Fix to check library in use during runtime.
Fix for Bug#16995, "idle connections not being killed due to timeout when NPTL is used".

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40

into  trift2.:/MySQL/M40/mysql-4.0

into  mysql.com:/data0/mysqldev/my/mysql-4.0-15815

into  trift2.:/MySQL/M40/mysql-4.0

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g40

no future build of it will include Berkeley DB:
Remove it from the Windows VC++ project files.

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.0

into  moonlight.home:/home/tomash/src/mysql_ab/mysql-4.0-bug23443

           server

The problem was that when memory was exhausted HEAP engine could crash
(GROUP BY uses HEAP TABLE).  Alternatively, if SET was used, it could
report an error "You may only use constant expressions with SET" instead
of "Out of memory (Needed NNNNNN bytes)".

The solution is:
 - pass MY_WME to (some) calls to my_malloc() to get correct message.
 - fix heap_write() so that the first key is skipped during cleanup
   on ENOMEM because it wasn't inserted and doesn't have to be
   deleted.

No test case is provided because we can't test out-of-memory behaviour
in our current test framework.

- "make_binary_distribution" accepts a dummy "--platform=" argument.

- "MySQL-shared-compat.spec" uses a "version40" define symbol internally.

- Bug #15815: Very poor performance with multiple queries running concurrently
- Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw

This is a patch from an e-mail; it is not included in an InnoDB snapshot.

into  mysql.com:/Users/kent/mysql/bk/mysql-4.0

  Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.0

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint

- The io cache flag seek_not_done was not set properly in the 
  reinit_io_cache function call and this led my_seek to be called
  desipite an invalid file handle.
- Added a test in reinit_io_cache to ensure we have a valid file 
  handle before setting seek_not_done flag.

into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/40

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.0

into  siva.hindu.god:/usr/home/tim/m/bk/40

into  chilla.local:/home/mydev/mysql-4.0-bug20719

Deletes on a big index could crash the index when it needs to
shrink.

Put a forgotten negation operator in.

No test case. It is too big for the test suite. And it does not
work with 4.0, only with higher versions. It is attached to the
bug report.

into  chilla.local:/home/mydev/mysql-4.0-bug20719

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

            "concurrent insert"
After merge fix.

into  chilla.local:/home/mydev/mysql-4.0-bug14400

into  chilla.local:/home/mydev/mysql-4.0-bug14400

          (back-port to 4.0)

Socket timeouts in client library were used only on Windows.
Additionally, in 4.0 write operations erroneously set read timeout.

The solution is to use socket timeouts in client library on all
systems were they are supported, and to differentiate between read
and write timeouts.

No test case is provided because it is impossible to simulate network
failure in current test suite.

- Fix my_read/my_write to handle return values from read/write correctly
- Add debugging 'deprecated function' warning to my_lread/my_lwrite
- Add debugging 'error, read/write interrupt not handled' warning to my_quick_read/my_quick_write

There is no test case associated with these changes.  However, this is a conservative change,
and no repeatable test case is available.

            "concurrent insert"
Additional fix for full keys and test case.

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

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