compilation warning on windows

6 files changed, 8 insertions, 12 deletions

diff --git a/sql/partition_element.h b/sql/partition_element.h
index 535c320c626..fdf2cb3900d 100644
--- a/sql/partition_element.h
+++ b/sql/partition_element.h
@@ -202,7 +202,7 @@ public:
     engine_type(NULL), connect_string(null_clex_str), part_state(PART_NORMAL),
     nodegroup_id(UNDEF_NODEGROUP), has_null_value(FALSE),
     signed_flag(FALSE), max_value(FALSE),
-    id(UINT32_MAX),
+    id(UINT_MAX32),
     empty(true)
   {}
   partition_element(partition_element *part_elem)
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index 65df87bee04..819ba69a147 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -1001,7 +1001,7 @@ bool partition_info::vers_setup_expression(THD * thd, uint32 alter_add)
         continue;
       }
       /* Newly added element is inserted before AS_OF_NOW. */
-      if (el->id == UINT32_MAX || el->type() == partition_element::CURRENT)
+      if (el->id == UINT_MAX32 || el->type() == partition_element::CURRENT)
       {
         DBUG_ASSERT(table && table->s);
         Vers_min_max_stats *stat_trx_end= new (&table->s->mem_root)
diff --git a/sql/partition_info.h b/sql/partition_info.h
index 23e94661e68..67a62874fcd 100644
--- a/sql/partition_info.h
+++ b/sql/partition_info.h
@@ -57,11 +57,11 @@ struct Vers_part_info : public Sql_alloc
   {
     if (now_part)
     {
-      DBUG_ASSERT(now_part->id != UINT32_MAX);
+      DBUG_ASSERT(now_part->id != UINT_MAX32);
       DBUG_ASSERT(now_part->type() == partition_element::CURRENT);
       DBUG_ASSERT(!fully || (bool) hist_part);
       DBUG_ASSERT(!hist_part || (
-          hist_part->id != UINT32_MAX &&
+          hist_part->id != UINT_MAX32 &&
           hist_part->type() == partition_element::HISTORY));
       return true;
     }
@@ -406,7 +406,7 @@ public:
   {
     DBUG_ASSERT(table && table->s);
     DBUG_ASSERT(vers_info && vers_info->initialized());
-    DBUG_ASSERT(table->s->hist_part_id != UINT32_MAX);
+    DBUG_ASSERT(table->s->hist_part_id != UINT_MAX32);
     if (table->s->hist_part_id == vers_info->hist_part->id)
       return vers_info->hist_part;
 
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 895248f4824..4d55ebf8bea 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -5500,7 +5500,7 @@ opt_part_values:
             else
             {
               part_info->vers_init_info(thd);
-              elem->id= UINT32_MAX;
+              elem->id= UINT_MAX32;
             }
             DBUG_ASSERT(part_info->vers_info);
             if (part_info->vers_info->now_part)
diff --git a/sql/table.h b/sql/table.h
index 3882bfad279..48e9bbb42ce 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -583,10 +583,6 @@ enum vers_sys_type_t
   VERS_TRX_ID
 };
 
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-
 /**
   This structure is shared between different table objects. There is one
   instance of table share per one table in the database.
@@ -791,7 +787,7 @@ struct TABLE_SHARE
 
   void vers_init()
   {
-    hist_part_id= UINT32_MAX;
+    hist_part_id= UINT_MAX32;
     busy_rotation= false;
     stat_trx= NULL;
     stat_serial= 0;
diff --git a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h
index 2ba23b6e68c..407e1705a0f 100644
--- a/storage/innobase/include/row0mysql.h
+++ b/storage/innobase/include/row0mysql.h
@@ -869,7 +869,7 @@ struct row_prebuilt_t {
 	{
 		ut_ad(col < n_template);
 		ut_ad(mysql_template);
-		for (int i = col; i < n_template; ++i) {
+		for (ulint i = col; i < n_template; ++i) {
 			const mysql_row_templ_t* templ = &mysql_template[i];
 			if (!templ->is_virtual && templ->col_no == col) {
 				return templ;