mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-25 09:45:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql-5.1 to mysql-5.5.

Browse source
This commit is contained in:
Marko Mäkelä 2011-08-22 17:12:27 +03:00
commit 42ff786cf9
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
extra/innochecksum.c
View file

@ -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)

8
storage/innobase/sync/sync0sync.c
View file

@ -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)) {