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

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean

into  five.local.lan:/work/trees/mysql-5.0-build-src-clean

into  five.local.lan:/work/merge/mysql-5.1-funcs_1

"funcs_1" data load

into  five.local.lan:/work/trees/mysql-5.0-build-src-clean

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean

into  five.local.lan:/work/trees/mysql-5.0-build-src-clean

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

   ChangeSet@1.2583, 2008-03-31
   Merge five.local.lan:/work/merge/mysql-5.0-Bug
   into  five.local.lan:/work/merge/mysql-5.1-Bug
   Addditional manual fixes will be needed.
   MERGE: 1.1810.3667.16

   Which contains
      ChangeSet@1.1810.3667.16, 2008-03-31
      Fix for Bug
        #35335 funcs_1: Some tests fail within load_file during
                        pushbuild runs
   ...

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge

into  five.local.lan:/work/merge/mysql-5.1-Bug
Addditional manual fixes will be needed.

  Made Federated and Cluster optional

   Bug#35335 funcs_1: Some tests fail within load_file during
                      pushbuild runs
   Solution: 1. Move files with input data used in load_file, 
                load data etc. 
                from suite/funcs_1/<whatever>
                to std_data
             2. Use for testsuite funcs_1 the server option
                --secure-file-priv=<MYSQLTEST_VARDIR>
             3. Outfiles have to be stored under MYSQLTEST_VARDIR 
+ changes according to WL#4304 Cleanup in funcs_1 tests
  - backport of fixes/improvements made in 5.1 to 5.0
    The differences between scripts in 5.0 and 5.1 cause
    much additional and annoying work during any upmerge.
  - replace error numbers with names
  - improved comments
  - improved formatting
  - Unify storage engine names so that result files for
    storage engine variants do not differ (some tests)
  - remove a script no more used (tests are done in other scripts)

  Disabled 'rpl_redirect', failure is sporadic and and the test is superfluous
rpl_packet.test, rpl_packet.result:
  Removing race conditions from rpl_packet causing test to fail

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge

into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam

into  mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl

tables is not zero any more. For row-based logging, there is an extra commit
for sending rows changed by the statement to the binary log.

into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge

into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam

into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam

into  amd64.(none):/src/bug26243/my51-bug26243

into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl

If a binlog file is manually replaced with a namesake directory the internal purging did
not handle the error of deleting the file so that eventually
a post-execution guards fires an assert.

Fixed with reusing a snippet of code for bug@18199 to tolerate lack of the file but no other error 
at an attempt to delete it.
The same applied to the index file deletion.

The cset carries pieces of manual merging.

into  macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam