Problem: "Under high load, the slave registering to the master can timeout 
during the COM_REGISTER_SLAVE execution. This causes an error, which 
prevents the slave from connecting at all."

Fix: Do not abort immediately, but retry registering on master.


sql/slave.cc:
  Fix for bug #19328: Slave timeout with COM_REGISTER_SLAVE error causing stop
    - retry connecting after a failed slave registration on master.
      Reconnecting has been factored out (see try_to_reconnect() and 
      check_io_slave_killed()) to get rid of similar code used during 
      registering on master/dump requesting/event reading.
      All messages have been moved to reconnect_messages[] array 
      for easy usage and maintenance.
    - now one can force slave to reconnect using 
      ./mtr --mysqld=--loose-debug=d,FORCE_SLAVE_TO_RECONNECT_{REG, DUMP, EVENT}

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


sql/log.cc:
  manual merge

windows fixies

Windows fixies

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


mysql-test/lib/mtr_process.pl:
  Auto merged

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

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

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


mysql-test/extra/binlog_tests/binlog.test:
  manual merge WTF??
mysql-test/r/binlog_stm_binlog.result:
  manual merge
sql/log.cc:
  manual merge

windows fixies

windows fixies

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_process.pl:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_process.pl:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/bug18415/my51-bug18415


mysql-test/lib/mtr_process.pl:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


sql/mysqld.cc:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

into  mysql.com:/home/ram/work/b29079/b29079.5.0
---
Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB

fix binlog-writing so that end_log_pos is given correctly even
within transactions for both SHOW BINLOG and SHOW MASTER STATUS,
that is as absolute values (from log start) rather than relative
values (from transaction's start).
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
---
Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB

end_log_pos data within a transaction are relative to
the start of the transaction rather than absolute.
we fix those groups in situ before writing the log out.

additional comments and handling for groups with very
large single events, as suggested by Guilhem.
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  amd64.(none):/src/bug24732/my50-bug24732
---
Merge maint1.mysql.com:/data/localhome/tsmith/bk/50
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
---
Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
 
end_log_pos data within a transaction are relative to
the start of the transaction rather than absolute.
we fix those groups in situ before writing the log out.
 
additional comments and handling for groups with very
large single events, as suggested by Guilhem.
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
---
Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540


mysql-test/r/rpl_truncate_7ndb.result:
  Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  fix output for SHOW BINLOG EVENTS so that end_log_pos is given correctly
  even within transactions. do this by rewriting the commit-buffer in place.
  ---
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  end_log_pos data within a transaction are relative to
  the start of the transaction rather than absolute.
  we fix those groups in situ before writing the log out.
  
  additional comments and handling for groups with very
  large single events, as suggested by Guilhem.
  ---
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
   
  end_log_pos data within a transaction are relative to
  the start of the transaction rather than absolute.
  we fix those groups in situ before writing the log out.
   
  additional comments and handling for groups with very
  large single events, as suggested by Guilhem.
  ---
  manual merge
sql/log.cc:
  Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  show that output for SHOW BINLOG EVENTS is no correct
  even within transactions.

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

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50

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

into  amd64.(none):/src/bug24732/my50-bug24732

- Post Merge Fixup

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


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged

- Corrected manifest attributes.


CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Use correct value for 64 built binaries.
win/create_manifest.js:
  Bug#24732 Executables do not include Vista manifests
  - Remove type attribute as the only valid value is win32.
win/mysql_manifest.cmake:
  Bug#24732 Executables do not include Vista manifests
  - Remove type attribute.

 - Fix faulty merge by adding back the 'pthread_kill' call that
 wakes up the select thread


sql/mysqld.cc:
  Wake up the select thread from 'close_connections', caused by 
  faulty merge

into  pilot.(none):/data/msvensson/mysql/bug25657/my51-bug25657


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge 5.0->5.1

 - Various fixes for running mysql-test-run.pl on ActiveState perl
   for windows. Reading it's source in win32/win32.c helps...


mysql-test/lib/mtr_process.pl:
  Use "real_pid" when killing the process on ActiveState perl for windows
  Wait blocking for the pseudo pid to exit.
  Change "sleep_until_file_created" to return 1 when pidfile has been
  created - this should avoid early wakeup if $pid was 0
mysql-test/lib/mtr_timer.pl:
  Wake timer process with signal 15 to avoid to avoid resource leak
  on ActiveState perl for windows.
  Install signal handler in timer process to  exit gracefully
mysql-test/mysql-test-run.pl:
  Read "real_pid" of process from pid_file - to be used when killing the
  process on ActiveState perl
  Drop the --console option to mysqld
  Pass "real_pid" to mtr_check_stop_server so it can select to use it
  Correct two argument declarations

into  pilot.(none):/data/msvensson/mysql/bug25657/my50-bug25657-new2

end_log_pos data within a transaction are relative to
the start of the transaction rather than absolute.
we fix those groups in situ before writing the log out.

additional comments and handling for groups with very
large single events, as suggested by Guilhem.

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

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

fix binlog-writing so that end_log_pos is given correctly even
within transactions for both SHOW BINLOG and SHOW MASTER STATUS,
that is as absolute values (from log start) rather than relative
values (from transaction's start).
---
Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540


mysql-test/extra/binlog_tests/binlog.test:
  Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  show that end_log_pos in SHOW BINLOG EVENTS is correct even in transactions.
  show that SHOW MASTER STATUS returns correct values while in transactions
  (so that mysqldump --master-data will work correctly).
  also remove bdb dependency.
  
  manual merge
mysql-test/r/binlog_stm_binlog.result:
  Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  show that end_log_pos in SHOW BINLOG EVENTS is correct even in transactions.
  show that SHOW MASTER STATUS returns correct values while in transactions
  (so that mysqldump --master-data will work correctly).
  also remove bdb dependency.
  
  manual merge
sql/log.cc:
  Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  fix output for SHOW BINLOG EVENTS so that end_log_pos is given correctly
  even within transactions. do this by rewriting the commit-buffer in place.
  
  manual merge

fix binlog-writing so that end_log_pos is given correctly even
within transactions for both SHOW BINLOG and SHOW MASTER STATUS,
that is as absolute values (from log start) rather than relative
values (from transaction's start).
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540


mysql-test/r/binlog.result:
  Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  show that end_log_pos in SHOW BINLOG EVENTS is correct even in transactions.
  show that SHOW MASTER STATUS returns correct values while in transactions
  (so that mysqldump --master-data will work correctly).
  also remove bdb dependency.
  ---
  manual merge
mysql-test/t/binlog.test:
  Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  show that end_log_pos in SHOW BINLOG EVENTS is correct even in transactions.
  show that SHOW MASTER STATUS returns correct values while in transactions
  (so that mysqldump --master-data will work correctly).
  also remove bdb dependency.
sql/log.cc:
  Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  fix output for SHOW BINLOG EVENTS so that end_log_pos is given correctly
  even within transactions. do this by rewriting the commit-buffer in place.

into  mysql.com:/home/hf/work/27084/my51-27084


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_partition.h:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/partition.result:
  merging
mysql-test/t/partition.test:
  merging
sql/sql_partition.cc:
  SCCS merged

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

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

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

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