diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-08-22 17:12:27 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-08-22 17:12:27 +0300 |
| commit | 42ff786cf9bc2e730efd7254545fb2caa0115546 (patch) | |
| tree | 5fa1606af3e784d854517456886d32bdb64dbb67 | |
| parent | 73312bddb3b0aa07e66f6ab118e5902f8f5e5728 (diff) | |
| parent | 49ee12d03b763a460cfcc371566465019a4dc067 (diff) | |
| download | mariadb-git-42ff786cf9bc2e730efd7254545fb2caa0115546.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
| -rw-r--r-- | extra/innochecksum.c | 8 | ||||
| -rw-r--r-- | storage/innobase/sync/sync0sync.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/extra/innochecksum.c b/extra/innochecksum.c index 7ad900d16d3..b55b510b888 100644 --- a/extra/innochecksum.c +++ b/extra/innochecksum.c @@ -25,12 +25,7 @@ Published with a permission. */ -/* needed to have access to 64 bit file functions */ -#define _LARGEFILE_SOURCE -#define _LARGEFILE64_SOURCE - -#define _XOPEN_SOURCE 500 /* needed to include getopt.h on some platforms. */ - +#include <my_global.h> #include <stdio.h> #include <stdlib.h> #include <time.h> @@ -53,7 +48,6 @@ /* another argument to specify page ranges... seek to right spot and go from there */ typedef unsigned long int ulint; -typedef unsigned char uchar; /* innodb function in name; modified slightly to not have the ASM version (lots of #ifs that didn't apply) */ ulint mach_read_from_4(uchar *b) diff --git a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c index 3888fe4c657..5de8dfe0a6f 100644 --- a/storage/innobase/sync/sync0sync.c +++ b/storage/innobase/sync/sync0sync.c @@ -1329,7 +1329,13 @@ sync_thread_add_level( TRUE)); break; case SYNC_IBUF_TREE_NODE_NEW: - ut_a(sync_thread_levels_contain(array, SYNC_IBUF_MUTEX)); + /* ibuf_add_free_page() allocates new pages for the + change buffer while only holding the tablespace + x-latch. These pre-allocated new pages may only be + taken in use while holding ibuf_mutex, in + btr_page_alloc_for_ibuf(). */ + ut_a(sync_thread_levels_contain(array, SYNC_IBUF_MUTEX) + || sync_thread_levels_contain(array, SYNC_FSP)); break; case SYNC_IBUF_INDEX_TREE: if (sync_thread_levels_contain(array, SYNC_FSP)) { |