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

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


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

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

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.

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.0-ndb

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.

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/50

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

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.

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


sql/log.cc:
  Auto merged

Apply innodb-5.0-* snapshots:  ss1489 and ss1547.

Fixes:
Bug#9709:  InnoDB inconsistensy causes "Operating System Error 32/33"
Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load
Bug#25645: Assertion failure in file srv0srv.c
Bug#27294: insert into ... select ... causes crash with innodb_locks_unsafe_for_binlog=1
Bug#28138: indexing column prefixes produces corruption in InnoDB


innobase/btr/btr0btr.c:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1547:
  branches/5.0: Merge r1546 from trunk:
  
  When buffering an insert to a prefix index of a variable-length column,
  do not incorrectly mark the column as fixed-length.  (Bug #28138)
  
  ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
  dtype_new_store_for_order_and_null_size().  Add debug assertions.
  
  btr_index_rec_validate(): Correct a comment about prefix indexes.
  
  rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
  debug assertions and comments.
  
  dict_col_type_assert_equal(): New debug function.
innobase/buf/buf0buf.c:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1502:
  branches/5.0: Add debug code for Bug 26081. This change has some debug
  assertions that have been promoted to normal assertions. These will need
  to be undone once we've nailed this bug.
innobase/buf/buf0lru.c:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1502:
  branches/5.0: Add debug code for Bug 26081. This change has some debug
  assertions that have been promoted to normal assertions. These will need
  to be undone once we've nailed this bug.
innobase/ibuf/ibuf0ibuf.c:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1547:
  branches/5.0: Merge r1546 from trunk:
  
  When buffering an insert to a prefix index of a variable-length column,
  do not incorrectly mark the column as fixed-length.  (Bug #28138)
  
  ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
  dtype_new_store_for_order_and_null_size().  Add debug assertions.
  
  btr_index_rec_validate(): Correct a comment about prefix indexes.
  
  rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
  debug assertions and comments.
  
  dict_col_type_assert_equal(): New debug function.
innobase/include/buf0buf.ic:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1502:
  branches/5.0: Add debug code for Bug 26081. This change has some debug
  assertions that have been promoted to normal assertions. These will need
  to be undone once we've nailed this bug.
innobase/include/buf0lru.h:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1502:
  branches/5.0: Add debug code for Bug 26081. This change has some debug
  assertions that have been promoted to normal assertions. These will need
  to be undone once we've nailed this bug.
innobase/include/dict0dict.h:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1547:
  branches/5.0: Merge r1546 from trunk:
  
  When buffering an insert to a prefix index of a variable-length column,
  do not incorrectly mark the column as fixed-length.  (Bug #28138)
  
  ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
  dtype_new_store_for_order_and_null_size().  Add debug assertions.
  
  btr_index_rec_validate(): Correct a comment about prefix indexes.
  
  rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
  debug assertions and comments.
  
  dict_col_type_assert_equal(): New debug function.
innobase/include/dict0dict.ic:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1547:
  branches/5.0: Merge r1546 from trunk:
  
  When buffering an insert to a prefix index of a variable-length column,
  do not incorrectly mark the column as fixed-length.  (Bug #28138)
  
  ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
  dtype_new_store_for_order_and_null_size().  Add debug assertions.
  
  btr_index_rec_validate(): Correct a comment about prefix indexes.
  
  rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
  debug assertions and comments.
  
  dict_col_type_assert_equal(): New debug function.
innobase/include/dict0mem.h:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1537:
  branches/5.0: merge r1536 and partially r1535
  
  Change the comment to a more appropriate one. Discussed with Heikki on IM.
  
  Document that DICT_MAX_INDEX_COL_LEN should not be changed.
innobase/include/os0file.h:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1417:
  branches/5.0: Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
  ERROR_LOCK_VIOLATION is encountered during file operation.
  This is caused by backup software, so InnoDB should retry while the backup
  software is done with the file.
  
  Approved by:	Heikki
innobase/include/trx0trx.h:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1463:
  branches/5.0: merge r1462 from trunk:
  
  Fix typo in comment.
innobase/lock/lock0lock.c:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1458:
  branches/5.0: Fix Bug#22819, remove assertion.  (http://bugs.mysql.com/bug.php?id=22819)
innobase/log/log0log.c:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1520:
  Patch to allow monitor threads to stop before proceeding with normal shutdown. 
  Also have a separate time counter for tablespace monitor.
  
  reviewed by: Heikki
  
  
  Revision r1525:
  backport of r1524
  
  Log:
  Undo bad space formatting introduced in earlier commit r1521
  
  spotted by: Marko
innobase/mtr/mtr0mtr.c:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1502:
  branches/5.0: Add debug code for Bug 26081. This change has some debug
  assertions that have been promoted to normal assertions. These will need
  to be undone once we've nailed this bug.
innobase/os/os0file.c:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1417:
  branches/5.0: Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
  ERROR_LOCK_VIOLATION is encountered during file operation.
  This is caused by backup software, so InnoDB should retry while the backup
  software is done with the file.
  
  Approved by:	Heikki
innobase/rem/rem0rec.c:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1547:
  branches/5.0: Merge r1546 from trunk:
  
  When buffering an insert to a prefix index of a variable-length column,
  do not incorrectly mark the column as fixed-length.  (Bug #28138)
  
  ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
  dtype_new_store_for_order_and_null_size().  Add debug assertions.
  
  btr_index_rec_validate(): Correct a comment about prefix indexes.
  
  rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
  debug assertions and comments.
  
  dict_col_type_assert_equal(): New debug function.
innobase/row/row0sel.c:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1456:
  branches/5.0: merge r1452 from trunk:
  
  Fix phantom reads (http://bugs.mysql.com/27197) following Heikki's
  patch in the bug followup.
innobase/srv/srv0srv.c:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1460:
  branches/5.0: Merge r1459 from trunk:
  
  Fix typo in the comment.
  
  
  Revision r1520:
  Patch to allow monitor threads to stop before proceeding with normal shutdown. 
  Also have a separate time counter for tablespace monitor.
  
  reviewed by: Heikki
sql/ha_innodb.cc:
  Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
  
  Revision r1436:
  branches/5.0: Fix Bug#27294 by using trx returned by check_trx_exists()
  instead of prebuilt->trx. This has been fixed in 5.1 in r782.
  
  Approved by:	Heikki
  
  
  Revision r1443:
  branches/5.0: merge r1442 from trunk:
  
  Potential fix for Bug#25645:
  
  "Move innobase_release_stat_resources(trx) outside the 'if' in
  ha_innobase::external_lock(). That would add more safety that whatever
  MySQL does at a query end, there would be no risk of a hang on the btr
  search latch."
  
  Also call innobase_release_temporary_latches() in the beginning of
  ha_innobase::close().
  
  Approved by:	Heikki
  
  
  Revision r1454:
  branches/5.0: merge r1453 from trunk:
  
  Bugfix: only call innobase_release_temporary_latches() in case of current_thd
  is not NULL, otherwise we get NULL pointer dereferencing.
  
  
  
  Revision r1504:
  branches/5.0: Apply patch for Bug 27650 from MySQL.
  
  
  Revision r1539:
  Backport of r1538 from 5.1
  Do not return error in ha_innobase::info if srv_force_recovery >= 4. This is to allow for
  normal processing of the query by MySQL instead of generating an error.
  
  Reviewed by: Heikki

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

  Backport from 5.1 a fix to make this test deterministic


mysql-test/r/rpl_misc_functions.result:
  Backport from 5.1 a fix to make this test deterministic
mysql-test/t/rpl_misc_functions.test:
  Backport from 5.1 a fix to make this test deterministic

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

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

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

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


sql/log.cc:
  Auto merged

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

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

dollin' it up for Guilhem ;) -- test streamlined,
better comments, faster code, add'l assert.


mysql-test/r/binlog.result:
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  streamlined test
mysql-test/t/binlog.test:
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  streamlined test
sql/log.cc:
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  comment clarified

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

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

into  gleb.loc:/home/uchum/work/bk/5.0-opt

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29417


mysql-test/r/type_newdecimal.result:
  Manual merge.
mysql-test/t/type_newdecimal.test:
  Manual merge.

into  gleb.loc:/home/uchum/work/bk/5.0-opt

into  gleb.loc:/home/uchum/work/bk/5.0-opt

An assertion abort could occur for some grouping queries that employed 
decimal user variables with assignments to them.

The problem appeared the constructors of the class Field_new_decimal
because the function my_decimal_length_to_precision did not guarantee
returning decimal precision not greater than DECIMAL_MAX_PRECISION.


mysql-test/r/type_newdecimal.result:
  Added a test case for bug #29417.
mysql-test/t/type_newdecimal.test:
  Added a test case for bug #29417.
sql/field.cc:
  Fixed bug #29417.
  An assertion abort could occur for some grouping queries that employed 
  decimal user variables with assignments to them.
  
  The problem appeared the constructors of the class Field_new_decimal
  because the function my_decimal_length_to_precision did not guarantee
  returning decimal precision not greater than DECIMAL_MAX_PRECISION.
  
  Now if the precision returned by calls to my_decimal_length_to_precision
  in the constructors of the class Field_new_decimal is greater than 
  DECIMAL_MAX_PRECISION the precision is set to this value.

into  gleb.loc:/home/uchum/work/bk/5.0-opt


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Merge with 5.0 (main).

into  gleb.loc:/home/uchum/work/bk/4.1-opt

The cast operation ignored the cases when the precision and/or the scale exceeded
the limits, 65 and 30 respectively. No errors were reported in these cases.
For some queries this may lead to an assertion abort.

Fixed by throwing errors for such cases.


mysql-test/r/type_newdecimal.result:
  Added a test case for bug #29415.
mysql-test/t/type_newdecimal.test:
  Added a test case for bug #29415.

For GCov builds, if the server crashes, the normal exit handler for writing
coverage information is not executed due to the abnormal termination.

Fix this by explicitly calling the __gcov_flush function in our crash handler.

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

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

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

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

into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge