into  sin.intern.azundris.com:/home/tnurnberg/27198/51-27198


sql/sql_class.h:
  Auto merged

into  sin.intern.azundris.com:/home/tnurnberg/27198/51-27198


sql/sql_class.h:
  Auto merged
sql/mysql_priv.h:
  manual merge

into  sin.intern.azundris.com:/home/tnurnberg/27198/50-27198


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged

into  damien-katzs-computer.local:/Users/dkatz/51

into  sin.intern.azundris.com:/home/tnurnberg/27198/41-27198


sql/mysql_priv.h:
  Bug #27198: Error returns from time() are ignored
  
  manual merge
sql/sql_class.h:
  Bug #27198: Error returns from time() are ignored
  
  manual merge

This bug was caused by unitialized value that was the result of a bad 5.0 merge.


sql/sql_class.h:
  Readded comments lost in a bad merge.
sql/sql_insert.cc:
  Fixed code to completely initialize (zero) the "COPY_INFO info" var in the same manner as the delayed write code.
  
  Readded a change that was lost in a bad merge.
tests/mysql_client_test.c:
  Test case added for bug#29692.

into  mysql.com:/home/ram/work/b29253/b29253.5.1

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint


mysql-test/suite/ndb/t/ndb_multi.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_multi_row.test:
  Auto merged

Problem: the data file changes made during delete/update are not visible to 
other threads as the file is reopened, so reading data 
with old descriptors might miss the changes.

Fix: reopen the data file before reading if it was reopened during 
delete/update to ensure there's no data behind.

Note: there's no simple test case.


storage/csv/ha_tina.cc:
  Fix for bug #29253: csv table reportedly marked as crashed
    - use the data file version technic to ensure we always see changes
      made by other threads:
        a) increase share->data_file_version each time we reopen the data 
           file, i.e. at the end of update/delete.
        b) compare the local data file version with the shared one each time 
           we want to read data, reopen it if they differ.
storage/csv/ha_tina.h:
  Fix for bug #29253: csv table reportedly marked as crashed
    - use the data file version technic to ensure we always see changes
      made by other threads:
        a) increase share->data_file_version each time we reopen the data 
           file, i.e. at the end og update/delete.
        b) compare the local data file version with shared one each time 
           we want to read data, reopen it if they differ.

gettimeofday() can fail and presumably, so can time().
Keep an eye on it.

Since we have no data on this at all so far, we just
retry on failure (and log the event), assuming that
this is just an intermittant failure. This might of
course hang the threat until we succeed. Once we know
more about these failures, an appropriate more clever
scheme may be picked (only try so many times per thread,
etc., if that fails, return last "good" time() we got or
some such).  Using sql_print_information() to log as this
probably only occurs in high load scenarios where the debug-
trace likely is disabled (or might interfere with testing
the effect).  No test-case as this is a non-deterministic
issue.


sql/mysql_priv.h:
  Bug#27198: Error returns from time() are ignored
  
  move declarations for log.cc to before inclusion of
  sql_class.h as we now use sql_print_information() in
  there.
sql/sql_class.h:
  Bug#27198: Error returns from time() are ignored
  
  gettimeofday() can fail and presumably, so can time().
  Keep an eye on it.

mysql-test/suite/ndb/t/ndb_binlog_format.test:
  Rename: mysql-test/t/ndb_binlog_format.test -> mysql-test/suite/ndb/t/ndb_binlog_format.test
mysql-test/suite/ndb/r/ndb_binlog_format.result:
  Rename: mysql-test/r/ndb_binlog_format.result -> mysql-test/suite/ndb/r/ndb_binlog_format.result

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint


sql/set_var.cc:
  Auto merged

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


sql/set_var.cc:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint


sql/ha_ndbcluster.h:
  Auto merged
sql/set_var.cc:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
mysql-test/include/have_ndb.inc:
  manual merge
mysql-test/t/disabled.def:
  manual merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.h:
  Auto merged
sql/set_var.cc:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/t/disabled.def:
  Auto merged

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

into  damien-katzs-computer.local:/Users/dkatz/mysql51


client/mysqltest.c:
  Auto merged

When opening a new connecgtion, changed mysqltest to prefer a brand new connection slot over an existing, closed slot. Fixes a problem with reused slots that can cause tests to fail. bug#29579


client/mysqltest.c:
  When opening a new connecgtion, changed mysqltest to prefer a brand new connection slot over an existing, closed slot. Fixes a problem with reused slots that can cause tests to fail.

into  damien-katzs-computer.local:/Users/dkatz/mysql51


extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

BitKeeper/deleted/.del-ssl_big.test:
  Delete: mysql-test/t/ssl_big.test
extra/yassl/include/yassl_int.hpp:
  added comment
extra/yassl/src/yassl_int.cpp:
  Changed init order to fix a compiler warning.
mysql-test/r/mysqltest.result:
  There is no limit to connections anymore.
mysql-test/t/mysqltest.test:
  There is no limit to connections anymore.

into  damien-katzs-computer.local:/Users/dkatz/mysql51


client/mysqltest.c:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
sql/slave.cc:
  Auto merged
vio/viossl.c:
  SCCS merged

into  damien-katzs-computer.local:/Users/dkatz/50

into  damien-katzs-computer.local:/Users/dkatz/mysql51

Added an option to yassl to allow "quiet shutdown" like openssl does. This option causes the SSL libs to NOT perform the close_notify handshake during shutdown. This fixes a hang we experience because we hold a lock during socket shutdown.


mysql-test/t/ssl_big.test:
  BitKeeper file /Users/dkatz/50/mysql-test/t/ssl_big.test
mysql-test/r/ssl-big.result:
  BitKeeper file /Users/dkatz/50/mysql-test/r/ssl-big.result
client/mysqltest.c:
  Added new command to mysqltest to send a quit command to the server, but to not close the actual socket on our end.
  
  Also changed code to reuse connection slots, so that the tests can open and close sockets in a loop.
extra/yassl/include/openssl/ssl.h:
  Added C accessors to the quietShutdown option.
extra/yassl/include/yassl_int.hpp:
  Added quietShutdown_ member and accessor methods to the SSL class.
extra/yassl/src/ssl.cpp:
  Added accessors to get/set the quietShutdown option and to not perform the shutdown handshake if quietShutdown is set.
extra/yassl/src/yassl_int.cpp:
  Added quietShutdown_ member and accessor methods to the SSL class.
vio/viossl.c:
  Added line to set the quiet_shutdown option before shutting down the socket.
mysql-test/t/ssl-big.test:
  Added a test that causes an unpatched server to hang during SSL socket shutdown.

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


sql/slave.cc:
  Auto merged

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


sql/slave.cc:
  Auto merged

into  polly.local:/home/kaa/src/maint/bug24192/my51-bug24192


sql/slave.cc:
  Manual merge.

In case of out-of-memory error received from the master, print the corresponding message to the error log and stop slave I/O thread to avoid reconnecting with a wrong binary log position.


sql/slave.cc:
  In case of out-of-memory error received from the master, print the corresponding message to the error log and stop slave I/O thread to avoid reconnecting with a wrong binary log position.

Streamlining test for RBR

into  damien-katzs-computer.local:/Users/dkatz/mysql51


mysql-test/t/status.test:
  Auto merged

into  mysql.com:/home/tnurnberg/22540/51-22540


sql/log.cc:
  Auto merged

into  mysql.com:/home/tnurnberg/22540/51-22540


sql/log.cc:
  Auto merged

into  mysql.com:/home/tnurnberg/22540/50-22540


sql/log.cc:
  Auto merged

streamlining the test