into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


sql/field.cc:
  Auto merged

Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code.

into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  SCCS merged

numbers into char fields" and bug #12860 "Difference in zero padding of
exponent between Unix and Windows"

Rewrote the code that determines what 'precision' argument should be
passed to sprintf() to fit the string representation of the input number
into the field.
We get finer control over conversion by pre-calculating the exponent, so
we are able to determine which conversion format, 'e' or 'f', will be
used by sprintf().
We also remove the leading zero from the exponent on Windows to make it
compatible with the sprintf() output on other platforms.


mysql-test/r/insert.result:
  Added test cases for bug #26788 and bug #31152.
mysql-test/t/cast.test:
  Removed --replace_result, since the result is now correct on Windows.
mysql-test/t/insert.test:
  Added test cases for bug #26788 and bug #31152.
mysql-test/t/type_float.test:
  Removed --replace_result, since the result is now correct on Windows.
mysql-test/t/variables.test:
  Removed --replace_result, since the result is now correct on Windows.
sql/field.cc:
  Rewrote the code that determines what 'precision' argument should be
  passed to sprintf() to fit the string representation of the input number
  into the field.
  We get finer control over conversion by pre-calculating the exponent, so
  we are able to determine which conversion format, 'e' or 'f', will be
  used by sprintf().

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/mysqld.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


sql/mysqld.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731


sql/mysqld.cc:
  Null merge

into  polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731


sql/mysqld.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731


sql/mysqld.cc:
  Auto merged
include/keycache.h:
  Manual merge.
include/my_global.h:
  Manual merge.
include/my_sys.h:
  Manual merge.
mysys/mf_keycache.c:
  Manual merge.
mysys/my_largepage.c:
  Manual merge.
mysys/my_malloc.c:
  Manual merge.
mysys/safemalloc.c:
  Manual merge.

into  polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731

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


libmysql/libmysql.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
configure.in:
  Use local (manual merge)

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


configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged

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


configure.in:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
libmysql/libmysql.c:
  Manual merge

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


libmysql/libmysql.c:
  Auto merged

mysql-test/r/named_pipe.result:
  Update result file for 5.1
mysql-test/r/shm.result:
  Update result file for 5.1

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  sita.local:/Users/tsmith/m/bk/maint/51


mysql-test/include/windows.inc:
  SCCS merged

into  sita.local:/Users/tsmith/m/bk/maint/50

Improve test for  shm on windows


mysql-test/include/windows.inc:
  improve "skip message" and don't require a result file
mysql-test/r/shm.result:
  Update result after adding more tests
mysql-test/t/shm-master.opt:
  Add $MTR_BUILD_THREAD to get a unique shared memory base name
mysql-test/t/shm.test:
  Run a bunch of more test to check shm
mysql-test/r/named_pipe.result:
  New BitKeeper file ``mysql-test/r/named_pipe.result''
mysql-test/t/named_pipe-master.opt:
  New BitKeeper file ``mysql-test/t/named_pipe-master.opt''
mysql-test/t/named_pipe.test:
  New BitKeeper file ``mysql-test/t/named_pipe.test''

into  production.mysql.com:/usersnfs/jperkin/bk/build-5.1


BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4:
  Auto merged

into  sita.local:/Users/tsmith/m/bk/maint/51


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  sita.local:/Users/tsmith/m/bk/maint/51


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  sita.local:/Users/tsmith/m/bk/maint/50


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/sql_select.cc:
  Auto merged

cmake list are auto-generated and thus still required.  Correct fix
not yet known.


bdb/CMakeLists.txt:
  Revert previous change, it is incorrect as those files are automatically
  generated.

into  shellback.(none):/home/msvensson/mysql/my51-bug30843


mysql-test/r/archive.result:
  Merge 5.0->5.1
mysql-test/t/archive.test:
  Merge 5.0->5.1

mysql-test/r/archive.result:
  Don't care about the "after insert delayed" record when since
  we can't guarantee the order it's been inserted
mysql-test/t/archive.test:
  Don't care about the "after insert delayed" record when since
  we can't guarantee the order it's been inserted

into  shellback.(none):/home/msvensson/mysql/my51-bug30843


BitKeeper/deleted/.del-configure.js:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/udf_example.def:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/udf_example.c:
  Merge 5.0->5.1

into  shellback.(none):/home/msvensson/mysql/my51-bug30843

into  alf.(none):/src/bug15327/my50-bug15327


win/configure.js:
  Auto merged

    
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout.


win/configure.js:
  Bug #15327: configure: --with-tcp-port option being partially ignored
          
  If MYSQL_TCP_PORT defaulted in configure (factory default 3306
  at the time of this writing), set MYSQL_TCP_PORT to factory
  default, then clear factory default after. That way, we lose no
  information, and we can distinguish between "defaulted" and the
  pathological case "builder specifically configured a port that
  coincides with factory default." This can in theory happen if
  builder configures and builds several servers from a script
  (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
  Not all that probable, but much preferable to having more "magic"
  happen in the server when we can solve this without any guesswork.

disconnects when test servers are put under load

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


BitKeeper/deleted/.del-configure.js:
  Auto merged

  
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout.


win/configure.js:
  Bug #15327: configure: --with-tcp-port option being partially ignored
      
  If MYSQL_TCP_PORT defaulted in configure (factory default 3306
  at the time of this writing), set MYSQL_TCP_PORT to factory
  default, then clear factory default after. That way, we lose no
  information, and we can distinguish between "defaulted" and the
  pathological case "builder specifically configured a port that
  coincides with factory default." This can in theory happen if
  builder configures and builds several servers from a script
  (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
  Not all that probable, but much preferable to having more "magic"
  happen in the server when we can solve this without any guesswork.

into  shellback.(none):/home/msvensson/mysql/my51-bug30843