into  hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/merge-mysql-5.1-new-rpl


sql/sql_string.cc:
  Auto merged
BitKeeper/deleted/.del-compile-solaris-amd64:
  Auto merged
sql/sql_view.cc:
  Manual merged

into  hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/5.1

into  hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/5.0

mysql-test/suite/rpl/r/rpl_start_stop_slave.result:
  updated result
mysql-test/suite/rpl/t/rpl_critical_errors.test:
  replace --sleep
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
  replace --sleep
mysql-test/suite/rpl/t/rpl_init_slave.test:
  remove --sleep
mysql-test/suite/rpl/t/rpl_insert.test:
  replace --sleep
mysql-test/suite/rpl/t/rpl_loadfile.test:
  replace --sleep
mysql-test/suite/rpl/t/rpl_row_sp001.test:
  replace --sleep
mysql-test/suite/rpl/t/rpl_row_sp005.test:
  replace --sleep
mysql-test/suite/rpl/t/rpl_row_stop_middle.test:
  replace --sleep
mysql-test/suite/rpl/t/rpl_row_trig001.test:
  replace --sleep
mysql-test/suite/rpl/t/rpl_row_trig003.test:
  replace --sleep
mysql-test/suite/rpl/t/rpl_ssl1.test:
  replace --sleep
mysql-test/suite/rpl/t/rpl_start_stop_slave.test:
  replace --sleep
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
  replace --sleep
mysql-test/suite/rpl/t/rpl_temporary.test:
  replace --sleep

  Fixing a wrong comment.


sql/sql_string.cc:
  Fixing a wrong comment.

When executing drop view statement on the master, the statement is not written into bin-log if any error occurs, this could cause master slave inconsistence if any view has been dropped. 

If some error occured and no view has been dropped, don't bin-log the statement, if at least one view has been dropped the query is bin-logged possible with an error.


sql/sql_view.cc:
  If at least one view has been dropped the query is bin-logged possible with an error.
mysql-test/suite/rpl/r/rpl_drop_view.result:
  Add test result for bug#30998
mysql-test/suite/rpl/t/rpl_drop_view.test:
  Add test case for bug#30998

  
When executing drop view statement on the master, the statement is written
into bin-log without checking for possible errors, so the statement would 
always be bin-logged with error code cleared even if some error might occur, 
for example, some of the views being dropped does not exist. This would cause 
failure on the slave.

Writing bin-log after check for errors, if at least one view has been dropped
the query is bin-logged possible with an error.


sql/sql_view.cc:
  Writing bin-log after check for errors, if at least one view has been dropped
  the query is bin-logged possible with an error.
mysql-test/r/rpl_drop_view.result:
  Add test result for bug#30998
mysql-test/t/rpl_drop_view.test:
  Add test for bug#30998

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


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
sql/log_event.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/lib/mtr_cases.pl:
  Manual merge, using remote code.

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

mysql-test/suite/ndb/t/disabled.def:
  Disabling failing tests.
mysql-test/suite/rpl/t/disabled.def:
  Disabling failing tests.
mysql-test/suite/rpl/t/rpl_ssl.test:
  Disabling part of test that fails.

uses for connect_timeout

 - Additional patch to fix compiler warnings


client/mysql.cc:
  Initialize warnings to 0 to avid compiler warning
  Call 'print_warnings' also when error occured
mysql-test/r/mysql.result:
  Change test to make is possible to see that second set of warnings
  are from second invocation of mysql
mysql-test/t/mysql.test:
  Change test to make is possible to see that second set of warnings
  are from second invocation of mysql

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl-merge

slave's error log when running rpl_extraColmaster_*.test 

of lib/ that should be included

mysql-test/suite/rpl_ndb/t/disabled.def:
  Disabling failing test.

WL#3949, Added the optimization of rpl tests if mtr started w/o a combination and --mysqld=--binlog-format=XXX


mysql-test/lib/mtr_cases.pl:
  Added the optimization of rpl tests

mysql-test/Makefile.am:
  Add mysql-test/include/*.sql to dist
scripts/make_binary_distribution.sh:
  Add mysql-test/include/*.sql to bindist

in optimization phase
- Don't check specified binlog format if hasn't been assigned one

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-rpl-wl3949

into  kindahl-laptop.dnsalias.net:/home/bk/b32580-mysql-5.1-rpl

The client program 'mysqlbinlog' crashed when trying to print a User_var_log_event holding
a floating-point value since the format specifier for my_b_printf() does not support
floating-point format specifiers.

This patch prints the floating-point number to an internal buffer, and then writes
that buffer to the output instead.


mysql-test/r/mysqlbinlog.result:
  Result file change.
mysql-test/t/mysqlbinlog.test:
  Adding test that mysqlbinlog can write and read back User_var_log_event
  for real, decimal, integer, and string. These are the only types supported
  for user variables.
sql/log_event.cc:
  Using my_sprintf() to print floating-point value of User_var_log_event value to a
  character buffer and then to the real output, since my_b_printf() does not
  support floating-point format. Also adding macro to give buffer size needed 
  for printing floating-point numbers in %g format.

- Reorganize collect a little to make it easier to apply optimizations
  and settings to collected test cases.
- Add suite/rpl/combination file
- Rename include/set_binlog_format_x.inc to .sql since thay are run by "mysql"
 


mysql-test/include/set_binlog_format_mixed.sql:
  Rename: mysql-test/include/set_binlog_format_mixed.inc -> mysql-test/include/set_binlog_format_mixed.sql
mysql-test/include/set_binlog_format_row.sql:
  Rename: mysql-test/include/set_binlog_format_row.inc -> mysql-test/include/set_binlog_format_row.sql
mysql-test/include/set_binlog_format_statement.sql:
  Rename: mysql-test/include/set_binlog_format_statement.inc -> mysql-test/include/set_binlog_format_statement.sql
mysql-test/lib/mtr_cases.pl:
  Reorganize code to
   - collect a suite
   - multiply the tests in the suite with any combinations the suite has
   - optimize the suite by skipping test not supported with current settings
  Use My::Config to read combinations file in my.cnf file format, this
  allowas a "short name" to be used for the combination instead of
  the full name wich is set to the extra arguments the combination applies
  Add function 'print_testcase' that can be used to print the testcases
  during different stages of the collect phase
mysql-test/lib/mtr_report.pl:
  Print <testname> '<combination>' if combination is set
mysql-test/mysql-test-run.pl:
  Add comments, fix indentation
  Rename .in to .sql files
  Only set binlog format dynamicall for master, slav is always restarted
mysql-test/lib/My/Config.pm:
  New BitKeeper file ``mysql-test/lib/My/Config.pm''
mysql-test/suite/rpl/combinations:
  New BitKeeper file ``mysql-test/suite/rpl/combinations''

mysql-test/r/innodb.result:
  Result change.
mysql-test/suite/rpl/r/rpl_binlog_grant.result:
  Result change.
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
  Result change.
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
  Result change.
mysql-test/suite/rpl/t/disabled.def:
  Enabling some tests.
mysql-test/suite/rpl/t/rpl_binlog_grant.test:
  Adding missing master-slave.inc, causing previous tests to pollute
  the binary log.
mysql-test/suite/rpl_ndb/t/disabled.def:
  Enabling some tests.

into  capulet.kindahl.net:/home/bk/mysql-5.0-rpl

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

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1

into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl