into  trift2.:/MySQL/M51/push-5.1

Disabling debug printouts for valgrind builds that print unallocated memory.


sql/sql_binlog.cc:
  Disabling debug printouts for valgrind builds that print unallocated memory

Removing valgrind memory checks from code.


sql/log_event.cc:
  Removing valgrind memory checks from code.

Patch to fix valgrind warning that uninitialized bytes were written. 
The warning was caused by set_default(), which assumes that the field pointer is pointing
into record[0], while all other functions honors the move_field_offset().


sql/log_event.cc:
  Changing unpack_row() to always unpack into table->record[0] since the Field class hierarchy
  contain too many dependencies on the record to operate on being in table->record[0].
  Changing code to use the new unpack_row(), which requires some juggling of records in
  one case.

into  romeo.(none):/home/bk/memcheck-mysql-5.1

Removing DBUG_DUMP printouts for valgrind builds since they trigger warnings.
Removing valgrind memory checks completely.
Removing bzero() of record when opening table that was added earlier.


sql/log_event.cc:
  Removing DBUG_DUMP of records for valgrind builds since they trigger false valgrind
  warnings.
  Removing valgrind checks completely, since they can trigger false valgrind warnings.
sql/sql_class.cc:
  Removing DBUG_DUMP of records for valgrind builds since they trigger false valgrind
  warnings.
sql/table.cc:
  Removing extreneous bzero() that were added previously.

into  romeo.(none):/home/bk/memcheck-mysql-5.1

Fix to correct behaviour of find_and_fetch_row() for tables that have primary keys stored
in storage engines that support the fast method to fetch rows given a primary key. The
method uses position() to retrieve the key for a given record and rnd_pos() to position
the internal "cursor" at the row. Rnd_pos() returns the found record in table->record[0],
so the record has to be moved to table->record[1] for further processing after calling
find_and_fetch_row().


sql/log_event.cc:
  Adding code to one exit branch of find_and_fetch_row() to move output record from
  table->record[0] to table->record[1].
  Adding function to do valgrind memory check.
  Adding valgrind memory checks to check that records are defined when they should be.
  Adding Doxygen comment to find_and_fetch_row() with pre- and post-conditions.

into  amd64.:D:/src/mysql-5.1_bug23983

- When a shared library argument is supplied, it's checked for an OS
specific directory separator. The expected error is different
depending on the separator used. Create OS specific versions of these
tests.


mysql-test/r/ps.result:
  Bug#23983 ps.test fails to open shared library
  - Moving to OS specific results.
mysql-test/r/windows.result:
  Bug#23983 ps.test fails to open shared library
  - OS Specific result for shared library argument with path
mysql-test/t/ps.test:
  Bug#23983 ps.test fails to open shared library
  - Moving to OS specific tests.
mysql-test/t/windows.test:
  Bug#23983 ps.test fails to open shared library
  - OS Specific test for shared library argument with path
mysql-test/r/ps_not_windows.result:
  Bug#23983 ps.test fails to open shared library
  - OS Specific result for shared library argument with path
mysql-test/t/ps_not_windows.test:
  Bug#23983 ps.test fails to open shared library
  - OS Specific test for shared library argument with path

  - Disconnect from transporter before starting to delete objects


storage/ndb/src/ndbapi/Ndbinit.cpp:
  Make sure to disconnect from transporter to stop signals from coming in
  before starting to delete the objects that would recieve the signals

  
  open_table_from_share did not initialize table->record members. that was
  interpreted as the error by valgrind.
  
  Fixed with bzero-ing the members if compilation with -DHAVE_purify.


sql/table.cc:
  zeroing memory allocated for table->record[]

into  trift2.:/MySQL/M51/push-5.1


extra/yassl/yassl.vcproj:
  Auto merged

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

"mySTL" has become a subdirectory of "taocrypt", was a sibling previously.


extra/yassl/taocrypt/benchmark/benchmark.dsp:
  "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
extra/yassl/taocrypt/taocrypt.dsp:
  "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
extra/yassl/taocrypt/taocrypt.vcproj:
  "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
extra/yassl/taocrypt/test.dsp:
  "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
extra/yassl/testsuite/testsuite.dsp:
  "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
extra/yassl/yassl.dsp:
  "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
extra/yassl/yassl.vcproj:
  "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.

into  trift2.:/MySQL/M51/push-5.1

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

into  trift2.:/MySQL/M41/push-4.1

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

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/bug22081-5.1


support-files/mysql.spec.sh:
  SCCS merged

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

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


support-files/mysql.spec.sh:
  Manual merge, bug#22081.

support-files/mysql.spec.sh:
  Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) replace 
  "mysql-shared" (as distributed by SuSE) to allow easy upgrading (bug#22081).

into  trift2.:/MySQL/M51/bug22081-5.1

into  romeo.(none):/home/bk/memcheck-mysql-5.1


sql/sql_class.cc:
  Auto merged

into  trift2.:/MySQL/M51/spec-mtr-5.1


support-files/mysql.spec.sh:
  Null-merge, as the 5.1 version already calls "mysql-test-run"
  and uses "report features".

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

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

into  trift2.:/MySQL/M50/spec-mtr-5.0


support-files/mysql.spec.sh:
  Use "report features" (manual merge).

support-files/mysql.spec.sh:
  Switch from "make test*" to explicit calls of the test suite, so that "report features" can be used.

Adding class to handle temporary allocate of memory during write of rows.
Eliminating cut'n-paste error between THD::binlog_{write,update,delete}_row().


sql/sql_class.cc:
  Adding class to handle temporary allocate of memory during write of rows.
  Eliminating cut'n-paste error between THD::binlog_{write,update,delete}_row().

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
configure.in:
  Manual merge, main clone 5.0->5.1

into  mysql.com:/home/bk/MERGE/mysql-5.0-merge

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge

into  mysql.com:/home/bk/MERGE/mysql-5.0-merge

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge

into  mysql.com:/home/bk/MERGE/mysql-5.0-merge