ChangeLog:
Use "Fix Bug#NNNNN bug summary text" for bugfixes, as for other entries
in the file.

more generic.  The previous pattern could fail if other test cases were run
before this one.  Since r2716, the MySQL server is not restarted for this test.

(Bug #36285, rb://9).

innodb-index.test, innodb-index.result: Set innodb_lock_wait_timeout as
a session variable instead of relying on the global value.

innodb-index-master.opt: Remove.

innodb-timeout.test: Test that setting the innodb_lock_wait_timeout
works as advertised.

thd_lock_wait_timeout(): New function, to retrieve the lock wait timeout
for a given MySQL client connection (thd), or the global value (thd==NULL).

srv_lock_wait_timeout, innobase_lock_wait_timeout: Remove.

Replace MYSQL_SYSVAR_LONG(lock_wait_timeout)
with MYSQL_THDVAR_ULONG(lock_wait_timeout).  

should be space left in the modification log of the compressed page.
Record deletion does not require any space in the modification log.

dump the data structures.  This was forgotten in r2698.

  ------------------------------------------------------------------------
  r2702 | sunny | 2008-09-30 11:41:56 +0300 (Tue, 30 Sep 2008) | 13 lines

  branches/5.1: Since handler::get_auto_increment() doesn't allow us
  to return the cause of failure we have to inform MySQL using the
  sql_print_warning() function to return the cause for autoinc failure.
  Previously we simply printed the error code, this patch prints the
  text string representing the following two error codes:

  DB_LOCK_WAIT_TIMEOUT
  DB_DEADLOCK.

  Bug#35498 Cannot get table test/table1 auto-inccounter value in ::info

  Approved by Marko.
  ------------------------------------------------------------------------
  rb://18

Change the patch to fix the failing mysql-test index_merge_innodb.

The previous variant is inappropriate because myisam results are different
(2 instead of 4) and then the index_merge_myisam test fails.

page_zip_hexdump_func(): New function, to dump a block of data.
ut_print_buf() would dump everything on a single line, which is hard
to read.

page_zip_hexdump(): Wrapper macro for page_zip_hexdump_func().

page_zip_validate(): dump page_zip, page_zip->data, page, temp_page if !valid.

in r2631.  Include the node pointer field in the size calculation.

rec_get_converted_size_comp_prefix(): New function, to compute the storage
size of the prefix of an ordinary record in COMPACT format.

rec_get_converted_size_comp(): Use rec_get_converted_size_comp_prefix().

Add a patch to fix the failing mysql-test index_merge_innodb. The test
started failing after an optimization, made in r2625, which results in
a different number of rows being returned by EXPLAIN.

Fix typos in mysql-test/patches/README.

ut_a() assertions into ut_ad() assertions.

The following files are from MySQL source tree without any changes.
They will be changed for building Windows plugin. The original files
will be used as the base for diff purpose.

* CMakeLists.txt
* sql/CMakeLists.txt
* win/configure.js

page_zip_copy_recs(): Rename from page_zip_copy().
Update the function comment.

page_copy_rec_list_end(), page_copy_rec_list_start() and friends do
not copy it either.

fields that are related to the records stored in the page.

page_zip_copy() is a fall-back method in certain B-tree operations
(tree compression, splitting or merging nodes).  The contents of a
page may fit in the compressed page frame when it has been modified in
a certain sequence, but not when the page is recompressed.  Sometimes,
copying all or part of the records to an empty page could fail because
of compression overflow.  In such cases, we copy the compressed and
uncompressed pages bit for bit and delete any unwanted records from
the copy.  (Deletion is guaranteed to succeed.)  The method
page_zip_copy() is invoked very rarely.

In one case, page_zip_copy() was called in btr_lift_page_up() to move
the records to the root page of the B-tree.  Because page_zip_copy()
copied all B-tree page header fields, it overwrote the file segment
header fields PAGE_BTR_SEG_LEAF and PAGE_BTR_SEG_TOP.  This is the
probable cause of the corruption that was reported as Mantis issue #63
and others.

add some ut_a() assertions to track down file space header corruption
that is the probable cause of Mantis issue #63.

Return earlier when this function is called on an index that
is being created.  Luckily, mtr_start() does not allocate any
resources.  Thus, there was no memory leak.

be merged to a leaf page.

B-tree, because there are no file segment headers in the insert buffer B-tree
root page.  The function was introduced in r2627.

memory leak on Windows.

buf_block_dbg_add_level(block, level): Define as an empty macro when
UNIV_SYNC_DEBUG is not defined.  Remove #ifdef UNIV_SYNC_DEBUG around
all invocations.

conditions.

around a debug assertion.

The memory leak was due to wrong parameters passed into VirtualFree()
call. So, the call fails with Windows error 87. MEM_DECOMMIT can NOT be
used along with MEM_RELEASE. And if the parameter is MEM_RELEASE, the
size parameter must be 0. The function frees the entire region that is
reserved in the initial allocation call to VirtualAlloc.

This issue was introduced by r984.

Approved by:	Heikki (on IM)

ha_thd() whenever possible.

EQ_CURRENT_THD(thd): New predicate, for use in assertions.

innobase_drop_database(): Tolerate current_thd == NULL, so that the
Windows plugin will work.  In the Windows plugin, it will be
impossible to skip foreign key checks in this function.  However,
DROP DATABASE will drop each table (that MySQL knows about) individually
before calling this function.  Thus, the foreign key checks can be disabled
also in the Windows plugin, unless some .frm files are missing.

the maximum record size will never exceed the B-tree page size limit.
For uncompressed tables, there should always be enough space for two
records in an empty B-tree page.  For compressed tables, there should
be enough space for storing two node pointer records or one data
record in an empty page in uncompressed format.

dict_build_table_def_step(): Remove the inaccurate check for table row
size.

dict_index_too_big_for_tree(): New function: check if the index
records would be too big for a B-tree page.

dict_index_add_to_cache(): Add the parameter "strict".  Invoke
dict_index_too_big_for_tree() if it is set.

trx_is_strict(), thd_is_strict(): New functions, for determining if
innodb_strict_mode is enabled for the current transaction.

dict_create_index_step(): Pass the new parameter strict of
dict_index_add_to_cache() as trx_is_strict(trx).  All other callers
pass it as FALSE.

innodb.test: Enable innodb_strict_mode before attempting to create a
table with a too big record size.

innodb-zip.test: Remove the test of inserting random data.  Add tests
for checking that the maximum record lengths are enforced at table
creation time.

general public, and Mantis is for our internal use only.

Thanks to Vasil for pointing this out.

bug#39483 InnoDB hang on adaptive hash because of out of order ::open()
call by MySQL

Forward port of r2629

Under some conditions MySQL calls ::open with search_latch leading
to a deadlock as we try to acquire dict_sys->mutex inside ::open
breaking the latching order. The fix is to release search_latch.

Reviewed by: Heikki

Add the parameter struct charset_info_st* cs, so that the call
thd_charset(current_thd) can be avoided.  The macro current_thd has no
defined value in the Windows plugin.

functions innobase_convert_from_table_id(), innobase_convert_from_id(),
innobase_casedn_str(), and innobase_get_charset() to ha_prototypes.h.

the Microsoft Visual C compiler happy.  This fix was from Calvin.

ha_innodb.cc: Declare strict_mode as PLUGIN_VAR_OPCMDARG, because we
do want to be able to disable innodb_strict_mode.  This is a non-functional
change, because PLUGIN_VAR_NOCMDARG seems to accept an argument as well.

innodb-zip.test: Do not store innodb_strict_mode.  It is a session variable.
Add a test case for innodb_strict_mode=off.