into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam

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

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam

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

into  noir.wlan.koehntopp.de:/misc/mysql/3/51-3

temporary mass-disable of affected tests

  
 "Apply InnoDB snapshot innodb-5.1-ss2438.

  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 crash
  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  magare.gmz:/home/kgeorge/mysql/work/win64-warn-5.1-bugteam

into  host.loc:/work/bk/5.1-bugteam

  max_heap_table_size_basic_32, query_cache_size_basic_32 and 
  tmp_table_size_basic_32 tests have been disabled according to
  bug #36522.

subselects into account
  
It is forbidden to use the SELECT INTO construction inside UNION statements
unless on the last SELECT of the union. The parser records whether it 
has seen INTO or not when parsing a UNION statement. But if the INTO was
legally used in an outer query, an error is thrown if UNION is seen in a
subquery. Fixed in 5.0 by remembering the nesting level of INTO tokens and 
mitigate the error unless it collides with the UNION.

  Post-push test case update (bug #30059).

FLUSH STATUS doesn't clear the values of the global status variables.
The test case is reduced to testing session local Com-variables until
FLUSH GLOBAL STATUS is implemented.

into  mysql.com:/home/kent/bk/mysql-5.1

into  mysql.com:/home/kent/bk/mysql-5.0-release-merge

into  magare.gmz:/home/kgeorge/mysql/work/win64-warn-5.1-bugteam

into  host.loc:/work/bk/5.1-bugteam

into  host.loc:/work/bk/5.1-bugteam

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

Fixed build failure depending on events in embedded build.

into  host.loc:/work/bk/5.1-bugteam

into  host.loc:/work/bk/5.0-bugteam

into  host.loc:/work/bk/5.1-bugteam

into  host.loc:/work/bk/5.1-bugteam

into  host.loc:/work/bk/5.0-bugteam

into  magare.gmz:/home/kgeorge/mysql/work/fixes-5.1-bugteam

The REPAIR TABLE ... USE_FRM query silently corrupts data of tables
with old .FRM file version.
The mysql_upgrade client program or the REPAIR TABLE query (without
the USE_FRM clause) can't prevent this trouble, because in the
common case they don't upgrade .FRM file to compatible structure.

1. Evaluation of the REPAIR TABLE ... USE_FRM query has been
   modified to reject such tables with the message:
   "Failed repairing incompatible .FRM file".

2. REPAIR TABLE query (without USE_FRM clause) evaluation has been
   modified to upgrade .FRM files to current version.

3. CHECK TABLE ... FOR UPGRADE query evaluation has been modified
   to return error status when .FRM file has incompatible version.

4. mysql_upgrade and mysqlcheck client programs call CHECK TABLE
   FOR UPGRADE and REPAIR TABLE queries, so their behaviors have
   been changed too to upgrade .FRM files with incompatible
   version numbers.

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.