Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)

  ------------------------------------------------------------
  revno: 3092.5.1
  committer: Luis Soares <luis.soares@sun.com>
  branch nick: mysql-5.1-bugteam
  timestamp: Thu 2009-09-24 15:52:52 +0100
  message:
    BUG#42829: binlogging enabled for all schemas regardless of
    binlog-db-db / binlog-ignore-db
          
    InnoDB will return an error if statement based replication is used
    along with transaction isolation level READ-COMMITTED (or weaker),
    even if the statement in question is filtered out according to the
    binlog-do-db rules set. In this case, an error should not be printed.
          
    This patch addresses this issue by extending the existing check in
    external_lock to take into account the filter rules before deciding to
    print an error. Furthermore, it also changes decide_logging_format to
    take into consideration whether the statement is filtered out from 
    binlog before decision is made.
  added:
    mysql-test/suite/binlog/r/binlog_stm_do_db.result
    mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
    mysql-test/suite/binlog/t/binlog_stm_do_db.test
  modified:
    sql/sql_base.cc
    sql/sql_class.cc
    storage/innobase/handler/ha_innodb.cc
    storage/innobase/handler/ha_innodb.h
    storage/innodb_plugin/handler/ha_innodb.cc
    storage/innodb_plugin/handler/ha_innodb.h

after several selects on a large DB

During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.

This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).

This patch has been extensively tested by MySQL support.

Approved by: Marko
rb://196

White space fixup.

Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)

  ------------------------------------------------------------
  revno: 2911.5.5
  committer: Vladislav Vaintroub <vvaintroub@mysql.com>
  branch nick: 5.1-innodb_plugin
  timestamp: Wed 2009-06-10 10:59:49 +0200
  message:
    Backport WL#3653 to 5.1 to enable bundled innodb plugin.
    Remove custom DLL loader code from innodb plugin code, use 
    symbols exported from mysqld.
  removed:
    storage/innodb_plugin/handler/handler0vars.h
    storage/innodb_plugin/handler/win_delay_loader.cc
  added:
    storage/mysql_storage_engine.cmake
    win/create_def_file.js
  modified:
    CMakeLists.txt
    include/m_ctype.h
    include/my_global.h
    include/my_sys.h
    include/mysql/plugin.h
    libmysqld/CMakeLists.txt
    mysql-test/mysql-test-run.pl
    mysql-test/t/plugin.test
    mysql-test/t/plugin_load-master.opt
    mysys/charset.c
    sql/CMakeLists.txt
    sql/handler.h
    sql/mysql_priv.h
    sql/mysqld.cc
    sql/sql_class.cc
    sql/sql_class.h
    sql/sql_list.h
    sql/sql_profile.h
    storage/Makefile.am
    storage/archive/CMakeLists.txt
    storage/blackhole/CMakeLists.txt
    storage/csv/CMakeLists.txt
    storage/example/CMakeLists.txt
    storage/federated/CMakeLists.txt
    storage/heap/CMakeLists.txt
    storage/innobase/CMakeLists.txt
    storage/innobase/handler/ha_innodb.cc
    storage/innodb_plugin/CMakeLists.txt
    storage/innodb_plugin/handler/ha_innodb.cc
    storage/innodb_plugin/handler/handler0alter.cc
    storage/innodb_plugin/handler/i_s.cc
    storage/innodb_plugin/plug.in
    storage/myisam/CMakeLists.txt
    storage/myisammrg/CMakeLists.txt
    win/Makefile.am
    win/configure.js

Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.

  ------------------------------------------------------------------------
  r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines

  branches/zip: innobase_convert_identifier(): Convert table names with
  explain_filename() to address Bug #32430: 'show innodb status'
  causes errors Invalid (old?) table or database name in logs.

  rb://134 approved by Sunny Bains
  ------------------------------------------------------------------------

innobase_print_identifier(): Replace with innobase_convert_name().

innobase_convert_identifier(): New function, called by innobase_convert_name().

Revert a change to Makefile.am that sneaked unnoticed in c6127.

Backport c6121 from branches/zip:

  ------------------------------------------------------------------------
  r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
  Changed paths:
     M /branches/zip/mysql-test/innodb-autoinc.result
  
  branches/zip: This test has been problematic for sometime now. The underlying
  bug is that the data dictionaries get out of sync. In the AUTOINC code we
  try and apply salve to the symptoms. In the past MySQL made some unrelated
  change and the dictionaries stopped getting out of sync and this test started
  to fail. Now, it seems they have reverted that changed and the test is
  passing again. I suspect this is not he last time that this test will change.
  
  ------------------------------------------------------------------------

White-space fixup.

the shared memory, reset memory pointer ptr to NULL, and
allocate memory from conventional pool. This is a port
from branches/zip.
Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect
rb://198  Approved by: Marko

for push_warning_printf() call in innodb.
Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)

rb://170 approved by Marko.

Fix typo.

table when MySQL does a CREATE INDEX ON T. This is required because MySQL
does a table copy, rename and drops the old table.
Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb
rb://168

the test results too.
rb://164

next value to store in dict_table_t. Setting autoincrement columns top negative
values is undefined behavior and this change should bring the behavior of
InnoDB closer to what users expect. Added several tests to check.
rb://162

Binary BLOB in ha_innobase::store_key_val_for_row(), since the
Geometry data is stored as Binary BLOB in Innodb.

Review: rb://180 approved by Marko Makela.

Fix Bug#38996 Race condition in ANALYZE TABLE

by serializing ANALYZE TABLE inside InnoDB.

Approved by:	Heikki (rb://175)

For embedded server, MySQL may pass in full path, which is
currently disallowed. It is needed to relax the condition by
accepting full paths in the embedded case.

Approved by: Heikki (on IM)

"GEN_CLUST_INDEX" which is reserved for the default system
primary index. (Bug #46000) rb://149 approved by Marko Makela.

with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.

Fix a compilation warning caused by c5799:

handler/ha_innodb.cc: In function 'void innobase_get_cset_width(ulint, ulint*, ulint*)':
handler/ha_innodb.cc:830: warning: format '%d' expects type 'int', but argument 2 has type 'ulint'

Allow tables to be dropped even if the collation is not found,
but issue a warning.

Could not find an easy way to add mysql-test since it requires
changes to charsets and restarting the server. Tests were
executed manually.

Approved by: Heikki (on IM)

HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38.

create_table_def() needs to be fixed.

check in.

with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.

"GEN_CLUST_INDEX" which is reserved for the default system
primary index. (Bug #46000) rb://149 approved by Sunny Bains. 

Merge PART OF r2911.5.5 from MySQL:

adjust CMakeLists.txt to work with MySQL 5.1.38
and beyond.

MySQL changed how the build works on Windows starting from 5.1.38.
All shared properties are defined in mysql_storage_engine.cmake.
And the top level CMakeLists.txt determines what engines to build
and how (static vs. dynamic).

log message from BZR:

  ------------------------------------------------------------
  revno: 2911.5.5
  committer: Vladislav Vaintroub <vvaintroub@mysql.com>
  branch nick: 5.1-innodb_plugin
  timestamp: Wed 2009-06-10 10:59:49 +0200
  message:
    Backport WL#3653 to 5.1 to enable bundled innodb plugin.
    Remove custom DLL loader code from innodb plugin code, use 
    symbols exported from mysqld.
  removed:
    storage/innodb_plugin/handler/handler0vars.h
    storage/innodb_plugin/handler/win_delay_loader.cc
  added:
    storage/mysql_storage_engine.cmake
    win/create_def_file.js
  modified:
    CMakeLists.txt
    include/m_ctype.h
    include/my_global.h
    include/my_sys.h
    include/mysql/plugin.h
    libmysqld/CMakeLists.txt
    mysql-test/mysql-test-run.pl
    mysql-test/t/plugin.test
    mysql-test/t/plugin_load-master.opt
    mysys/charset.c
    sql/CMakeLists.txt
    sql/handler.h
    sql/mysql_priv.h
    sql/mysqld.cc
    sql/sql_class.cc
    sql/sql_class.h
    sql/sql_list.h
    sql/sql_profile.h
    storage/Makefile.am
    storage/archive/CMakeLists.txt
    storage/blackhole/CMakeLists.txt
    storage/csv/CMakeLists.txt
    storage/example/CMakeLists.txt
    storage/federated/CMakeLists.txt
    storage/heap/CMakeLists.txt
    storage/innobase/CMakeLists.txt
    storage/innobase/handler/ha_innodb.cc
    storage/innodb_plugin/CMakeLists.txt
    storage/innodb_plugin/handler/ha_innodb.cc
    storage/innodb_plugin/handler/handler0alter.cc
    storage/innodb_plugin/handler/i_s.cc
    storage/innodb_plugin/plug.in
    storage/myisam/CMakeLists.txt
    storage/myisammrg/CMakeLists.txt
    win/Makefile.am
    win/configure.js

Merge a change from MySQL:

  ------------------------------------------------------------
  revno: 2988
  committer: Satya B <satya.bn@sun.com>
  branch nick: mysql-5.1-bugteam
  timestamp: Wed 2009-07-01 11:06:05 +0530
  message:
    Fix build failure after applying Innodb snapshot 5.1-ss5282
    
    After applying Innodb snapshot 5.1-ss5282, build was broken
    because of missing header file. 
    
    Adding the header file to Makefile.am after informing the 
    innodb developers.
  modified:
    storage/innobase/Makefile.am

Merge a change from MySQL:

  ------------------------------------------------------------
  revno: 2874.2.1
  committer: Anurag Shekhar <anurag.shekhar@sun.com>
  branch nick: mysql-5.1-bugteam-windows-warning
  timestamp: Wed 2009-05-13 15:41:24 +0530
  message:
    Bug #39802 On Windows, 32-bit time_t should be enforced
    
    This patch fixes compilation warning, "conversion from 'time_t' to 'ulong', 
    possible loss of data". 
    The fix is to typecast time_t to ulong before assigning it to ulong. 
    Backported this from 6.0-bugteam tree.
  modified:
    storage/archive/ha_archive.cc
    storage/federated/ha_federated.cc
    storage/innobase/handler/ha_innodb.cc
    storage/myisam/ha_myisam.cc

Fix Bug#21704 Renaming column does not update FK definition

by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.

The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.

Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.

Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation

by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html

  ------------------------------------------------------------------------
  r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/handler/ha_innodb.cc
     M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
     M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
     M /branches/zip/mysql-test/innodb_bug42101.result
     M /branches/zip/mysql-test/innodb_bug42101.test
  
  branches/zip: Fix a race condition caused by
  SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
  When innodb_commit_concurrency is initially set nonzero,
  DEFAULT would change it back to 0, triggering Bug #42101.
  rb://139 approved by Heikki Tuuri.
  ------------------------------------------------------------------------

when compiling with -DUNIV_MUST_NOT_INLINE.

refuse to unlock the record.
(Bug #45357, caused by the fix of Bug #39320).
rb://132 approved by Sunny Bains.

with -DUNIV_MUST_NOT_INLINE.

Remove the word "Error" from the printout because the mysqltest suite
interprets it as an error and thus the innodb-autoinc test fails.

Approved by:	Sunny (via IM)

the bug fix we would assert on missing autoinc columns. With this fix we allow
MySQL to open the table but set the next autoinc value for the column to the
MAX value. This effectively disables the next value generation. INSERTs will
fail with a generic AUTOINC failure. However, the user should be able to
read/dump the table, set the column values explicitly, use ALTER TABLE to
set the next autoinc value and/or sync the two data dictionaries to resume
normal operations.

Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
index (PRIMARY)

rb://118