Skip to content

Commit ff6f4d7

Browse files
committed
Windows : Fix compiling with VS2013
We do not use it now, but there is still no reason to break compilation for other users.
1 parent c51fc67 commit ff6f4d7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

storage/xtradb/btr/btr0cur.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3863,7 +3863,7 @@ static const unsigned rows_in_range_max_retries = 4;
38633863
/** We pretend that a range has that many records if the tree keeps changing
38643864
for rows_in_range_max_retries retries while we try to estimate the records
38653865
in a given range. */
3866-
static const int64_t rows_in_range_arbitrary_ret_val = 10;
3866+
static const ib_int64_t rows_in_range_arbitrary_ret_val = 10;
38673867

38683868
/** Estimates the number of rows in a given index range.
38693869
@param[in] index index
@@ -3881,7 +3881,7 @@ rows_in_range_arbitrary_ret_val as a result (if
38813881
nth_attempt >= rows_in_range_max_retries and the tree is modified between
38823882
the two dives). */
38833883
static
3884-
int64_t
3884+
ib_int64_t
38853885
btr_estimate_n_rows_in_range_low(
38863886
dict_index_t* index,
38873887
const dtuple_t* tuple1,
@@ -4017,7 +4017,7 @@ btr_estimate_n_rows_in_range_low(
40174017
return(rows_in_range_arbitrary_ret_val);
40184018
}
40194019

4020-
const int64_t ret =
4020+
const ib_int64_t ret =
40214021
btr_estimate_n_rows_in_range_low(
40224022
index, tuple1, mode1,
40234023
tuple2, mode2, trx,
@@ -4083,7 +4083,7 @@ btr_estimate_n_rows_in_range_low(
40834083
@param[in] mode2 search mode for range end
40844084
@param[in] trx trx
40854085
@return estimated number of rows */
4086-
int64_t
4086+
ib_int64_t
40874087
btr_estimate_n_rows_in_range(
40884088
dict_index_t* index,
40894089
const dtuple_t* tuple1,
@@ -4092,7 +4092,7 @@ btr_estimate_n_rows_in_range(
40924092
ulint mode2,
40934093
trx_t* trx)
40944094
{
4095-
const int64_t ret = btr_estimate_n_rows_in_range_low(
4095+
const ib_int64_t ret = btr_estimate_n_rows_in_range_low(
40964096
index, tuple1, mode1, tuple2, mode2, trx,
40974097
1 /* first attempt */);
40984098

0 commit comments

Comments
 (0)