diff --git a/mysql-test/suite/rpl/t/rpl_gtid_reconnect.test b/mysql-test/suite/rpl/t/rpl_gtid_reconnect.test
index 226c50dbc97..22cf10afba3 100644
--- a/mysql-test/suite/rpl/t/rpl_gtid_reconnect.test
+++ b/mysql-test/suite/rpl/t/rpl_gtid_reconnect.test
@@ -144,6 +144,7 @@ INSERT INTO t1 VALUES (20);
 
 --connection server_2
 --source include/start_slave.inc
+--sync_with_master
 SELECT * FROM t1 ORDER BY a;
 
 
diff --git a/sql/item.cc b/sql/item.cc
index f9ad1bab4f2..447137a1f68 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -686,7 +686,7 @@ void Item::cleanup()
 {
   DBUG_ENTER("Item::cleanup");
   DBUG_PRINT("enter", ("this: %p", this));
-  fixed=0;
+  fixed= 0;
   marker= 0;
   join_tab_idx= MAX_TABLES;
   if (orig_name)
diff --git a/sql/item.h b/sql/item.h
index 70f5cd52bcc..22d147028ef 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1240,7 +1240,6 @@ public:
   virtual bool intro_version(uchar *int_arg) { return 0; }
 
   virtual bool remove_dependence_processor(uchar * arg) { return 0; }
-  virtual bool remove_fixed(uchar * arg) { fixed= 0; return 0; }
   virtual bool cleanup_processor(uchar *arg);
   virtual bool collect_item_field_processor(uchar * arg) { return 0; }
   virtual bool add_field_to_set_processor(uchar * arg) { return 0; }
@@ -3897,7 +3896,7 @@ public:
   {
     ref= &outer_ref;
     set_properties();
-    fixed= 0;
+    fixed= 0;                     /* reset flag set in set_properties() */
   }
   Item_outer_ref(Name_resolution_context *context_arg, Item **item,
                  const char *table_name_arg, const char *field_name_arg,
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 6aecfca39f4..79f38e2884a 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -21101,7 +21101,7 @@ cp_buffer_from_ref(THD *thd, TABLE *table, TABLE_REF *ref)
 
   ref_pointer_array and all_fields are updated.
 
-  @param[in] thd		     Pointer to current thread structure
+  @param[in] thd		    Pointer to current thread structure
   @param[in,out] ref_pointer_array  All select, group and order by fields
   @param[in] tables                 List of tables to search in (usually
     FROM clause)
@@ -21147,7 +21147,7 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
     order->in_field_list= 1;
     order->counter= count;
     order->counter_used= 1;
-   return FALSE;
+    return FALSE;
   }
   /* Lookup the current GROUP/ORDER field in the SELECT clause. */
   select_item= find_item_in_list(order_item, fields, &counter,
@@ -21215,7 +21215,8 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
         warning so the user knows that the field from the FROM clause
         overshadows the column reference from the SELECT list.
       */
-      push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_NON_UNIQ_ERROR,
+      push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+                          ER_NON_UNIQ_ERROR,
                           ER(ER_NON_UNIQ_ERROR),
                           ((Item_ident*) order_item)->field_name,
                           current_thd->where);
diff --git a/storage/tokudb/mysql-test/rpl/include/have_tokudb.opt b/storage/tokudb/mysql-test/rpl/include/have_tokudb.opt
index 976f96f3f48..c22939cc965 100644
--- a/storage/tokudb/mysql-test/rpl/include/have_tokudb.opt
+++ b/storage/tokudb/mysql-test/rpl/include/have_tokudb.opt
@@ -1 +1 @@
---loose-tokudb --plugin-load-add=$HA_TOKUDB_SO
+--loose-tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0
diff --git a/storage/tokudb/mysql-test/tokudb/suite.opt b/storage/tokudb/mysql-test/tokudb/suite.opt
index 8cfa7cacb1f..ea8042b7740 100644
--- a/storage/tokudb/mysql-test/tokudb/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb/suite.opt
@@ -1 +1 @@
---tokudb --plugin-load-add=$HA_TOKUDB_SO
+--tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0
diff --git a/storage/tokudb/mysql-test/tokudb_add_index/suite.opt b/storage/tokudb/mysql-test/tokudb_add_index/suite.opt
index 8cfa7cacb1f..ea8042b7740 100644
--- a/storage/tokudb/mysql-test/tokudb_add_index/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb_add_index/suite.opt
@@ -1 +1 @@
---tokudb --plugin-load-add=$HA_TOKUDB_SO
+--tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/suite.opt b/storage/tokudb/mysql-test/tokudb_alter_table/suite.opt
index 8cfa7cacb1f..ea8042b7740 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/suite.opt
@@ -1 +1 @@
---tokudb --plugin-load-add=$HA_TOKUDB_SO
+--tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/suite.opt b/storage/tokudb/mysql-test/tokudb_bugs/suite.opt
index 8cfa7cacb1f..ea8042b7740 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb_bugs/suite.opt
@@ -1 +1 @@
---tokudb --plugin-load-add=$HA_TOKUDB_SO
+--tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0
diff --git a/storage/tokudb/mysql-test/tokudb_mariadb/suite.opt b/storage/tokudb/mysql-test/tokudb_mariadb/suite.opt
index 8cfa7cacb1f..ea8042b7740 100644
--- a/storage/tokudb/mysql-test/tokudb_mariadb/suite.opt
+++ b/storage/tokudb/mysql-test/tokudb_mariadb/suite.opt
@@ -1 +1 @@
---tokudb --plugin-load-add=$HA_TOKUDB_SO
+--tokudb --plugin-load-add=$HA_TOKUDB_SO --loose-tokudb-check-jemalloc=0