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


ndb/src/common/util/SocketServer.cpp:
  Auto merged

  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


ndb/src/common/util/SocketServer.cpp:
  Corrected typo in debug error message
configure.in:
  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

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


configure.in:
  Auto merged

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


scripts/mysqlhotcopy.sh:
  Auto merged

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


ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged

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


mysql-test/t/ndb_autodiscover.test:
  Wait until mysqld has reconnected to ndbd after ndbd has been restarted
mysql-test/t/ndb_autodiscover3.test:
  Wait until mysqld has reconnected to ndbd after ndbd has been restarted
mysql-test/include/ndb_wait_connected.inc:
  Wait until mysqld has reconnected to ndbd after ndbd has been restarted

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


sql/sql_parse.cc:
  Auto merged

- 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


sql/CMakeLists.txt:
  Implement stack tracing on and generating crash dumps on Windows
sql/mysqld.cc:
  Correct signal handling on Windows. 
  - For console events, like CTRL-C use SetConsoleCtrlHandler
  - For exceptions like access violation, use SetUnhandledExceptionFilter
  - For SIGABRT generate exception via __debugbreak() intrinsic
    if built with VS2005 and later , since default SIGABRT handler 
    replaces unhandled exception filter specified by user
  - make provisions to debug exception filter, as it is not trivial 
  (should be compiled with /DDEBUG_UNHANDLED_EXCEPTION_FILTER)
sql/sql_parse.cc:
  Remove message box from windows signal handler.
  The only thread specific handler left is for SIGABRT,
  which is broken on VS2005 and later (user specified unhandled exception 
  filter gets overwritten)
sql/stacktrace.c:
  Stack tracing and generating crash dumps on Windows
sql/stacktrace.h:
  Implement print_stacktrace and write_core on Windows

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

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

Check for an existing MySQL server package from a different vendor or
major MySQL version.  In such a case, refuse to install the server and
recommend how to safely remove the old packages before installing the
new ones.


support-files/mysql.spec.sh:
  Add to the %pre server scriptlet checks to ensure that we're not
  upgrading from another vendor's package, or that this is not a
  major version upgrade.  If an automatic upgrade isn't safe, print
  basic instructions on how to do a manual upgrade, and bail out.

Remove code from mysqlhotcopy which deals with the so-called "RAID"
feature of older MyISAM.


scripts/mysqlhotcopy.sh:
  Remove code which tried to handle the so-called "RAID" files.
  
  The "RAID" feature has been dropped from MySQL builds, and this
  code caused mysqlhotcopy to skip (silently) over databases with
  two-character names (e.g., "ab").

Add -lmygcc to mysql_config output for libs, libs_r, and embedded_libs.

Required when linking against our static libs, if yassl is used, and gcc
used to build library is significantly different from that which is using
the library.


scripts/mysql_config.sh:
  Add -lmygcc to --libs, --libs_r, and --embedded-libs output, if libmygcc.a
  is found in the pkglibdir.
  
  This works around a problem when linking against the static client
  libs which were built with a different GCC than the current compiler.
  In this case, without -lmygcc, several builtin functions (e.g.,
  __pure_virtual, __builtin_delete) are left undefined.  Currently it
  is yassl which pulls in these symbols.
  
  This isn't a problem when linking against shared libraries, or when
  using the same compiler version.
  
  Currently it shows up with libs built on build.mysql.com with gcc 2.95.3,
  when using them on more recent systems.
  
  
  Also strip the -mcpu, -mtune, and -march cflags.  The calling package can
  determine what optimization parameters to choose.

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

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


configure.in:
  SCCS merged

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

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


configure.in:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge

extra/resolveip.c:
  Regrettably, Windows does not have inet_aton. We still don't want to use inet_addr on all platforms, because it is inaccurate and deprecated on many.

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge

into  dipika.(none):/opt/local/work/mysql-5.0-runtime

The unsignedness of large integer user variables was not being
properly preserved when feeded to prepared statements. This was
happening because the unsigned flags wasn't being updated when
converting the user variable is converted to a parameter.

The solution is to copy the unsigned flag when converting the
user variable to a parameter and take the unsigned flag into
account when converting the integer to a string.


mysql-test/r/binlog.result:
  Add test case result for Bug#33798
mysql-test/r/ps.result:
  Add test case result for Bug#33798
mysql-test/t/binlog.test:
  Add test case for Bug#33798
mysql-test/t/ps.test:
  Add test case for Bug#33798
sql/item.cc:
  Take the unsigned flag into account when converting the
  user variable.

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


client/mysqltest.c:
  Auto merged

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

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

ndb/tools/waiter.cpp:
  - Only contact ndb_mgmd once per loop
  - Program only cares about ndbd nodes -> remove the api and mgm vectors
  - Program can not wait for "starting" -> remove that code
  - Remove unused includes
  - Protect against SIGPIPE(writing to a socket where the mgmsrv was
    gone, silently killed the program)
  - Don't sleep one second if if all nodes are in the wanted state  
  - Use 100 milliseconds sleep between each poll

slash in filenames also for Create_file_log_event.


client/mysqlbinlog.cc:
  BUG#34355: mysqlbinlog outputs backslash as path separator for 4.1 binlogs
  Problem: When the windows version of mysqlbinlog reads 4.1 binlogs
  containing LOAD DATA INFILE, it outputs backslashes as path separators in
  filenames. However, the output is typically piped to a client, and client
  expects forward slashes.
  Fix: Replace '\\' by '/' in filenames.

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


configure.in:
  Auto merged

into  mysql.com:/data0/mysqldev/my/build-200802061048-5.0.56/mysql-5.0-release


configure.in:
  Merge from main.

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

mysql-test/mysql-test-run.pl:
  Fix typo (missing $prefix arg to mtr_add_arg(--user=root))

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