diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc
index 129bd4dadca..383652e4a3a 100644
--- a/sql/ha_federated.cc
+++ b/sql/ha_federated.cc
@@ -1087,7 +1087,7 @@ int ha_federated::write_row(byte *buf)
 {
   uint x= 0, num_fields= 0;
   Field **field;
-  query_id_it current_query_id= 1;
+  query_id_t current_query_id= 1;
   ulong tmp_query_id= 1;
   uint all_fields_have_same_query_id= 1;
 
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index a2f3334d13d..f5d30f69978 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -199,7 +199,7 @@ static int check_update_fields(THD *thd, TABLE_LIST *insert_table_list,
                                List<Item> &update_fields)
 {
   TABLE *table= insert_table_list->table;
-  query_id_it timestamp_query_id;
+  query_id_t timestamp_query_id;
   LINT_INIT(timestamp_query_id);
 
   /*