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

  ------------------------------------------------------------------------
  r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines

  branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
  (Update Query Results in "1 Row Affected" But Should Be "Zero Rows").

  Also, add a test case for Bug #40565.

  rb://128 approved by Heikki Tuuri
  ------------------------------------------------------------------------

Merge a change from MySQL (this fixes the failing innodb_mysql test):

  ------------------------------------------------------------
  revno: 1810.3894.10
  committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
  branch nick: mysql-5.0-bugteam
  timestamp: Tue 2009-05-19 11:32:21 +0500
  message:
    Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
    Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
    Suggested fix is to add '\'' symbol check for quotation condition
    (dict_strip_comments() function).
  modified:
    innobase/dict/dict0dict.c
    mysql-test/r/innodb_mysql.result
    mysql-test/t/innodb_mysql.test

Whitespace fixup.

Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages

Do not write redo log for the pages in the doublewrite buffer. Also, do not
make a dummy change to the page because this is not needed.

Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages

Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h
and include fsp0fsp.h just before it is needed. This is needed in order
to be able to use TRX_SYS_SPACE in mtr0log.ic.

Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages 

Non-functional change: move FSP_* macros from fsp0fsp.h to a new file
fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE 
in mtr0log.ic.

that innodb_commit_concurrency>0 remains constant at run time. (Bug #42101)

srv_commit_concurrency: Make this a static variable in ha_innodb.cc.

innobase_commit_concurrency_validate(): Check that innodb_commit_concurrency
is not changed from or to 0 at run time.  This is needed, because
innobase_commit() assumes that innodb_commit_concurrency>0 remains constant.
Without this limitation, the checks for innodb_commit_concurrency>0
in innobase_commit() should be removed and that function would have to
acquire and release commit_cond_m at least twice per invocation.
Normally, innodb_commit_concurrency=0, and introducing the mutex operations
would mean significant overhead.

innodb_bug42101.test, innodb_bug42101-nonzero.test: Test cases.

rb://123 approved by Heikki Tuuri

innodb_table_monitor output.  It was accidentally omitted due to an
off-by-one loop condition.  (Bug #44320)

rb://116 approved by Heikki Tuuri

Merge a change from MySQL:

  ------------------------------------------------------------
  revno: 2728.10.2
  committer: Ignacio Galarza <iggy@mysql.com>
  branch nick: mysql-5.1-bugteam-bug29125
  timestamp: Fri 2009-02-13 11:41:47 -0500
  message:
    Bug#29125 Windows Server X64: so many compiler warnings
    - Remove bothersome warning messages.  This change focuses on the warnings 
    that are covered by the ignore file: support-files/compiler_warnings.supp.
    - Strings are guaranteed to be max uint in length
  modified:
    client/mysql_upgrade.c
    client/mysqladmin.cc
    client/mysqlbinlog.cc
    client/mysqlcheck.c
    client/mysqldump.c
    client/mysqlslap.c
    client/mysqltest.cc
    client/sql_string.cc
    extra/comp_err.c
    extra/yassl/src/buffer.cpp
    extra/yassl/taocrypt/include/block.hpp
    extra/yassl/taocrypt/src/algebra.cpp
    extra/yassl/taocrypt/src/asn.cpp
    include/config-win.h
    libmysql/libmysql.c
    mysys/array.c
    mysys/base64.c
    mysys/charset.c
    mysys/checksum.c
    mysys/default.c
    mysys/default_modify.c
    mysys/hash.c
    mysys/mf_keycache.c
    mysys/mf_tempdir.c
    mysys/my_append.c
    mysys/my_compress.c
    mysys/my_conio.c
    mysys/my_copy.c
    mysys/my_getwd.c
    mysys/my_pread.c
    mysys/my_quick.c
    mysys/my_read.c
    mysys/safemalloc.c
    mysys/string.c
    server-tools/instance-manager/buffer.cc
    server-tools/instance-manager/instance.cc
    server-tools/instance-manager/options.cc
    server-tools/instance-manager/parse.h
    sql-common/client.c
    sql-common/my_user.c
    sql/event_data_objects.cc
    sql/event_parse_data.cc
    sql/events.cc
    sql/gen_lex_hash.cc
    sql/item.h
    sql/item_func.cc
    sql/item_strfunc.cc
    sql/item_timefunc.cc
    sql/lock.cc
    sql/log_event.cc
    sql/log_event.h
    sql/log_event_old.cc
    sql/net_serv.cc
    sql/sp_head.h
    sql/spatial.h
    sql/sql_class.h
    sql/sql_connect.cc
    sql/sql_crypt.cc
    sql/sql_error.cc
    sql/sql_insert.cc
    sql/sql_lex.cc
    sql/sql_lex.h
    sql/sql_load.cc
    sql/sql_prepare.cc
    sql/sql_profile.cc
    sql/sql_repl.cc
    sql/sql_servers.cc
    sql/sql_string.cc
    sql/sql_table.cc
    sql/sql_trigger.cc
    sql/sql_udf.cc
    sql/sql_view.cc
    sql/udf_example.c
    sql/uniques.cc
    storage/archive/azio.c
    storage/archive/azlib.h
    storage/csv/ha_tina.cc
    storage/csv/ha_tina.h
    storage/csv/transparent_file.h
    storage/federated/ha_federated.cc
    storage/federated/ha_federated.h
    storage/heap/hp_write.c
    storage/innobase/handler/ha_innodb.cc
    storage/innobase/include/pars0pars.h
    storage/myisam/ha_myisam.cc
    storage/myisam/mi_check.c
    storage/myisam/mi_packrec.c
    storage/myisam/mi_search.c
    storage/myisam/rt_index.c
    storage/myisammrg/ha_myisammrg.cc
    strings/ctype.c
    strings/my_vsnprintf.c
    tests/bug25714.c
    tests/mysql_client_test.c

Merge a change from MySQL (looks like this is against 5.0 but they later
merged it to 5.1):

  ------------------------------------------------------------
  revno: 1810.3846.1
  committer: Alexey Botchkov <holyfoot@mysql.com>
  branch nick: 31435
  timestamp: Tue 2008-11-11 14:42:32 +0400
  message:
    Bug#31435 ha_innodb.cc:3983: ulint convert_search_mode_to_innobase(ha_rkey_function): Asse 
        I think we don't need to issue an error statement in the convert_search_mode_to_innobase().
        Returning the PAGE_CUR_UNSUPP value is enough as allows to handle this
        case depending on the requirements.
    
    per-file comments:
      sql/ha_innodb.cc 
    Bug#31435 ha_innodb.cc:3983: ulint convert_search_mode_to_innobase(ha_rkey_function): Asse 
         no error issued in convert_search_mode_to_innobase.
         ha_innobase::records_in_range() returns HA_POS_ERROR if search mode isn't supported.
  modified:
    sql/ha_innodb.cc

When using the random function, first take the modulus by the number of pages
and then typecast to ulint.

This is a followup to r4699 - the fix of Bug#43660.

Fix Bug#43660 SHOW INDEXES/ANALYZE does NOT update cardinality for indexes
of InnoDB table

by replacing the PRNG that is used to pick random pages with a better
one.

This is based on r4670 but also adds a new configuration option and
enables the fix only if this option is changed. Please skip the present
revision when merging.

Approved by:	Heikki (via email)

Followup to r4575 and the fix of Bug#43309 Test main.innodb can't be run twice:

Add an explanatory comment, as suggested by Patrick Crews in the bug report.

Revert a change to Makefile.am that I committed accidentally in c4574.

Fix Bug#43309 Test main.innodb can't be run twice

Make the innodb mysql-test more flexible by inspecting how much a
variable of interest has changed since the start of the test. Do not
assume the variables have zero values at the start of the test.

Restore the state of INNODB_THREAD_CONCURRENCY to silence this warning:

  TEST                                      RESULT   TIME (ms)
  ------------------------------------------------------------
  
  worker[1] Using MTR_BUILD_THREAD 250, with reserved ports 12500..12509
  main.innodb                              [ pass ]   8803
  
  MTR's internal check of the test case 'main.innodb' failed.
  This means that the test case does not preserve the state that existed
  before the test case was executed.  Most likely the test case did not
  do a proper clean-up.
  This is the diff of the states of the servers before and after the
  test case was executed:
  mysqltest: Logging to '/tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
  mysqltest: Results saved in '/tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
  mysqltest: Connecting to server localhost:12500 (socket /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
  mysqltest: ... Connected.
  mysqltest: Start processing test commands from './include/check-testcase.test' ...
  mysqltest: ... Done processing test commands.
  --- /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result	2009-03-30 14:12:31.000000000 +0300
  +++ /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject	2009-03-30 14:12:41.000000000 +0300
  @@ -99,7 +99,7 @@
   INNODB_SUPPORT_XA	ON
   INNODB_SYNC_SPIN_LOOPS	20
   INNODB_TABLE_LOCKS	ON
  -INNODB_THREAD_CONCURRENCY	8
  +INNODB_THREAD_CONCURRENCY	16
   INNODB_THREAD_SLEEP_DELAY	10000
   INSERT_ID	0
   INTERACTIVE_TIMEOUT	28800
  
  mysqltest: Result content mismatch
  
  not ok

Fix email address from dev@innodb.com to innodb_dev_ww@oracle.com

modified by the current transaction.  This bug was introduced or unmasked
in r4400.

rb://97 approved by Heikki Tuuri

Remember the acquired record locks per table handle (row_prebuilt_t)
rather than per transaction (trx_t), so that unlock_row should successfully
unlock all non-matching rows in multi-table operations.
This deficiency was found while investigating Bug #39320.

rb://94 approved by Heikki Tuuri.

also for unlock_row().  (Bug #39320)

rb://96 approved by Heikki Tuuri.

Merge a change from MySQL:

  ------------------------------------------------------------
  revno: 2747
  committer: Timothy Smith <timothy.smith@sun.com>
  branch nick: 51
  timestamp: Fri 2009-01-16 17:49:07 +0100
  message:
    Add another cast to ignore int/ulong difference in error types, silence warning on Win64
  modified:
    storage/innobase/handler/ha_innodb.cc

Merge a change from MySQL:

  ------------------------------------------------------------
  revno: 2728.19.1
  committer: Alfranio Correia <alfranio.correia@sun.com>
  branch nick: mysql-5.1-bugteam
  timestamp: Tue 2009-02-03 11:36:46 +0000
  message:
    BUG#42445 Warning messages in innobase/handler/ha_innodb.cc
          
    There was a type casting problem in the storage/innobase/handler/ha_innodb.cc,
    (int ha_innobase::write_row(...)). Innobase uses has an internal error variable
    of type 'ulint' while mysql uses an 'int'. 
          
    To fix the problem the function manipulates an error variable of
    type 'ulint' and only casts it into 'int' when needs to return the value.
  modified:
    storage/innobase/handler/ha_innodb.cc