into  alf.(none):/src/macro_bugs/my51-macro_bugs

into  alf.(none):/src/macro_bugs/my51-macro_bugs

- Remove duplicate macro defintions.

  Use MYSQL_NUMERIC_VERSION, to make sure NDB_VERSION_BUILD is numeric

into  mysql.com:/home/kent/bk/build/mysql-5.1-build

  Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
misc.m4, character_sets.m4, openssl.m4:
  Removed unneded semicolon

into  mysql.com:/home/kent/bk/build/mysql-5.0-build

  Corrected calculation of version id, incorrect last two digits if < 10
  Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
  RPM spec file
  Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
  Added clear doc how the different version variables differ
SocketServer.cpp:
  Corrected typo in debug error message

into  mysql.com:/home/kent/bk/build/mysql-5.0-build

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50

The check_global_access() function was made available to InnoDB, but
was not defined in the embedded server library.  InnoDB, as a plugin,
is not recompiled when the embedded server is built.  This caused a
link failure when compiling applications which use the embedded server.

The fix here is to always define check_global_access() externally; in
the embedded server case, it is defined to just return OK.

Also, don't run the test case for this bug in embedded server.

into  hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean

into  hh-nb.hungers:/work/merge/mysql-5.1-build

into  hh-nb.hungers:/work/merge/mysql-5.1-bug32664

    Disable extra team trees.
    Temporary fix for entry 34761 in the bugs DB.
    (Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/push-5.1

into  alf.(none):/src/mysql-5.1-build_31929

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build

 - fix test failures that was already there but now are
   more consistent when the 1 second sleep has been removed from
   ndb_waiter

into  wva.:C:/bk/bug31745_2/mysql-5.0-build

into  wva.:C:/bk/bug31745_2/mysql-5.1-build

Patch for bug#32664: event.test has timeout randomly. File is split into event_1.test and event_2.test.

ndb data to be logged has made it to the binary log to get a deterministic
behavior on the rotation of the log.

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge

bool in C.

Fixes the following bugs:

- Bug #33349: possible race condition revolving around data dictionary and repartitioning
  Introduce retry/sleep logic as a workaround for a transient bug
  where ::open fails for partitioned tables randomly if we are using
  one file per table.

- Bug #34053: normal users can enable innodb_monitor logging
  In CREATE TABLE and DROP TABLE check whether the table in question is one
  of the magic innodb_monitor tables and whether the user has enough rights
  to mess with it before doing anything else.

- Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'
  This is a combination of changes that forward port the scalability fix applied to 5.0
  through r1001.
  It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
  scalability fix of 5.0)
  Then it applies r1001 to 5.0 which is the original scalability fix.
  Finally it applies r2082 which fixes an issue with the original fix.

- Bug #30930: Add auxiliary function to retrieve THD::thread_id
  Add thd_get_thread_id() function.  Also make check_global_access() function
  visible to InnoDB under INNODB_COMPATIBILITY_HOOKS #define.

into  wva.:C:/bk/bug31745_2/my51_31754_2

- Replace per-thread signal()'s with  SetUnhandledExceptionFilter(). 
  The only remaining signal() is for SIGABRT (default abort()
  handler in VS2005 is broken, i.e removes user exception filter)
- remove MessageBox()'es  from error handling code
- Windows port for print_stacktrace() and write_core() 
- Cleanup, removed some unused functions

into  gbichot4.local:/home/mysql_src/mysql-5.1-build-gca

value" error even though the value was correct): a C function in my_getopt.c
was taking bool* in parameter and was called from C++ sql_plugin.cc,
but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny
mismatches. Fixed, all other occurences of bool in C are removed, future
ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool).

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51