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.

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.

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.

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

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

mysql-test/extra/binlog_tests/binlog.test:
  Manual merge of binlog test case for Bug#33798
mysql-test/suite/binlog/r/binlog_row_binlog.result:
  Add test case result for Bug#33798
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
  Add test case result for Bug#33798
sql/item.cc:
  Use new method which accepts a unsigned flag.

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


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Manual merge.
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
  Manual merge.

The unsignedness of large integer user variables was not being
properly preserved when feeded to prepared statements. This was
happening because the unsigned flags wasn't being updated when
converting the user variable is converted to a parameter.

The solution is to copy the unsigned flag when converting the
user variable to a parameter and take the unsigned flag into
account when converting the integer to a string.


mysql-test/r/binlog.result:
  Add test case result for Bug#33798
mysql-test/r/ps.result:
  Add test case result for Bug#33798
mysql-test/t/binlog.test:
  Add test case for Bug#33798
mysql-test/t/ps.test:
  Add test case for Bug#33798
sql/item.cc:
  Take the unsigned flag into account when converting the
  user variable.

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

table.

On crashes generate a user-friendly resolved and demangled stack
trace when libc provides the necessary functions (newer libc on i386,
x86_64, powerpc, ia64, alpha and s390). Otherwise print a numeric
stack trace as before, relying on resolve_stack_dump utility.


configure.in:
  Add check for backtrace headers, backtrace functions and if
  __cxa_demangle (libstdc++) is available at link time.
sql/mysqld.cc:
  Print the value of the THD::killed variable when dumping. In
  some circumstances knowing if the thread was killed makes
  debugging easier.
sql/stacktrace.c:
  Use the glibc backtrace function when available and demangle
  C++ function names if the __cxa_demangle function is available.
sql/stacktrace.h:
  Locally export and wrap in C linkage the C++ function __cxa_demangle
  if available.

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


client/mysqltest.c:
  Auto merged

Documented Table_map_log_event and packed integer format. Improved
other documentation. No change outside comments.


sql/log_event.h:
  Documented Table_map_log_event and packed integer format. Improved
  other documentation. No change outside comments.