into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


sql/mysql_priv.h:
  Auto merged

into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943


sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
sql/mysql_priv.h:
  Manual merge
sql/sql_parse.cc:
  Manual merge

 - Set the timeout values only where needed


sql/mysql_priv.h:
  Add new functions for setting read and write timeout on "net"
sql/mysqld.cc:
  - Move the setting of "read_timeout" to the value of "connect_timeout" to
    just before 'check_connection' which is the function where we want
    to use the different timeout
  - With the new functions to set timeout on "net", there is no need to
    specifically set the default wait_timeout on windows.
sql/net_serv.cc:
  Add new functions for setting read and write timeout of "net, when
  server is compiled not to use alarms it will set the write/read timeout
  directly on connection using 'vio_timeout'(using setsockopt if socket)
sql/repl_failsafe.cc:
  Put unused code within "#if NOT_USED"
sql/set_var.cc:
  Use 'net_set_*_timeout' when adjusting timeout value
  on the current connection
sql/slave.cc:
  The read timeout used when connecting to master server is set
  using 'mysql_options' in 'connect_to_master' function
sql/sql_parse.cc:
  - Set read and write timeout values to "connect_timeout" during
  connect phase
  - Use "read_timeout" value during sslaccept phase, since this is during
  connect phase it implies "connect-timeout"
  - Set read and write timeout value back to default after connect phase
  - Set "read_timeout" to "wait_timeout" while waiting for client.
sql/sql_repl.cc:
  Set "read_timeout" to "wait_timeout" while ask other mysqld to send file
sql-common/client.c:
  Call 'vio_timeout' to set up the read and write timeout's for the
  newly created connection. It only need to be done once at connect time.
vio/vio.c:
  Use 'vio_timeout' for setting timeout also on an SSL connection
  since they both use sockets
vio/viossl.c:
  Remove 'vio_ssl_timeout' function

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

 - Write to uninitialised memory occured since _rl_rapped_lines buffer
   was not extended in CHECK_INV_LBREAKS macro
 - Patch submitted to bug-readline@gnu.org


cmd-line-utils/readline/display.c:
  Extend _rl_wrapped_lines everytime inv_lbsize is increased

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


scripts/mysqld_multi.sh:
  Auto merged
mysys/default.c:
  SCCS merged

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


BitKeeper/etc/collapsed:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/set_var.h:
  Auto merged

	variables

Bits higher than 2**31 were impossible to set on THD::options.  It's
probably a remnant from a time when options was a 32-bit integer.

Now, use unsigned long-long constants and variables to set and clear
THD::options.
---
Pulled comments back to column 49.


sql/mysql_priv.h:
  THD::options is an ulonglong, so we should define our bit constants 
  that way.
  ---
  Pulled comments back to column 49.
sql/set_var.h:
  THD::options is a ulonglong, and we if we're going to set bits higher
  than 2**31, then we must treat the bitmasks as a 64-bit number.

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint

into  recycle.(none):/src/mysql-5.0-maint


scripts/mysql_create_system_tables.sh:
  Auto merged

Added a test case for bug #6774 "Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES"

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

Makefile.am:
  Fix bad merge: add 'cd mysql-test' to test-ps: target

- Add anonymous user with no rights.

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

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


mysql-test/r/range.result:
  Auto merged
sql/item.cc:
  Auto merged

into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint

into  quadxeon.mysql.com:/users/mtaylor/mysql-5.0-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

 - Includes patch for Bug#25189


extra/yassl/README:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/src/make.bat:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_error.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/benchmark/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/include/asn.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/error.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/file.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/asn.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/coding.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/test/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/make.bat:
  Import patch yassl.diff
extra/yassl/testsuite/testsuite.cpp:
  Import patch yassl.diff

into  mysql.com:/home/ram/work/b22026/b22026.5.0

  
We use INT_RESULT type if all arguments are of type INT for 'if', 'case', 
'coalesce' functions regardless of arguments' unsigned flag, so sometimes we can
exceed the INT bounds.


mysql-test/r/select.result:
  Fix for bug #22026: Warning when using IF statement and large unsigned bigint
    - test result.
mysql-test/t/select.test:
  Fix for bug #22026: Warning when using IF statement and large unsigned bigint
    - test case.
sql/item_cmpfunc.cc:
  Fix for bug #22026: Warning when using IF statement and large unsigned bigint
    - take into account unsigned flags aggregating result types:                    
      return INT_RESULT only if two items with INT_RESULT type                      
      have equal unsigned_flags, otherwise return REAL_RESULT.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

into  ymer.(none):/usr/local/mysql/x/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged

into  ymer.(none):/usr/local/mysql/x/mysql-4.1-maint

into  siva.hindu.god:/home/tsmith/m/inno/jan20/50


innobase/dict/dict0dict.c:
  Use local

into  siva.hindu.god:/home/tsmith/m/inno/jan20/50


mysql-test/r/range.result:
  Auto merged
sql/item.cc:
  Auto merged

Fixes:
- Bug #24299: 
- Bug #25596: 


innobase/dict/dict0dict.c:
  Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots
  
  Revision r36:
  innodb-4.1: Port r1030 from innodb/branches/5.0:
  
  Replace isspace() with a wrapper ib_isspace(), because on
  Win32 isspace(0xa0) appears to hold.  (Bug #24299)
  
  
  Revision r38:
  ib_isspace(c): Check for c being the null character.  (Bug #25596)

Fixes:
- Bug #25596: 


innobase/dict/dict0dict.c:
  Applied innodb-5.0-ss1230 snapshot.
  
  r1230
  
  branches/5.0: ib_isspace(c): Check for c being the null character.
  (Bug #25596)
sql/ha_innodb.h:
  Applied innodb-5.0-ss1230
  
  Trivial indent SPACES -> TAB change.

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


mysql-test/r/range.result:
  Auto merged
sql/item.cc:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  SCCS merged

config/ac-macros/ha_ndbcluster.m4:
  We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4
configure.in:
  We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4
ndb/src/Makefile.am:
  BUILT_SOURCES is uneccesary. Removing it. The real problem was related to building or not building Ndb.

BitKeeper/etc/ignore:
  Added ndb/src/libndb.ver to the ignore list