new test case until the valgrind failure is fixed, 
reported in bug 27564)


mysql-test/t/disabled.def:
  New test case shows valgrind failre

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged

into  mysql.com:/home/psergey/mysql-5.1-merge2


mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
sql/opt_range.cc:
  Auto merged

  After merge fix.


mysql-test/r/insert_update.result:
  After merge fix.
sql/item.cc:
  After merge fix.

into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/subselect3.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/gis.result:
  Manual merge
mysql-test/t/gis.test:
  Manual merge
sql/handler.cc:
  Manual merge
sql/item_sum.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


client/Makefile.am:
  Auto merged
mysql-test/r/rpl_ndb_basic.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged

Pushbuild fixes: 
 - Make MAX_SEL_ARGS smaller (even 16K records_in_range() calls is 
   more than it makes sense to do in typical cases)
 - Don't call sel_arg->test_use_count() if we've already allocated 
   more than MAX_SEL_ARGs elements. The test will succeed but will take
   too much time for the test suite (and not provide much value).


mysql-test/r/range.result:
  BUG#26624: high mem usage (crash) in range optimizer
  Pushbuild fixes: make the test go faster
mysql-test/t/range.test:
  BUG#26624: high mem usage (crash) in range optimizer
  Pushbuild fixes: make the test go faster

into  four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddlx

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged

some build machines during testing.


mysql-test/t/events_scheduling.test:
  This patch alters result file to match the DROP IF EXISTS that was changed
  in the test.

the SELECT in the test to only the expected rows. This helps
eliminate the possibility of spurious rows causing the test to
fail.


mysql-test/r/rpl_events.result:
  This patch modifies the test results to match the new SELECT for test
  results.

into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_kostja

This patch removes the SLAVESIDE_DISABLED token from the event status clause
and adds the ability to mark an event as status = SLAVESIDE_DISABLED by using
the syntax DISABLE ON SLAVE instead.

The patch also adds tests to rpl_events to check the new syntax.


mysql-test/include/rpl_events.inc:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch adds tests to check the SQL syntax change from SLAVESIDE_DISABLED 
  to DISABLE ON SLAVE.
mysql-test/r/rpl_events.result:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch adds the results for the tests to check the SQL syntax change 
  from SLAVESIDE_DISABLED to DISABLE ON SLAVE.
sql/lex.h:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch removes the SLAVESIDE_DISABLED token.
sql/sql_yacc.yy:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch removes the SLAVESIDE_DISABLED token from the event status clause
  and adds the ability to mark an event as status = SLAVESIDE_DISABLED by using
  the syntax DISABLE ON SLAVE instead.

NO_AUTO_VALUE_ON_ZERO mode.

In the NO_AUTO_VALUE_ON_ZERO mode the table->auto_increment_field_not_null
variable is used to indicate that a non-NULL value was specified by the user
for an auto_increment column. When an INSERT .. ON DUPLICATE updates the
auto_increment field this variable is set to true and stays unchanged for the
next insert operation. This makes the next inserted row sometimes wrongly have
0 as the value of the auto_increment field.

Now the fill_record() function resets the table->auto_increment_field_not_null
variable before filling the record.
The table->auto_increment_field_not_null variable is also reset by the
open_table() function for a case if we missed some auto_increment_field_not_null
handling bug.
Now the table->auto_increment_field_not_null is reset at the end of the
mysql_load() function.

Reset the table->auto_increment_field_not_null variable after each
write_row() call in the copy_data_between_tables() function.




sql/field_conv.cc:
  Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
  NO_AUTO_VALUE_ON_ZERO mode.
  A comment is corrected.
sql/handler.cc:
  Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
  NO_AUTO_VALUE_ON_ZERO mode.
  Now the handler::update_auto_increment() function doesn't reset the
  table->auto_increment_field_not_null variable as it is done in the
  fill_record() function.
sql/sql_base.cc:
  Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
  NO_AUTO_VALUE_ON_ZERO mode.
  Now the fill_record() function resets the table->auto_increment_field_not_null
  variable before filling the record.
  The table->auto_increment_field_not_null variable is also reset by the
  open_table() function for a case if we missed some auto_increment_field_not_null
  handling bug.
sql/sql_insert.cc:
  Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the
  NO_AUTO_VALUE_ON_ZERO mode.
  Now the the table->auto_increment_field_not_null is reset at the end of the
  mysql_insert() an in the select_insert class destructor.
sql/sql_load.cc:
  Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the 
  NO_AUTO_VALUE_ON_ZERO mode.
  Now the table->auto_increment_field_not_null is reset at the end of the
  mysql_load() function.
sql/sql_table.cc:
  Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the
  NO_AUTO_VALUE_ON_ZERO mode.
  Reset the table->auto_increment_field_not_null variable after each
  write_row() call in the copy_data_between_tables() function.
sql/table.h:
  Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the
  NO_AUTO_VALUE_ON_ZERO mode.
  A comment added.
mysql-test/r/insert_update.result:
  Added the test case for the bug#23233: 0 as LAST_INSERT_ID() after
  INSERT .. ON DUPLICATE in the NO_AUTO_VALUE_ON_ZERO mode.
mysql-test/t/insert_update.test:
  Added the test case for the bug#23233: 0 as LAST_INSERT_ID() after
  INSERT .. ON DUPLICATE in the NO_AUTO_VALUE_ON_ZERO mode.

into  four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddlx


mysql-test/t/disabled.def:
  Auto merged

into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl

Fixing automerge problem and updating comments referring to exec_event().


mysql-test/r/rpl_incident.result:
  Result change
sql/log_event.cc:
  Renaming exec_event() to do_apply_event().
sql/log_event.h:
  Renaming exec_event() to do_apply_event().
sql/rpl_rli.cc:
  Fixing comments referring to exec_event(), which does not exist any more.
sql/sql_class.h:
  Fixing comments referring to exec_event(), which does not exist any more.

into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl

into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_test

mysql-test/include/rpl_udf.inc:
  Adding a replace on the slave side as well to make test pass on both
  Unix and Windows.
mysql-test/r/rpl_udf.result:
  Result change

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/ha_ndbcluster.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl


mysql-test/r/rpl_udf.result:
  Manual merge.

- Eliminating some compiler warnings


mysql-test/extra/binlog_tests/blackhole.test:
  Using include file for SHOW BINLOG EVENTS.
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Using include file for SHOW BINLOG EVENTS.
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Using include file for SHOW BINLOG EVENTS.
mysql-test/extra/rpl_tests/rpl_log.test:
  Using include file for SHOW BINLOG EVENTS.
mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
  Using include file for SHOW BINLOG EVENTS.
mysql-test/extra/rpl_tests/rpl_truncate_helper.test:
  Using include file for SHOW BINLOG EVENTS.
mysql-test/include/show_binlog_events.inc:
  Fixing regex replace to handle XIDs as well.
mysql-test/r/binlog_row_binlog.result:
  Result change
mysql-test/r/binlog_row_blackhole.result:
  Result change
mysql-test/r/binlog_row_ctype_ucs.result:
  Result change
mysql-test/r/binlog_row_drop_tmp_tbl.result:
  Result change
mysql-test/r/binlog_row_insert_select.result:
  Result change
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Result change
mysql-test/r/binlog_stm_binlog.result:
  Result change
mysql-test/r/binlog_stm_blackhole.result:
  Result change
mysql-test/r/binlog_stm_drop_tmp_tbl.result:
  Result change
mysql-test/r/binlog_stm_insert_select.result:
  Result change
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Result change
mysql-test/r/ctype_cp932_binlog_row.result:
  Result change
mysql-test/r/rpl_ndb_charset.result:
  Result change
mysql-test/r/rpl_ndb_log.result:
  Result change
mysql-test/r/rpl_ndb_multi.result:
  Result change
mysql-test/r/rpl_row_basic_11bugs.result:
  Result change
mysql-test/r/rpl_row_charset.result:
  Result change
mysql-test/r/rpl_row_create_table.result:
  Result change
mysql-test/r/rpl_row_delayed_ins.result:
  Result change
mysql-test/r/rpl_row_drop.result:
  Result change
mysql-test/r/rpl_row_flsh_tbls.result:
  Result change
mysql-test/r/rpl_row_inexist_tbl.result:
  Result change
mysql-test/r/rpl_row_log.result:
  Result change
mysql-test/r/rpl_row_log_innodb.result:
  Result change
mysql-test/r/rpl_row_reset_slave.result:
  Result change
mysql-test/r/rpl_row_until.result:
  Result change
mysql-test/r/rpl_stm_log.result:
  Result change
mysql-test/r/rpl_truncate_2myisam.result:
  Result change
mysql-test/r/rpl_truncate_3innodb.result:
  Result change
mysql-test/r/rpl_udf.result:
  Result change
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  Fixing binary log position
mysql-test/t/binlog_stm_mix_innodb_myisam.test:
  Fixing binary log position.
sql/log_event.cc:
  Eliminating compiler warnings.

into  mysql.com:/home/bar/mysql-5.1.test


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

into  mysql.com:/home/bar/mysql-5.0.b22638

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.1-axmrg


include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged
mysys/my_thr_init.c:
  Manual merge

into  romeo.(none):/home/bkroot/mysql-5.1-rpl