diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-03 19:11:39 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-03 19:11:39 +0300 |
| commit | 547ef66609b479adeb3a25d5c37e4b185623a2cf (patch) | |
| tree | 78265dc8ed941f1f55f331f5e86576df090043ff /storage | |
| parent | 1be5462d59fa5fbd1ca92286c3a0a049c00f4bb9 (diff) | |
| parent | f74853053ff7cb4420b09923d9c648620e7fa73c (diff) | |
| download | mariadb-git-547ef66609b479adeb3a25d5c37e4b185623a2cf.tar.gz | |
Automatic merge with MariaDB 5.1
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/xtradb/buf/buf0buddy.c | 2 | ||||
| -rw-r--r-- | storage/xtradb/fil/fil0fil.c | 4 | ||||
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/os/os0file.c | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/storage/xtradb/buf/buf0buddy.c b/storage/xtradb/buf/buf0buddy.c index 12f7ad51aac..db94b4bed24 100644 --- a/storage/xtradb/buf/buf0buddy.c +++ b/storage/xtradb/buf/buf0buddy.c @@ -452,8 +452,6 @@ buf_buddy_relocate( buf_page_t* bpage; const ulint size = BUF_BUDDY_LOW << i; ullint usec = ut_time_us(NULL); - ulint space; - ulint page_no; //ut_ad(buf_pool_mutex_own()); ut_ad(mutex_own(&zip_free_mutex)); diff --git a/storage/xtradb/fil/fil0fil.c b/storage/xtradb/fil/fil0fil.c index d7a01590264..d124b845a8e 100644 --- a/storage/xtradb/fil/fil0fil.c +++ b/storage/xtradb/fil/fil0fil.c @@ -691,7 +691,7 @@ fil_node_open_file( ut_a(space->purpose != FIL_LOG); ut_a(!trx_sys_sys_space(space->id)); - if (size_bytes < FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) { + if (size_bytes < (ib_uint64_t) (FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE)) { fprintf(stderr, "InnoDB: Error: the size of single-table" " tablespace file %s\n" @@ -3806,7 +3806,7 @@ fil_load_single_table_tablespace( /* Align the memory for file i/o if we might have O_DIRECT set */ page = ut_align(buf2, UNIV_PAGE_SIZE); - if (size >= FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE) { + if (size >= (ib_uint64_t) (FIL_IBD_FILE_INITIAL_SIZE * (lint)UNIV_PAGE_SIZE)) { success = os_file_read(file, page, 0, 0, UNIV_PAGE_SIZE); /* We have to read the tablespace id from the file */ diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 94ff86a2933..dfe98f09e4f 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -11794,7 +11794,7 @@ static MYSQL_SYSVAR_ULINT(pass_corrupt_table, srv_pass_corrupt_table, "except for the deletion.", NULL, NULL, 0, 0, 1, 0); -static MYSQL_SYSVAR_ULONG(lazy_drop_table, srv_lazy_drop_table, +static MYSQL_SYSVAR_ULINT(lazy_drop_table, srv_lazy_drop_table, PLUGIN_VAR_RQCMDARG, "At deleting tablespace, only miminum needed processes at the time are done. " "e.g. for http://bugs.mysql.com/51325", diff --git a/storage/xtradb/os/os0file.c b/storage/xtradb/os/os0file.c index 31dec031af3..5b8e656d8b2 100644 --- a/storage/xtradb/os/os0file.c +++ b/storage/xtradb/os/os0file.c @@ -3817,7 +3817,8 @@ try_again: slot->pos, &dummy_mess1, &dummy_mess2, - &dummy_type); + &dummy_type, + &space_id); return(retval); } |