summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-02-22 17:03:14 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2019-02-22 17:03:14 +0100
commitfb01193ce9f7ea560363e2288b05565cc63b8671 (patch)
tree442aef89ab961aee602af738d6ad7b936807bdb9
parent0372f98cb56cdce814f037af7262b304c56ffadb (diff)
downloadmariadb-git-fb01193ce9f7ea560363e2288b05565cc63b8671.tar.gz
make windows compiler happy
-rw-r--r--sql/handler.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 34c24dbb934..47cf6aab19f 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -6523,7 +6523,7 @@ static int check_duplicate_long_entry_key(TABLE *table, handler *h, uchar *new_r
uint arg_count= temp->argument_count();
do
{
- long diff= table->check_unique_buf - new_rec;
+ my_ptrdiff_t diff= table->check_unique_buf - new_rec;
is_same= true;
for (uint j=0; is_same && j < arg_count; j++)
{
@@ -6612,7 +6612,7 @@ static int check_duplicate_long_entries_update(TABLE *table, handler *h, uchar *
Here we are comparing whether new record and old record are same
with respect to fields in hash_str
*/
- long reclength= table->record[1]-table->record[0];
+ uint reclength= (uint) (table->record[1] - table->record[0]);
if (!table->update_handler)
table->clone_handler_for_update();
for (uint i= 0; i < table->s->keys; i++)