into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime

into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged


client/mysqlbinlog.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged

into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged


client/mysqlbinlog.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged

FK definition.


mysql-test/r/innodb_mysql.result:
  Updated result file.

failing on heavily loaded systems.


mysql-test/t/events_scheduling.test:
  Adding waits before statements since the scheduler is unpredictable
  on loaded systems and might be delayed.

two timestamp fields.
  
The actual problem here was that CREATE TABLE allowed zero
date as a default value for a TIMESTAMP column in NO_ZERO_DATE mode.
  
The thing is that for TIMESTAMP date type specific rule is applied:
  column_name TIMESTAMP == column_name TIMESTAMP DEFAULT 0
whever for any other date data type
  column_name TYPE == column_name TYPE DEFAULT NULL
  
The fix is to raise an error when we're in NO_ZERO_DATE mode and
there is TIMESTAMP column w/o default value.


mysql-test/r/create.result:
  Update result file.
mysql-test/t/create.test:
  Test case for Bug#18834: ALTER TABLE ADD INDEX on table with
  two timestamp fields.
sql/sql_table.cc:
  Report an error if NO_ZERO_MODE is set and we have zero date
  as a default.

mysql-test/suite/rpl/r/rpl_events.result:
  Result change.
mysql-test/suite/rpl/t/rpl_events.test:
  Replacing table with varying contents with a fresh table to avoid
  test problems. The contents of the event is unimportant for this
  part of the test.

BUG#24387, which is closed since long.


sql/mysqld.cc:
  Moving my_thread_end() to before pthread_cond_broadcast() since
  it might cause other threads to start using resources that are
  about to be released, or tries to proceed assuming that the
  resources have already been released.

mysql-test/r/events_scheduling.result:
  Result change.
mysql-test/t/events_scheduling.test:
  Removing a test that only confirms that event scheduling is
  inexact, hence causing sporadic failures on loaded machines.

irrelevant to execute since the charset information does not
affect replication for row-based replication. The row-based
versions of the tests were removed, and the statement-based
version of the test was made executable by all three modes.

This involves removing any lines that causes the test to be
dependent on the contents of the binary log, and instead we
just check that the replication works as it should.


BitKeeper/deleted/.del-rpl_ndb_charset.test:
  Delete: mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test
BitKeeper/deleted/.del-rpl_ndb_charset.result:
  Delete: mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result
BitKeeper/deleted/.del-rpl_row_charset.test:
  Delete: mysql-test/extra/rpl_tests/rpl_row_charset.test
BitKeeper/deleted/.del-rpl_row_charset.test~739be9df1baaee3e:
  Delete: mysql-test/suite/rpl/t/rpl_row_charset.test
BitKeeper/deleted/.del-rpl_row_charset_innodb.test:
  Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb.test
BitKeeper/deleted/.del-rpl_row_charset_innodb-master.opt:
  Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt
BitKeeper/deleted/.del-rpl_row_charset_innodb-slave.opt:
  Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt
BitKeeper/deleted/.del-rpl_row_charset_innodb.result:
  Delete: mysql-test/suite/rpl/r/rpl_row_charset_innodb.result
BitKeeper/deleted/.del-rpl_row_charset.result:
  Delete: mysql-test/suite/rpl/r/rpl_row_charset.result
mysql-test/extra/rpl_tests/rpl_charset.test:
  Test is not dependent on binlog format any more.
  Using --echo instead of "select" to print text.
  Removing lines causing the test to be dependent on binlog contents.
mysql-test/suite/rpl/r/rpl_charset.result:
  Result change.
mysql-test/suite/rpl/t/rpl_charset.test:
  Using renamed version of test file.

behave randomly with mysql_change_user.

The test case had to be moved into not_embedded_server.test file,
because SHOW GLOBAL STATUS does not work properly in embedded
server (see bug 34517).


BitKeeper/deleted/.del-change_user-master.opt:
  Delete: mysql-test/t/change_user-master.opt
mysql-test/r/change_user.result:
  Move test case for Bug#31222 to not_embedded_server.test.
mysql-test/r/not_embedded_server.result:
  Move test case for Bug#31222 to not_embedded_server.test.
mysql-test/t/change_user.test:
  Move test case for Bug#31222 to not_embedded_server.test.
mysql-test/t/not_embedded_server.test:
  Move test case for Bug#31222 to not_embedded_server.test.

mysql-test/r/named_pipe.result:
  Fix result file (windows-specific test).
mysql-test/r/shm.result:
  Fix result file (windows-specific test).

but not collation.

The problem here was that text literals in a view were always
dumped with character set introducer. That lead to loosing
collation information.

The fix is to dump character set introducer only if it was
in the original query. That is now possible because there 
is no problem any more of loss of character set of string
literals in views -- after WL#4052 the view is dumped 
in the original character set.


mysql-test/r/case.result:
  Update result file.
mysql-test/r/compress.result:
  Update result file.
mysql-test/r/ctype_collate.result:
  Update result file.
mysql-test/r/date_formats.result:
  Update result file.
mysql-test/r/ddl_i18n_koi8r.result:
  Update result file.
mysql-test/r/ddl_i18n_utf8.result:
  Update result file.
mysql-test/r/fulltext.result:
  Update result file.
mysql-test/r/func_crypt.result:
  Update result file.
mysql-test/r/func_encrypt.result:
  Update result file.
mysql-test/r/func_if.result:
  Update result file.
mysql-test/r/func_in.result:
  Update result file.
mysql-test/r/func_like.result:
  Update result file.
mysql-test/r/func_regexp.result:
  Update result file.
mysql-test/r/func_set.result:
  Update result file.
mysql-test/r/func_str.result:
  Update result file.
mysql-test/r/func_time.result:
  Update result file.
mysql-test/r/gis.result:
  Update result file.
mysql-test/r/group_min_max.result:
  Update result file.
mysql-test/r/mysqldump.result:
  Update result file.
mysql-test/r/negation_elimination.result:
  Update result file.
mysql-test/r/null.result:
  Update result file.
mysql-test/r/select.result:
  Update result file.
mysql-test/r/show_check.result:
  Update result file.
mysql-test/r/sp-code.result:
  Update result file.
mysql-test/r/ssl.result:
  Update result file.
mysql-test/r/ssl_compress.result:
  Update result file.
mysql-test/r/subselect.result:
  Update result file.
mysql-test/r/temp_table.result:
  Update result file.
mysql-test/r/type_blob.result:
  Update result file.
mysql-test/r/view.result:
  Update result file.
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  Update result file.
mysql-test/suite/rpl/r/rpl_get_lock.result:
  Update result file.
mysql-test/suite/rpl/r/rpl_master_pos_wait.result:
  Update result file.
mysql-test/t/view.test:
  Add a test case for Bug#32538.
sql/item.cc:
  Do not dump character set introducer if it was not specified
  explicitly in the original query.
sql/item.h:
  Add 'cs_specified' property to Item_string.
sql/sql_yacc.yy:
  Set Item_string::cs_specified property to TRUE
  when character set introducer is explicitly specified.

mysql-test/t/change_user-master.opt:
  Force mysqld restarting to reset global statistics (status info).

behave randomly with mysql_change_user.
  
The problem was that global status variables were not updated
in THD::check_user(), so thread statistics were lost after
COM_CHANGE_USER.
  
The fix is to update global status variables with the thread ones
before preparing the thread for new user.


mysql-test/r/change_user.result:
  Update result file.
mysql-test/t/change_user.test:
  Add a test case for Bug#31222: com_% global status counters
  behave randomly with mysql_change_user.
sql/sql_class.cc:
  Update global status variables when we're handling
  COM_CHANGE_USER for a thread.

tree with main.


sql/sql_binlog.cc:
  Adding code to free memory after execution of BINLOG statement.
  It caused a memory leak in the case that the execution failed
  for any reason.
sql/sql_class.cc:
  Since rli_fake is checked for NULL at various occations to mean
  that no rli_fake is assigned, NULL is assigned to rli_fake after
  deleting the instance.

The problem is that AFTER UPDATE triggers will fire only if the
new data is different from the old data on the row. The trigger
should fire regardless of whether there are changes to the data.

The solution is to fire the trigger on UPDATE even if there are
no changes to the value (because the value is the same).


mysql-test/r/trigger.result:
  Add test case result for Bug#23771
mysql-test/t/trigger.test:
  Add test case for Bug#23771
sql/sql_update.cc:
  Move the invocation of the after update trigger so that
  the trigger will fire even if the records are the same.

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

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


configure.in:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_binlog.cc:
  Auto merged

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/rpl_rli.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_binlog.cc:
  Auto merged

mysql-test/suite/rpl_ndb/t/disabled.def:
  Disable sporadically failing test cases.

(originally from Mats)


sql/slave.cc:
  Disabling declaration in non-debug builds.

(originally from Mats)


sql/rpl_rli.cc:
  Adding variable to mark an instance of Relay_log_info as fake.
sql/rpl_rli.h:
  Adding variable to mark an instance of Relay_log_info as fake.
sql/slave.cc:
  Not printing debug information if we are working with a fake
  instance of Relay_log_info. This because the result of calling
  update is nonsense, and trying to print it generates valgrind
  warnings.
sql/sql_binlog.cc:
  Marking newly created instance of Relay_log_info as a fake instance.

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


configure.in:
  Manual merge.

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

because it uses BINLOG statement, which is not supported in embedded mode.
Fix: disable the test in embedded mode.


mysql-test/suite/binlog/t/binlog_base64_flag.test:
  Must disable this test when running embedded, since BINLOG statements
  don't work. This fixes the pushbuild problem on the debx86-b machine on
  https://intranet.mysql.com/secure/pushbuild/showpush.pl?dir=mysql-5.1-new-rpl&order=469

into  dipika.(none):/opt/local/work/mysql-5.1-runtime

Problem: mysqlbinlog does not free memory if an error happens.
Fix: binlog-processing functions do not call exit() anymore. Instead, they
print an error and return an error code. Error codes are propagated all
the way back to main, and all allocated memory is freed on the way.


client/mysqlbinlog.cc:
  - New error handling policy: functions processing binlogs don't just
    exit() anymore. Instead, they print a message and return an error
    status.
  - New policy for the global `mysql' and `glob_description_event': these
    are not passed as parameters anymore. The global pointer is used
    instead.
  - More error situations are detected and reported.
  - Better error messages: the program never terminates with exit status 1
    without explanation any more. Fixed spelling errors. Use consistent
    format of messages (a single line beginning with "ERROR: " or
    "WARNING: " and ending with "." is printed to stderr.)
  - New memory handling: memory is always freed on program termination.
  - Better comments: more functions are explained, doxygen is used, and
    more precise formulations in some existing comments.
mysql-test/suite/binlog/r/binlog_base64_flag.result:
  Result file updated since output format of mysqlbinlog changed while the
  test was disabled.
mysql-test/suite/binlog/t/binlog_killed.test:
  Mysqlbinlog now works as described when the binlog is open. Hence, the
  --force-if-open flag must be passed
mysql-test/suite/binlog/t/binlog_killed_simulate.test:
  Mysqlbinlog now works as described when the binlog is open. Hence, the
  --force-if-open flag must be passed
mysql-test/suite/binlog/t/disabled.def:
  Now that mysqlbinlog cleans up after itself on abnormal termination, we
  can enable this test again.

Disable the test case.


mysql-test/t/disabled.def:
  Disable query_cache_debug.test.

into  dipika.(none):/opt/local/work/mysql-5.1-runtime


configure.in:
  Manual merge.

into  dipika.(none):/opt/local/work/mysql-5.1-runtime


include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/suite/binlog/r/binlog_row_binlog.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

into  dipika.(none):/opt/local/work/mysql-5.0-runtime

simply killed.


sql/log.cc:
  Don't complain if were simply killed.

into  dipika.(none):/opt/local/work/mysql-5.1-runtime