into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570

master also, so that we can visually see the slave is the same.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570

	slave

The stored-routine code took the contents of the (lowest) parser
and copied it directly to the binlog, which causes problems if there
is a special case of interpretation at the parser level -- which 
there is, in the "/*!VER */" comments.  The trailing "*/" caused
errors on the slave, naturally.

Now, since by that point we have /properly/ created parse-tree (as 
the rest of the server should do!) for the stored-routine CREATE, we
can construct a perfect statement from that information, instead of
writing uncertain information from an unknown parser state.  
Fortunately, there's already a function nearby that does exactly 
that.
---
Update for Bug#36570.  Qualify routine names with db name when
writing to the binlog ONLY if the source text is qualified.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570

	slave

The stored-routine code took the contents of the (lowest) parser
and copied it directly to the binlog, which causes problems if there
is a special case of interpretation at the parser level -- which 
there is, in the "/*!VER */" comments.  The trailing "*/" caused
errors on the slave, naturally.

Now, since by that point we have /properly/ created parse-tree (as 
the rest of the server should do!) for the stored-routine CREATE, we
can construct a perfect statement from that information, instead of
writing uncertain information from an unknown parser state.  
Fortunately, there's already a function nearby that does exactly 
that.

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam

SHOW commands fail in embedded mode because schema_table array doesn't
correspond to enum_schema_tables.

This patch implements a dummy implementation of the abstract fill_table
function to be used when the event scheduler (or other core feature)
isn't part of the build.

 - a 64 bit compile warning in embedded
 - disabled the new (and failing tests for Bug#36522

Addresses the following bugs:

  Change the fix for Bug#32440 to show bytes instead of kilobytes in
  INFORMATION_SCHEMA.TABLES.DATA_FREE.

  branches/5.1: Fix bug#29507 TRUNCATE shows to many rows effected
  In InnoDB, the row count is only a rough estimate used by SQL
  optimization. InnoDB is now return row count 0 for TRUNCATE operation.

  branches/5.1: Fix bug#35537 - Innodb doesn't increment handler_update
  and handler_delete
  Add the calls to ha_statistic_increment() in ha_innobase::delete_row()
  and ha_innobase::update_row().

  Fix Bug#36169 create innodb compressed table with too large row size crashed
  Sometimes it is possible that
  row_drop_table_for_mysql(index->table_name, trx, FALSE); is invoked in
  row_create_index_for_mysql() when the index object is freed so copy the
  table name to a safe place beforehand and use the copy.

  Fix Bug#36434 ha_innodb.so is installed in the wrong directory
  Change pkglib_LTLIBRARIES with pkgplugin_LTLIBRARIES which has been
  forgotten in this commit: http://lists.mysql.com/commits/40206

into  hh-nb.hungers:/work/merge/mysql-5.1-36522

Enable previously disabled test cases which were tested against
the embedded build. The test cases are modified so that they require
non-embedded build.

Missing file: include/is_embedded.inc

This file was left out of the initial changeset by misstake.

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam

The event scheduler was not designed to work in embedded mode. This
patch disables and excludes the event scheduler when the server is
compiled for embedded build.

Remove optimizations on innobase/mem/* to avoid apparent compiler bug which
causes memory overruns.  See also bug 19424, and probably bug 36366.

This is done in 5.1+; 5.0 already has this workaround in place.

test change for 5.1+ (show create view adds two columns in 5.1)

Patch only for 5.1+

into  client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-51-bugteam

into  client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-50-bugteam

Problem was that mysql_create_view did not remove all comments characters
when writing to binlog, resulting in parse error of stmt on slave side.

Solution was to use the recreated select clause
and add a generated CHECK OPTION clause if needed.

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

into  riska.(none):/home/sven/bkroot/5.1-bugteam

Temporarily checking in an incorrect test case. Rationale: the impact of
this bug is negligible (it's almost a feature request). We need 5.1 to be
stable, and making a real fix is a bit risky. So the fix is postponed
to 6.0.

The test suite/rpl/t/rpl_innodb_bug28430.test was disabled because of
BUG#32247, but not re-enabled when BUG#32247 was fixed. I've re-enabled
it. The test and result file needed to be updated too.

- Disable the "prefer full scan on clustered primary key over full scan
  of any secondary key" rule introduced by BUG#35850.
- Update test results accordingly 
(bk trigger: file this for BUG#35850)

has been fixed and closed.

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

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

The problem is that the patch for Bug 33464 didn't update the
results of the test cases which caused the problem.

Dropping a stored routine also revoke privileges for all users
on the stored routine and errors about missing grants are converted
into warnings. Before Bug 33464 such errors could be incorrectly
returned to the user, which would later trigger a assertion due to
multiple errors being set.

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam

into a non-const string pointer.

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

into  noir.wlan.koehntopp.de:/misc/mysql/mysql-5.1-bugteam

We could allocate chunks larger than 4GB, but did our size-accounting in 32-bit
values. This could lead to spurious warnings, inaccurate accounting, and, in
theory, data loss.

Affected: 64-bit platforms. Debug-build (with safemalloc). At least one buffer
larger than 4GB. For potential data loss, a re-alloc on such a buffer would be
necessary.