mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: Rename ib_ulonglong to ib_uint64_t and ib_longlong to ib_int64_t.

Browse source
This commit is contained in:
marko 2008-03-17 14:19:04 +00:00
parent ebdb9daa9b
commit 77d8c98735
35 changed files with 151 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
btr/btr0cur.c
View file

@ -2992,7 +2992,7 @@ btr_cur_add_path_info(
/***********************************************************************
Estimates the number of rows in a given index range. */
UNIV_INTERN
ib_longlong
ib_int64_t
btr_estimate_n_rows_in_range(
/*=========================*/
/* out: estimated number of rows */
@ -3010,7 +3010,7 @@ btr_estimate_n_rows_in_range(
ibool diverged;
ibool diverged_lot;
ulint divergence_level;
ib_longlong n_rows;
ib_int64_t n_rows;
ulint i;
mtr_t mtr;
@ -3153,7 +3153,7 @@ btr_estimate_number_of_different_key_vals(
ulint n_cols;
ulint matched_fields;
ulint matched_bytes;
ib_longlong* n_diff;
ib_int64_t* n_diff;
ulint not_empty_flag = 0;
ulint total_external_size = 0;
ulint i;
@ -3170,7 +3170,7 @@ btr_estimate_number_of_different_key_vals(
n_cols = dict_index_get_n_unique(index);
n_diff = mem_zalloc((n_cols + 1) * sizeof(ib_longlong));
n_diff = mem_zalloc((n_cols + 1) * sizeof(ib_int64_t));
/* We sample some pages in the index to get an estimate */
@ -3273,7 +3273,7 @@ btr_estimate_number_of_different_key_vals(
for (j = 0; j <= n_cols; j++) {
index->stat_n_diff_key_vals[j]
= ((n_diff[j]
* (ib_longlong)index->stat_n_leaf_pages
* (ib_int64_t)index->stat_n_leaf_pages
+ BTR_KEY_VAL_ESTIMATE_N_PAGES - 1
+ total_external_size
+ not_empty_flag)

2
buf/buf0buf.c
View file

@ -2540,7 +2540,7 @@ buf_page_init_for_read(
ulint space, /* in: space id */
ulint zip_size,/* in: compressed page size, or 0 */
ibool unzip, /* in: TRUE=request uncompressed page */
ib_longlong tablespace_version,/* in: prevents reading from a wrong
ib_int64_t tablespace_version,/* in: prevents reading from a wrong
version of the tablespace in case we have done
DISCARD + IMPORT */
ulint offset) /* in: page number */

12
buf/buf0rea.c
View file

@ -67,7 +67,7 @@ buf_read_page_low(
ulint space, /* in: space id */
ulint zip_size,/* in: compressed page size, or 0 */
ibool unzip, /* in: TRUE=request uncompressed page */
ib_longlong tablespace_version, /* in: if the space memory object has
ib_int64_t tablespace_version, /* in: if the space memory object has
this timestamp different from what we are giving here,
treat the tablespace as dropped; this is a timestamp we
use to stop dangling page reads from a tablespace
@ -177,7 +177,7 @@ buf_read_ahead_random(
ulint offset) /* in: page number of a page which the current thread
wants to access */
{
ib_longlong tablespace_version;
ib_int64_t tablespace_version;
ulint recent_blocks = 0;
ulint count;
ulint LRU_recent_limit;
@ -327,7 +327,7 @@ buf_read_page(
ulint zip_size,/* in: compressed page size in bytes, or 0 */
ulint offset) /* in: page number */
{
ib_longlong tablespace_version;
ib_int64_t tablespace_version;
ulint count;
ulint count2;
ulint err;
@ -395,7 +395,7 @@ buf_read_ahead_linear(
ulint offset) /* in: page number of a page; NOTE: the current thread
must want access to this page (see NOTE 3 above) */
{
ib_longlong tablespace_version;
ib_int64_t tablespace_version;
buf_page_t* bpage;
buf_frame_t* frame;
buf_page_t* pred_bpage = NULL;
@ -643,7 +643,7 @@ buf_read_ibuf_merge_pages(
to get read in, before this
function returns */
const ulint* space_ids, /* in: array of space ids */
const ib_longlong* space_versions,/* in: the spaces must have
const ib_int64_t* space_versions,/* in: the spaces must have
this version number
(timestamp), otherwise we
discard the read; we use this
@ -728,7 +728,7 @@ buf_read_recv_pages(
ulint n_stored) /* in: number of page numbers
in the array */
{
ib_longlong tablespace_version;
ib_int64_t tablespace_version;
ulint count;
ulint err;
ulint i;

12
dict/dict0dict.c
View file

@ -342,7 +342,7 @@ void
dict_table_autoinc_initialize(
/*==========================*/
dict_table_t* table, /* in/out: table */
ib_ulonglong value) /* in: next value to assign to a row */
ib_uint64_t value) /* in: next value to assign to a row */
{
ut_ad(mutex_own(&table->autoinc_mutex));
@ -354,13 +354,13 @@ dict_table_autoinc_initialize(
Reads the next autoinc value (== autoinc counter value), 0 if not yet
initialized. */
UNIV_INTERN
ib_ulonglong
ib_uint64_t
dict_table_autoinc_read(
/*====================*/
/* out: value for a new row, or 0 */
const dict_table_t* table) /* in: table */
{
ib_longlong value;
ib_int64_t value;
ut_ad(mutex_own(&table->autoinc_mutex));
@ -383,7 +383,7 @@ dict_table_autoinc_update(
/*======================*/
dict_table_t* table, /* in/out: table */
ib_ulonglong value) /* in: value which was assigned to a row */
ib_uint64_t value) /* in: value which was assigned to a row */
{
if (table->autoinc_inited && value > table->autoinc) {
@ -1419,7 +1419,7 @@ dict_index_add_to_cache(
new_index->stat_n_diff_key_vals = mem_heap_alloc(
new_index->heap,
(1 + dict_index_get_n_unique(new_index))
* sizeof(ib_longlong));
* sizeof(ib_int64_t));
/* Give some sensible values to stat_n_... in case we do
not calculate statistics quickly enough */
@ -4155,7 +4155,7 @@ dict_index_print_low(
/*=================*/
dict_index_t* index) /* in: index */
{
ib_longlong n_vals;
ib_int64_t n_vals;
ulint i;
const char* type_string;

34
fil/fil0fil.c
View file

@ -119,9 +119,9 @@ struct fil_node_struct {
/* count of pending flushes on this file;
closing of the file is not allowed if
this is > 0 */
ib_longlong modification_counter;/* when we write to the file we
ib_int64_t modification_counter;/* when we write to the file we
increment this by one */
ib_longlong flush_counter;/* up to what modification_counter value
ib_int64_t flush_counter;/* up to what modification_counter value
we have flushed the modifications to disk */
UT_LIST_NODE_T(fil_node_t) chain;
/* link field for the file chain */
@ -137,7 +137,7 @@ struct fil_space_struct {
char* name; /* space name = the path to the first file in
it */
ulint id; /* space id */
ib_longlong tablespace_version;
ib_int64_t tablespace_version;
/* in DISCARD/IMPORT this timestamp is used to
check if we should ignore an insert buffer
merge request for a page because it actually
@ -230,7 +230,7 @@ struct fil_system_struct {
ulint n_open; /* number of files currently open */
ulint max_n_open; /* n_open is not allowed to exceed
this */
ib_longlong modification_counter;/* when we write to a file we
ib_int64_t modification_counter;/* when we write to a file we
increment this by one */
ulint max_assigned_id;/* maximum space id in the existing
tables, or assigned during the time
@ -238,7 +238,7 @@ struct fil_system_struct {
startup we scan the data dictionary
and set here the maximum of the
space id's of the tables there */
ib_longlong tablespace_version;
ib_int64_t tablespace_version;
/* a counter which is incremented for
every space object memory creation;
every space mem object gets a
@ -394,7 +394,7 @@ fil_space_get_by_name(
/***********************************************************************
Returns the version number of a tablespace, -1 if not found. */
UNIV_INTERN
ib_longlong
ib_int64_t
fil_space_get_version(
/*==================*/
/* out: version number, -1 if the tablespace does not
@ -403,7 +403,7 @@ fil_space_get_version(
{
fil_system_t* system = fil_system;
fil_space_t* space;
ib_longlong version = -1;
ib_int64_t version = -1;
ut_ad(system);
@ -606,7 +606,7 @@ fil_node_open_file(
fil_system_t* system, /* in: tablespace memory cache */
fil_space_t* space) /* in: space */
{
ib_longlong size_bytes;
ib_int64_t size_bytes;
ulint size_low;
ulint size_high;
ibool ret;
@ -649,8 +649,8 @@ fil_node_open_file(
os_file_get_size(node->handle, &size_low, &size_high);
size_bytes = (((ib_longlong)size_high) << 32)
+ (ib_longlong)size_low;
size_bytes = (((ib_int64_t)size_high) << 32)
+ (ib_int64_t)size_low;
#ifdef UNIV_HOTBACKUP
node->size = (ulint) (size_bytes / UNIV_PAGE_SIZE);
/* TODO: adjust to zip_size, like below? */
@ -2814,8 +2814,8 @@ fil_reset_too_high_lsns(
byte* buf2;
ib_uint64_t flush_lsn;
ulint space_id;
ib_longlong file_size;
ib_longlong offset;
ib_int64_t file_size;
ib_int64_t offset;
ulint zip_size;
ibool success;
@ -3123,7 +3123,7 @@ fil_load_single_table_tablespace(
ulint flags;
ulint size_low;
ulint size_high;
ib_longlong size;
ib_int64_t size;
#ifdef UNIV_HOTBACKUP
fil_space_t* space;
#endif
@ -3243,7 +3243,7 @@ fil_load_single_table_tablespace(
/* Every .ibd file is created >= 4 pages in size. Smaller files
cannot be ok. */
size = (((ib_longlong)size_high) << 32) + (ib_longlong)size_low;
size = (((ib_int64_t)size_high) << 32) + (ib_int64_t)size_low;
#ifndef UNIV_HOTBACKUP
if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
fprintf(stderr,
@ -3582,7 +3582,7 @@ fil_tablespace_deleted_or_being_deleted_in_mem(
/* out: TRUE if does not exist or is being\
deleted */
ulint id, /* in: space id */
ib_longlong version)/* in: tablespace_version should be this; if
ib_int64_t version)/* in: tablespace_version should be this; if
you pass -1 as the value of this, then this
parameter is ignored */
{
@ -3601,7 +3601,7 @@ fil_tablespace_deleted_or_being_deleted_in_mem(
return(TRUE);
}
if (version != ((ib_longlong)-1)
if (version != ((ib_int64_t)-1)
&& space->tablespace_version != version) {
mutex_exit(&(system->mutex));
@ -4529,7 +4529,7 @@ fil_flush(
fil_space_t* space;
fil_node_t* node;
os_file_t file;
ib_longlong old_mod_counter;
ib_int64_t old_mod_counter;
mutex_enter(&(system->mutex));

14
handler/ha_innodb.cc
View file

@ -2029,7 +2029,7 @@ retry:
}
trx->mysql_log_file_name = mysql_bin_log_file_name();
trx->mysql_log_offset = (ib_longlong) mysql_bin_log_file_pos();
trx->mysql_log_offset = (ib_int64_t) mysql_bin_log_file_pos();
innobase_commit_low(trx);
@ -2171,7 +2171,7 @@ innobase_rollback_to_savepoint(
whose transaction should be rolled back */
void* savepoint) /* in: savepoint data */
{
ib_longlong mysql_binlog_cache_pos;
ib_int64_t mysql_binlog_cache_pos;
int error = 0;
trx_t* trx;
char name[64];
@ -2269,7 +2269,7 @@ innobase_savepoint(
char name[64];
longlong2str((ulint)savepoint,name,36);
error = (int) trx_savepoint_for_mysql(trx, name, (ib_longlong)0);
error = (int) trx_savepoint_for_mysql(trx, name, (ib_int64_t)0);
DBUG_RETURN(convert_error_code_to_mysql(error, 0, NULL));
}
@ -5250,7 +5250,7 @@ ha_innobase::create(
char name2[FN_REFLEN];
char norm_name[FN_REFLEN];
THD* thd = ha_thd();
ib_longlong auto_inc_value;
ib_int64_t auto_inc_value;
ulint flags;
/* Cache the value of innodb_file_format, in case it is
modified by another thread while the table is being created. */
@ -5953,7 +5953,7 @@ ha_innobase::records_in_range(
+ table->s->max_key_length + 100;
dtuple_t* range_start;
dtuple_t* range_end;
ib_longlong n_rows;
ib_int64_t n_rows;
ulint mode1;
ulint mode2;
mem_heap_t* heap;
@ -6156,7 +6156,7 @@ ha_innobase::info(
dict_table_t* ib_table;
dict_index_t* index;
ha_rows rec_per_key;
ib_longlong n_rows;
ib_int64_t n_rows;
ulong j;
ulong i;
char path[FN_REFLEN];
@ -8108,7 +8108,7 @@ UNIV_INTERN
ulonglong
ha_innobase::get_mysql_bin_log_pos()
{
/* trx... is ib_longlong, which is a typedef for a 64-bit integer
/* trx... is ib_int64_t, which is a typedef for a 64-bit integer
(__int64 or longlong) so it's ok to cast it to ulonglong. */
return(trx_sys_mysql_bin_log_pos);

6
ibuf/ibuf0ibuf.c
View file

@ -1999,7 +1999,7 @@ ibuf_get_merge_page_nos(
rec_t* rec, /* in: record from which we read up and down
in the chain of records */
ulint* space_ids,/* in/out: space id's of the pages */
ib_longlong* space_versions,/* in/out: tablespace version
ib_int64_t* space_versions,/* in/out: tablespace version
timestamps; used to prevent reading in old
pages after DISCARD + IMPORT tablespace */
ulint* page_nos,/* in/out: buffer for at least
@ -2178,7 +2178,7 @@ ibuf_contract_ext(
ibool all_trees_empty;
ulint page_nos[IBUF_MAX_N_PAGES_MERGED];
ulint space_ids[IBUF_MAX_N_PAGES_MERGED];
ib_longlong space_versions[IBUF_MAX_N_PAGES_MERGED];
ib_int64_t space_versions[IBUF_MAX_N_PAGES_MERGED];
ulint n_stored;
ulint sum_sizes;
mtr_t mtr;
@ -2636,7 +2636,7 @@ ibuf_insert_low(
ulint err;
ibool do_merge;
ulint space_ids[IBUF_MAX_N_PAGES_MERGED];
ib_longlong space_versions[IBUF_MAX_N_PAGES_MERGED];
ib_int64_t space_versions[IBUF_MAX_N_PAGES_MERGED];
ulint page_nos[IBUF_MAX_N_PAGES_MERGED];
ulint n_stored;
ulint bits;

2
include/btr0cur.h
View file

@ -421,7 +421,7 @@ btr_cur_parse_del_mark_set_sec_rec(
/***********************************************************************
Estimates the number of rows in a given index range. */
UNIV_INTERN
ib_longlong
ib_int64_t
btr_estimate_n_rows_in_range(
/*=========================*/
/* out: estimated number of rows */

2
include/buf0buf.h
View file

@ -909,7 +909,7 @@ buf_page_init_for_read(
ulint space, /* in: space id */
ulint zip_size,/* in: compressed page size, or 0 */
ibool unzip, /* in: TRUE=request uncompressed page */
ib_longlong tablespace_version,/* in: prevents reading from a wrong
ib_int64_t tablespace_version,/* in: prevents reading from a wrong
version of the tablespace in case we have done
DISCARD + IMPORT */
ulint offset);/* in: page number */

2
include/buf0rea.h
View file

@ -73,7 +73,7 @@ buf_read_ibuf_merge_pages(
to get read in, before this
function returns */
const ulint* space_ids, /* in: array of space ids */
const ib_longlong* space_versions,/* in: the spaces must have
const ib_int64_t* space_versions,/* in: the spaces must have
this version number
(timestamp), otherwise we
discard the read; we use this

6
include/dict0dict.h
View file

@ -179,12 +179,12 @@ void
dict_table_autoinc_initialize(
/*==========================*/
dict_table_t* table, /* in/out: table */
ib_ulonglong value); /* in: next value to assign to a row */
ib_uint64_t value); /* in: next value to assign to a row */
/************************************************************************
Reads the next autoinc value (== autoinc counter value), 0 if not yet
initialized. */
UNIV_INTERN
ib_ulonglong
ib_uint64_t
dict_table_autoinc_read(
/*====================*/
/* out: value for a new row, or 0 */
@ -198,7 +198,7 @@ dict_table_autoinc_update(
/*======================*/
dict_table_t* table, /* in/out: table */
ib_ulonglong value); /* in: value which was assigned to a row */
ib_uint64_t value); /* in: value which was assigned to a row */
/************************************************************************
Release the autoinc lock.*/
UNIV_INTERN

8
include/dict0mem.h
View file

@ -246,7 +246,7 @@ struct dict_index_struct{
indexes;/* list of indexes of the table */
btr_search_t* search_info; /* info used in optimistic searches */
/*----------------------*/
ib_longlong* stat_n_diff_key_vals;
ib_int64_t* stat_n_diff_key_vals;
/* approximate number of different key values
for this index, for each n-column prefix
where n <= dict_get_n_unique(index); we
@ -417,7 +417,7 @@ struct dict_table_struct{
unsigned stat_initialized:1; /* TRUE if statistics have
been calculated the first time
after database startup or table creation */
ib_longlong stat_n_rows;
ib_int64_t stat_n_rows;
/* approximate number of rows in the table;
we periodically calculate new estimates */
ulint stat_clustered_index_size;
@ -445,9 +445,9 @@ struct dict_table_struct{
/* TRUE if the autoinc counter has been
inited; MySQL gets the init value by executing
SELECT MAX(auto inc column) */
ib_ulonglong autoinc;/* autoinc counter value to give to the
ib_uint64_t autoinc;/* autoinc counter value to give to the
next inserted row */
ib_longlong autoinc_increment;
ib_int64_t autoinc_increment;
/* The increment step of the auto increment
column. Value must be greater than or equal
to 1 */

4
include/fil0fil.h
View file

@ -133,7 +133,7 @@ extern ulint fil_n_pending_tablespace_flushes;
/***********************************************************************
Returns the version number of a tablespace, -1 if not found. */
UNIV_INTERN
ib_longlong
ib_int64_t
fil_space_get_version(
/*==================*/
/* out: version number, -1 if the tablespace does not
@ -503,7 +503,7 @@ fil_tablespace_deleted_or_being_deleted_in_mem(
/* out: TRUE if does not exist or is being\
deleted */
ulint id, /* in: space id */
ib_longlong version);/* in: tablespace_version should be this; if
ib_int64_t version);/* in: tablespace_version should be this; if
you pass -1 as the value of this, then this
parameter is ignored */
/***********************************************************************

4
include/log0log.h
View file

@ -46,7 +46,7 @@ ulint
log_calc_where_lsn_is(
/*==================*/
/* out: log file number */
ib_longlong* log_file_offset, /* out: offset in that file
ib_int64_t* log_file_offset, /* out: offset in that file
(including the header) */
ib_uint64_t first_header_lsn, /* in: first log file start
lsn */
@ -54,7 +54,7 @@ log_calc_where_lsn_is(
determine */
ulint n_log_files, /* in: total number of log
files */
ib_longlong log_file_size); /* in: log file size
ib_int64_t log_file_size); /* in: log file size
(including the header) */
/****************************************************************
Writes to the log the string given. The log must be released with

6
include/os0file.h
View file

@ -159,7 +159,7 @@ bigger than 4000 bytes */
struct os_file_stat_struct{
char name[OS_FILE_MAX_PATH]; /* path to a file */
os_file_type_t type; /* file type */
ib_longlong size; /* file size */
ib_int64_t size; /* file size */
time_t ctime; /* creation time */
time_t mtime; /* modification time */
time_t atime; /* access time */
@ -385,9 +385,9 @@ os_file_get_size(
size */
ulint* size_high);/* out: most significant 32 bits of size */
/***************************************************************************
Gets file size as a 64-bit integer ib_longlong. */
Gets file size as a 64-bit integer ib_int64_t. */
UNIV_INTERN
ib_longlong
ib_int64_t
os_file_get_size_as_iblonglong(
/*===========================*/
/* out: size in bytes, -1 if error */

6
include/os0sync.h
View file

@ -40,7 +40,7 @@ struct os_event_struct {
in the signaled state, i.e., a thread
does not stop if it tries to wait for
this event */
ib_longlong signal_count; /* this is incremented each time
ib_int64_t signal_count; /* this is incremented each time
the event becomes signaled */
pthread_cond_t cond_var; /* condition variable is used in
waiting for the event */
@ -118,7 +118,7 @@ that this thread should not wait in case of an intervening call to
os_event_set() between this os_event_reset() and the
os_event_wait_low() call. See comments for os_event_wait_low(). */
UNIV_INTERN
ib_longlong
ib_int64_t
os_event_reset(
/*===========*/
os_event_t event); /* in: event to reset */
@ -155,7 +155,7 @@ void
os_event_wait_low(
/*==============*/
os_event_t event, /* in: event to wait */
ib_longlong reset_sig_count);/* in: zero or the value
ib_int64_t reset_sig_count);/* in: zero or the value
returned by previous call of
os_event_reset(). */

2
include/row0sel.h
View file

@ -181,7 +181,7 @@ row_search_max_autoinc(
error code */
dict_index_t* index, /* in: index to search */
const char* col_name, /* in: autoinc column name */
ib_ulonglong* value); /* out: AUTOINC value read */
ib_uint64_t* value); /* out: AUTOINC value read */
/* A structure for caching column values for prefetched rows */
struct sel_buf_struct{

2
include/srv0srv.h
View file

@ -538,7 +538,7 @@ struct export_var_struct{
ulint innodb_pages_written;
ulint innodb_row_lock_waits;
ulint innodb_row_lock_current_waits;
ib_longlong innodb_row_lock_time;
ib_int64_t innodb_row_lock_time;
ulint innodb_row_lock_time_avg;
ulint innodb_row_lock_time_max;
ulint innodb_rows_read;

6
include/trx0roll.h
View file

@ -200,7 +200,7 @@ trx_rollback_to_savepoint_for_mysql(
otherwise DB_SUCCESS */
trx_t* trx, /* in: transaction handle */
const char* savepoint_name, /* in: savepoint name */
ib_longlong* mysql_binlog_cache_pos);/* out: the MySQL binlog cache
ib_int64_t* mysql_binlog_cache_pos);/* out: the MySQL binlog cache
position corresponding to this
savepoint; MySQL needs this
information to remove the
@ -218,7 +218,7 @@ trx_savepoint_for_mysql(
/* out: always DB_SUCCESS */
trx_t* trx, /* in: transaction handle */
const char* savepoint_name, /* in: savepoint name */
ib_longlong binlog_cache_pos); /* in: MySQL binlog cache
ib_int64_t binlog_cache_pos); /* in: MySQL binlog cache
position corresponding to this
connection at the time of the
savepoint */
@ -280,7 +280,7 @@ struct trx_named_savept_struct{
char* name; /* savepoint name */
trx_savept_t savept; /* the undo number corresponding to
the savepoint */
ib_longlong mysql_binlog_cache_pos;
ib_int64_t mysql_binlog_cache_pos;
/* the MySQL binlog cache position
corresponding to this savepoint, not
defined if the MySQL binlogging is not

6
include/trx0sys.h
View file

@ -31,7 +31,7 @@ up to this position. If .._pos is -1, it means no crash recovery was needed,
or there was no master log position info inside InnoDB. */
extern char trx_sys_mysql_master_log_name[];
extern ib_longlong trx_sys_mysql_master_log_pos;
extern ib_int64_t trx_sys_mysql_master_log_pos;
/* If this MySQL server uses binary logging, after InnoDB has been inited
and if it has done a crash recovery, we store the binlog file name and position
@ -39,7 +39,7 @@ here. If .._pos is -1, it means there was no binlog position info inside
InnoDB. */
extern char trx_sys_mysql_bin_log_name[];
extern ib_longlong trx_sys_mysql_bin_log_pos;
extern ib_int64_t trx_sys_mysql_bin_log_pos;
/* The transaction system */
extern trx_sys_t* trx_sys;
@ -268,7 +268,7 @@ void
trx_sys_update_mysql_binlog_offset(
/*===============================*/
const char* file_name,/* in: MySQL log file name */
ib_longlong offset, /* in: position in that log file */
ib_int64_t offset, /* in: position in that log file */
ulint field, /* in: offset of the MySQL log info field in
the trx sys header */
mtr_t* mtr); /* in: mtr */

2
include/trx0trx.h
View file

@ -559,7 +559,7 @@ struct trx_struct{
contains a pointer to the latest file
name; this is NULL if binlog is not
used */
ib_longlong mysql_log_offset;/* if MySQL binlog is used, this field
ib_int64_t mysql_log_offset;/* if MySQL binlog is used, this field
contains the end offset of the binlog
entry */
os_thread_id_t mysql_thread_id;/* id of the MySQL thread associated

6
include/univ.i
View file

@ -251,14 +251,12 @@ typedef long int lint;
#endif
#ifdef __WIN__
typedef __int64 ib_longlong;
typedef __int64 ib_int64_t;
typedef unsigned __int64 ib_uint64_t;
typedef unsigned __int64 ib_ulonglong;
#else
/* Note: longlong and ulonglong come from MySQL headers. */
typedef longlong ib_longlong;
typedef longlong ib_int64_t;
typedef ulonglong ib_uint64_t;
typedef ulonglong ib_ulonglong;
#endif
typedef unsigned long long int ullint;

6
include/ut0byte.h
View file

@ -55,13 +55,13 @@ ut_dulint_get_low(
/* out: 32 bits in ulint */
dulint d); /* in: dulint */
/***********************************************************
Converts a dulint (a struct of 2 ulints) to ib_longlong, which is a 64-bit
Converts a dulint (a struct of 2 ulints) to ib_int64_t, which is a 64-bit
integer type. */
UNIV_INLINE
ib_longlong
ib_int64_t
ut_conv_dulint_to_longlong(
/*=======================*/
/* out: value in ib_longlong type */
/* out: value in ib_int64_t type */
dulint d); /* in: dulint */
/***********************************************************
Tests if a dulint is zero. */

10
include/ut0byte.ic
View file

@ -52,17 +52,17 @@ ut_dulint_get_low(
}
/***********************************************************
Converts a dulint (a struct of 2 ulints) to ib_longlong, which is a 64-bit
Converts a dulint (a struct of 2 ulints) to ib_int64_t, which is a 64-bit
integer type. */
UNIV_INLINE
ib_longlong
ib_int64_t
ut_conv_dulint_to_longlong(
/*=======================*/
/* out: value in ib_longlong type */
/* out: value in ib_int64_t type */
dulint d) /* in: dulint */
{
return((ib_longlong)d.low
+ (((ib_longlong)d.high) << 32));
return((ib_int64_t)d.low
+ (((ib_int64_t)d.high) << 32));
}
/***********************************************************

30
log/log0log.c
View file

@ -505,10 +505,10 @@ log_group_calc_lsn_offset(
log_group_t* group) /* in: log group */
{
ib_uint64_t gr_lsn;
ib_longlong gr_lsn_size_offset;
ib_longlong difference;
ib_longlong group_size;
ib_longlong offset;
ib_int64_t gr_lsn_size_offset;
ib_int64_t difference;
ib_int64_t group_size;
ib_int64_t offset;
ut_ad(mutex_own(&(log_sys->mutex)));
@ -517,16 +517,16 @@ log_group_calc_lsn_offset(
gr_lsn = group->lsn;
gr_lsn_size_offset = (ib_longlong)
gr_lsn_size_offset = (ib_int64_t)
log_group_calc_size_offset(group->lsn_offset, group);
group_size = (ib_longlong) log_group_get_capacity(group);
group_size = (ib_int64_t) log_group_get_capacity(group);
if (lsn >= gr_lsn) {
difference = (ib_longlong) (lsn - gr_lsn);
difference = (ib_int64_t) (lsn - gr_lsn);
} else {
difference = (ib_longlong) (gr_lsn - lsn);
difference = (ib_int64_t) (gr_lsn - lsn);
difference = difference % group_size;
@ -535,7 +535,7 @@ log_group_calc_lsn_offset(
offset = (gr_lsn_size_offset + difference) % group_size;
ut_a(offset < (((ib_longlong) 1) << 32)); /* offset must be < 4 GB */
ut_a(offset < (((ib_int64_t) 1) << 32)); /* offset must be < 4 GB */
/* fprintf(stderr,
"Offset is %lu gr_lsn_offset is %lu difference is %lu\n",
@ -552,7 +552,7 @@ ulint
log_calc_where_lsn_is(
/*==================*/
/* out: log file number */
ib_longlong* log_file_offset, /* out: offset in that file
ib_int64_t* log_file_offset, /* out: offset in that file
(including the header) */
ib_uint64_t first_header_lsn, /* in: first log file start
lsn */
@ -560,18 +560,18 @@ log_calc_where_lsn_is(
determine */
ulint n_log_files, /* in: total number of log
files */
ib_longlong log_file_size) /* in: log file size
ib_int64_t log_file_size) /* in: log file size
(including the header) */
{
ib_longlong capacity = log_file_size - LOG_FILE_HDR_SIZE;
ib_int64_t capacity = log_file_size - LOG_FILE_HDR_SIZE;
ulint file_no;
ib_longlong add_this_many;
ib_int64_t add_this_many;
if (lsn < first_header_lsn) {
add_this_many = 1 + (first_header_lsn - lsn)
/ (capacity * (ib_longlong)n_log_files);
/ (capacity * (ib_int64_t)n_log_files);
lsn += add_this_many
* capacity * (ib_longlong)n_log_files;
* capacity * (ib_int64_t)n_log_files;
}
ut_a(lsn >= first_header_lsn);

30
os/os0file.c
View file

@ -680,8 +680,8 @@ next_file:
strcpy(info->name, (char *) lpFindFileData->cFileName);
info->size = (ib_longlong)(lpFindFileData->nFileSizeLow)
+ (((ib_longlong)(lpFindFileData->nFileSizeHigh))
info->size = (ib_int64_t)(lpFindFileData->nFileSizeLow)
+ (((ib_int64_t)(lpFindFileData->nFileSizeHigh))
<< 32);
if (lpFindFileData->dwFileAttributes
@ -781,7 +781,7 @@ next_file:
return(-1);
}
info->size = (ib_longlong)statinfo.st_size;
info->size = (ib_int64_t)statinfo.st_size;
if (S_ISDIR(statinfo.st_mode)) {
info->type = OS_FILE_TYPE_DIR;
@ -1669,9 +1669,9 @@ os_file_get_size(
}
/***************************************************************************
Gets file size as a 64-bit integer ib_longlong. */
Gets file size as a 64-bit integer ib_int64_t. */
UNIV_INTERN
ib_longlong
ib_int64_t
os_file_get_size_as_iblonglong(
/*===========================*/
/* out: size in bytes, -1 if error */
@ -1688,7 +1688,7 @@ os_file_get_size_as_iblonglong(
return(-1);
}
return((((ib_longlong)size_high) << 32) + (ib_longlong)size);
return((((ib_int64_t)size_high) << 32) + (ib_int64_t)size);
}
/***************************************************************************
@ -1705,8 +1705,8 @@ os_file_set_size(
size */
ulint size_high)/* in: most significant 32 bits of size */
{
ib_longlong current_size;
ib_longlong desired_size;
ib_int64_t current_size;
ib_int64_t desired_size;
ibool ret;
byte* buf;
byte* buf2;
@ -1715,7 +1715,7 @@ os_file_set_size(
ut_a(size == (size & 0xFFFFFFFF));
current_size = 0;
desired_size = (ib_longlong)size + (((ib_longlong)size_high) << 32);
desired_size = (ib_int64_t)size + (((ib_int64_t)size_high) << 32);
/* Write up to 1 megabyte at a time. */
buf_size = ut_min(64, (ulint) (desired_size / UNIV_PAGE_SIZE))
@ -1728,7 +1728,7 @@ os_file_set_size(
/* Write buffer full of zeros */
memset(buf, 0, buf_size);
if (desired_size >= (ib_longlong)(100 * 1024 * 1024)) {
if (desired_size >= (ib_int64_t)(100 * 1024 * 1024)) {
fprintf(stderr, "InnoDB: Progress in MB:");
}
@ -1736,7 +1736,7 @@ os_file_set_size(
while (current_size < desired_size) {
ulint n_bytes;
if (desired_size - current_size < (ib_longlong) buf_size) {
if (desired_size - current_size < (ib_int64_t) buf_size) {
n_bytes = (ulint) (desired_size - current_size);
} else {
n_bytes = buf_size;
@ -1752,18 +1752,18 @@ os_file_set_size(
}
/* Print about progress for each 100 MB written */
if ((ib_longlong) (current_size + n_bytes) / (ib_longlong)(100 * 1024 * 1024)
!= current_size / (ib_longlong)(100 * 1024 * 1024)) {
if ((ib_int64_t) (current_size + n_bytes) / (ib_int64_t)(100 * 1024 * 1024)
!= current_size / (ib_int64_t)(100 * 1024 * 1024)) {
fprintf(stderr, " %lu00",
(ulong) ((current_size + n_bytes)
/ (ib_longlong)(100 * 1024 * 1024)));
/ (ib_int64_t)(100 * 1024 * 1024)));
}
current_size += n_bytes;
}
if (desired_size >= (ib_longlong)(100 * 1024 * 1024)) {
if (desired_size >= (ib_int64_t)(100 * 1024 * 1024)) {
fprintf(stderr, "\n");
}

8
os/os0sync.c
View file

@ -259,13 +259,13 @@ that this thread should not wait in case of an intervening call to
os_event_set() between this os_event_reset() and the
os_event_wait_low() call. See comments for os_event_wait_low(). */
UNIV_INTERN
ib_longlong
ib_int64_t
os_event_reset(
/*===========*/
/* out: current signal_count. */
os_event_t event) /* in: event to reset */
{
ib_longlong ret = 0;
ib_int64_t ret = 0;
#ifdef __WIN__
ut_a(event);
@ -374,7 +374,7 @@ void
os_event_wait_low(
/*==============*/
os_event_t event, /* in: event to wait */
ib_longlong reset_sig_count)/* in: zero or the value
ib_int64_t reset_sig_count)/* in: zero or the value
returned by previous call of
os_event_reset(). */
{
@ -394,7 +394,7 @@ os_event_wait_low(
os_thread_exit(NULL);
}
#else
ib_longlong old_signal_count;
ib_int64_t old_signal_count;
os_fast_mutex_lock(&(event->os_mutex));

2
row/row0mysql.c
View file

@ -836,7 +836,7 @@ row_update_statistics_if_needed(
a counter table which is very small and updated very often. */
if (counter > 2000000000
|| ((ib_longlong)counter > 16 + table->stat_n_rows / 16)) {
|| ((ib_int64_t)counter > 16 + table->stat_n_rows / 16)) {
dict_update_statistics(table);
}

8
row/row0sel.c
View file

@ -4656,7 +4656,7 @@ row_search_check_if_query_cache_permitted(
Read the AUTOINC column from the current row. If the value is less than
0 and the type is not unsigned then we reset the value to 0. */
static
ib_ulonglong
ib_uint64_t
row_search_autoinc_read_column(
/*===========================*/
/* out: value read from the column */
@ -4667,7 +4667,7 @@ row_search_autoinc_read_column(
{
ulint len;
const byte* data;
ib_ulonglong value;
ib_uint64_t value;
mem_heap_t* heap = NULL;
ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_;
@ -4688,7 +4688,7 @@ row_search_autoinc_read_column(
mem_heap_free(heap);
}
if (!unsigned_type && (ib_longlong) value < 0) {
if (!unsigned_type && (ib_int64_t) value < 0) {
value = 0;
}
@ -4727,7 +4727,7 @@ row_search_max_autoinc(
column name can't be found in index */
dict_index_t* index, /* in: index to search */
const char* col_name, /* in: name of autoinc column */
ib_ulonglong* value) /* out: AUTOINC value read */
ib_uint64_t* value) /* out: AUTOINC value read */
{
ulint i;
ulint n_cols;

10
srv/srv0srv.c
View file

@ -334,7 +334,7 @@ static ulint srv_n_rows_read_old = 0;
UNIV_INTERN ulint srv_n_lock_wait_count = 0;
UNIV_INTERN ulint srv_n_lock_wait_current_count = 0;
UNIV_INTERN ib_longlong srv_n_lock_wait_time = 0;
UNIV_INTERN ib_int64_t srv_n_lock_wait_time = 0;
UNIV_INTERN ulint srv_n_lock_max_wait_time = 0;
@ -1363,8 +1363,8 @@ srv_suspend_mysql_thread(
trx_t* trx;
ulint had_dict_lock;
ibool was_declared_inside_innodb = FALSE;
ib_longlong start_time = 0;
ib_longlong finish_time;
ib_int64_t start_time = 0;
ib_int64_t finish_time;
ulint diff_time;
ulint sec;
ulint ms;
@ -1414,7 +1414,7 @@ srv_suspend_mysql_thread(
srv_n_lock_wait_current_count++;
ut_usectime(&sec, &ms);
start_time = (ib_longlong)sec * 1000000 + ms;
start_time = (ib_int64_t)sec * 1000000 + ms;
}
/* Wake the lock timeout monitor thread, if it is suspended */
@ -1478,7 +1478,7 @@ srv_suspend_mysql_thread(
if (thr->lock_state == QUE_THR_LOCK_ROW) {
ut_usectime(&sec, &ms);
finish_time = (ib_longlong)sec * 1000000 + ms;
finish_time = (ib_int64_t)sec * 1000000 + ms;
diff_time = (ulint) (finish_time - start_time);

4
sync/sync0arr.c
View file

@ -70,7 +70,7 @@ struct sync_cell_struct {
ibool waiting; /* TRUE if the thread has already
called sync_array_event_wait
on this cell */
ib_longlong signal_count; /* We capture the signal_count
ib_int64_t signal_count; /* We capture the signal_count
of the wait_object when we
reset the event. This value is
then passed on to os_event_wait
@ -297,7 +297,7 @@ sync_array_validate(
/***********************************************************************
Puts the cell event in reset state. */
static
ib_longlong
ib_int64_t
sync_cell_event_reset(
/*==================*/
/* out: value of signal_count

8
sync/sync0sync.c
View file

@ -418,7 +418,7 @@ mutex_spin_wait(
ulint index; /* index of the reserved wait cell */
ulint i; /* spin round count */
#if defined UNIV_DEBUG && !defined UNIV_HOTBACKUP
ib_longlong lstart_time = 0, lfinish_time; /* for timing os_wait */
ib_int64_t lstart_time = 0, lfinish_time; /* for timing os_wait */
ulint ltime_diff;
ulint sec;
ulint ms;
@ -455,7 +455,7 @@ spin_loop:
mutex->count_os_yield++;
if (timed_mutexes == 1 && timer_started==0) {
ut_usectime(&sec, &ms);
lstart_time= (ib_longlong)sec * 1000000 + ms;
lstart_time= (ib_int64_t)sec * 1000000 + ms;
timer_started = 1;
}
#endif /* UNIV_DEBUG && !UNIV_HOTBACKUP */
@ -561,7 +561,7 @@ spin_loop:
if (timed_mutexes == 1 && timer_started==0) {
ut_usectime(&sec, &ms);
lstart_time= (ib_longlong)sec * 1000000 + ms;
lstart_time= (ib_int64_t)sec * 1000000 + ms;
timer_started = 1;
}
# endif /* UNIV_DEBUG */
@ -574,7 +574,7 @@ finish_timing:
#if defined UNIV_DEBUG && !defined UNIV_HOTBACKUP
if (timed_mutexes == 1 && timer_started==1) {
ut_usectime(&sec, &ms);
lfinish_time= (ib_longlong)sec * 1000000 + ms;
lfinish_time= (ib_int64_t)sec * 1000000 + ms;
ltime_diff= (ulint) (lfinish_time - lstart_time);
mutex->lspent_time += ltime_diff;

8
trx/trx0roll.c
View file

@ -35,7 +35,7 @@ static trx_t* trx_roll_crash_recv_trx = NULL;
/* In crash recovery we set this to the undo n:o of the current trx to be
rolled back. Then we can print how many % the rollback has progressed. */
static ib_longlong trx_roll_max_undo_no;
static ib_int64_t trx_roll_max_undo_no;
/* Auxiliary variable which tells the previous progress % we printed */
static ulint trx_roll_progress_printed_pct;
@ -217,7 +217,7 @@ trx_rollback_to_savepoint_for_mysql(
otherwise DB_SUCCESS */
trx_t* trx, /* in: transaction handle */
const char* savepoint_name, /* in: savepoint name */
ib_longlong* mysql_binlog_cache_pos) /* out: the MySQL binlog cache
ib_int64_t* mysql_binlog_cache_pos) /* out: the MySQL binlog cache
position corresponding to this
savepoint; MySQL needs this
information to remove the
@ -282,7 +282,7 @@ trx_savepoint_for_mysql(
/* out: always DB_SUCCESS */
trx_t* trx, /* in: transaction handle */
const char* savepoint_name, /* in: savepoint name */
ib_longlong binlog_cache_pos) /* in: MySQL binlog cache
ib_int64_t binlog_cache_pos) /* in: MySQL binlog cache
position corresponding to this
connection at the time of the
savepoint */
@ -402,7 +402,7 @@ trx_rollback_active(
que_thr_t* thr;
roll_node_t* roll_node;
dict_table_t* table;
ib_longlong rows_to_undo;
ib_int64_t rows_to_undo;
const char* unit = "";
ibool dictionary_locked = FALSE;

16
trx/trx0sys.c
View file

@ -43,7 +43,7 @@ up to this position. If .._pos is -1, it means no crash recovery was needed,
or there was no master log position info inside InnoDB. */
UNIV_INTERN char trx_sys_mysql_master_log_name[TRX_SYS_MYSQL_LOG_NAME_LEN];
UNIV_INTERN ib_longlong trx_sys_mysql_master_log_pos = -1;
UNIV_INTERN ib_int64_t trx_sys_mysql_master_log_pos = -1;
/* If this MySQL server uses binary logging, after InnoDB has been inited
and if it has done a crash recovery, we store the binlog file name and position
@ -51,7 +51,7 @@ here. If .._pos is -1, it means there was no binlog position info inside
InnoDB. */
UNIV_INTERN char trx_sys_mysql_bin_log_name[TRX_SYS_MYSQL_LOG_NAME_LEN];
UNIV_INTERN ib_longlong trx_sys_mysql_bin_log_pos = -1;
UNIV_INTERN ib_int64_t trx_sys_mysql_bin_log_pos = -1;
/********************************************************************
@ -605,7 +605,7 @@ void
trx_sys_update_mysql_binlog_offset(
/*===============================*/
const char* file_name,/* in: MySQL log file name */
ib_longlong offset, /* in: position in that log file */
ib_int64_t offset, /* in: position in that log file */
ulint field, /* in: offset of the MySQL log info field in
the trx sys header */
mtr_t* mtr) /* in: mtr */
@ -725,8 +725,8 @@ trx_sys_print_mysql_binlog_offset(void)
+ TRX_SYS_MYSQL_LOG_OFFSET_LOW);
trx_sys_mysql_bin_log_pos
= (((ib_longlong)trx_sys_mysql_bin_log_pos_high) << 32)
+ (ib_longlong)trx_sys_mysql_bin_log_pos_low;
= (((ib_int64_t)trx_sys_mysql_bin_log_pos_high) << 32)
+ (ib_int64_t)trx_sys_mysql_bin_log_pos_low;
ut_memcpy(trx_sys_mysql_bin_log_name,
sys_header + TRX_SYS_MYSQL_LOG_INFO
@ -786,10 +786,10 @@ trx_sys_print_mysql_master_log_pos(void)
TRX_SYS_MYSQL_LOG_NAME_LEN);
trx_sys_mysql_master_log_pos
= (((ib_longlong) mach_read_from_4(
= (((ib_int64_t) mach_read_from_4(
sys_header + TRX_SYS_MYSQL_MASTER_LOG_INFO
+ TRX_SYS_MYSQL_LOG_OFFSET_HIGH)) << 32)
+ ((ib_longlong) mach_read_from_4(
+ ((ib_int64_t) mach_read_from_4(
sys_header + TRX_SYS_MYSQL_MASTER_LOG_INFO
+ TRX_SYS_MYSQL_LOG_OFFSET_LOW));
mtr_commit(&mtr);
@ -912,7 +912,7 @@ trx_sys_init_at_db_start(void)
/*==========================*/
{
trx_sysf_t* sys_header;
ib_longlong rows_to_undo = 0;
ib_int64_t rows_to_undo = 0;
const char* unit = "";
trx_t* trx;
mtr_t mtr;

10
ut/ut0ut.c
View file

@ -29,7 +29,7 @@ UNIV_INTERN ibool ut_always_false = FALSE;
NOTE: The Windows epoch starts from 1601/01/01 whereas the Unix
epoch starts from 1970/1/1. For selection of constant see:
http://support.microsoft.com/kb/167296/ */
#define WIN_TO_UNIX_DELTA_USEC ((ib_longlong) 11644473600000000ULL)
#define WIN_TO_UNIX_DELTA_USEC ((ib_int64_t) 11644473600000000ULL)
/*********************************************************************
@ -43,7 +43,7 @@ ut_gettimeofday(
void* tz) /* in: not used */
{
FILETIME ft;
ib_longlong tm;
ib_int64_t tm;
if (!tv) {
errno = EINVAL;
@ -52,7 +52,7 @@ ut_gettimeofday(
GetSystemTimeAsFileTime(&ft);
tm = (ib_longlong) ft.dwHighDateTime << 32;
tm = (ib_int64_t) ft.dwHighDateTime << 32;
tm |= ft.dwLowDateTime;
ut_a(tm >= 0); /* If tm wraps over to negative, the quotient / 10
@ -84,9 +84,9 @@ ut_get_high32(
/* out: a >> 32 */
ulint a) /* in: ulint */
{
ib_longlong i;
ib_int64_t i;
i = (ib_longlong)a;
i = (ib_int64_t)a;
i = i >> 32;