Commit ff6f4d7d authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Windows : Fix compiling with VS2013

We do not use it now, but there is still no reason to break compilation
for other users.
parent c51fc679
...@@ -3863,7 +3863,7 @@ static const unsigned rows_in_range_max_retries = 4; ...@@ -3863,7 +3863,7 @@ static const unsigned rows_in_range_max_retries = 4;
/** We pretend that a range has that many records if the tree keeps changing /** We pretend that a range has that many records if the tree keeps changing
for rows_in_range_max_retries retries while we try to estimate the records for rows_in_range_max_retries retries while we try to estimate the records
in a given range. */ in a given range. */
static const int64_t rows_in_range_arbitrary_ret_val = 10; static const ib_int64_t rows_in_range_arbitrary_ret_val = 10;
/** Estimates the number of rows in a given index range. /** Estimates the number of rows in a given index range.
@param[in] index index @param[in] index index
...@@ -3881,7 +3881,7 @@ rows_in_range_arbitrary_ret_val as a result (if ...@@ -3881,7 +3881,7 @@ rows_in_range_arbitrary_ret_val as a result (if
nth_attempt >= rows_in_range_max_retries and the tree is modified between nth_attempt >= rows_in_range_max_retries and the tree is modified between
the two dives). */ the two dives). */
static static
int64_t ib_int64_t
btr_estimate_n_rows_in_range_low( btr_estimate_n_rows_in_range_low(
dict_index_t* index, dict_index_t* index,
const dtuple_t* tuple1, const dtuple_t* tuple1,
...@@ -4017,7 +4017,7 @@ btr_estimate_n_rows_in_range_low( ...@@ -4017,7 +4017,7 @@ btr_estimate_n_rows_in_range_low(
return(rows_in_range_arbitrary_ret_val); return(rows_in_range_arbitrary_ret_val);
} }
const int64_t ret = const ib_int64_t ret =
btr_estimate_n_rows_in_range_low( btr_estimate_n_rows_in_range_low(
index, tuple1, mode1, index, tuple1, mode1,
tuple2, mode2, trx, tuple2, mode2, trx,
...@@ -4083,7 +4083,7 @@ btr_estimate_n_rows_in_range_low( ...@@ -4083,7 +4083,7 @@ btr_estimate_n_rows_in_range_low(
@param[in] mode2 search mode for range end @param[in] mode2 search mode for range end
@param[in] trx trx @param[in] trx trx
@return estimated number of rows */ @return estimated number of rows */
int64_t ib_int64_t
btr_estimate_n_rows_in_range( btr_estimate_n_rows_in_range(
dict_index_t* index, dict_index_t* index,
const dtuple_t* tuple1, const dtuple_t* tuple1,
...@@ -4092,7 +4092,7 @@ btr_estimate_n_rows_in_range( ...@@ -4092,7 +4092,7 @@ btr_estimate_n_rows_in_range(
ulint mode2, ulint mode2,
trx_t* trx) trx_t* trx)
{ {
const int64_t ret = btr_estimate_n_rows_in_range_low( const ib_int64_t ret = btr_estimate_n_rows_in_range_low(
index, tuple1, mode1, tuple2, mode2, trx, index, tuple1, mode1, tuple2, mode2, trx,
1 /* first attempt */); 1 /* first attempt */);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment