After merge fixes

sql/handler.cc

@@ -1506,17 +1506,6 @@ commit_one_phase_2(THD *thd, bool all, THD_TRANS *trans, bool is_real_trans)
   int error= 0;
   Ha_trx_info *ha_info= trans->ha_list, *ha_info_next;
   DBUG_ENTER("commit_one_phase_2");
-#ifdef WITH_WSREP
-#ifdef WSREP_PROC_INFO
-  char info[64]= { 0, };
-  snprintf (info, sizeof(info) - 1, "ha_commit_one_phase(%lld)",
-            (long long)thd->wsrep_trx_seqno);
-#else
-  const char info[]="ha_commit_one_phase()";
-#endif /* WSREP_PROC_INFO */
-  char* tmp_info= NULL;
-  if (WSREP(thd)) tmp_info= (char *)thd_proc_info(thd, info);
-#endif /* WITH_WSREP */
 
   if (ha_info)
   {
@@ -1551,9 +1540,6 @@ commit_one_phase_2(THD *thd, bool all, THD_TRANS *trans, bool is_real_trans)
 #else
     thd->transaction.cleanup();
 #endif /* WITH_WSREP */
-#ifdef WITH_WSREP
-  if (WSREP(thd)) thd_proc_info(thd, tmp_info);
-#endif /* WITH_WSREP */
 
   DBUG_RETURN(error);
 }

sql/log_event.cc

@@ -11999,7 +11999,7 @@ Log_event* wsrep_read_log_event(
     goto err;
   }
 
-  res= Log_event::read_log_event(buf, data_len, &error, description_event, FALSE);
+  res= Log_event::read_log_event(buf, data_len, &error, description_event, false);
 
 err:
   if (!res)

sql/sql_acl.cc

@@ -1926,7 +1926,7 @@ bool change_password(THD *thd, const char *host, const char *user,
   Rpl_filter *rpl_filter= thd->rpl_filter;
   /* Buffer should be extended when password length is extended. */
   char buff[512];
-  ulong query_length;
+  ulong query_length=0;
   enum_binlog_format save_binlog_format;
   uint new_password_len= (uint) strlen(new_password);
   bool result= 1;

sql/sql_admin.cc

@@ -1116,6 +1116,9 @@ bool Sql_cmd_analyze_table::execute(THD *thd)
                          FALSE, UINT_MAX, FALSE))
     goto error;
   thd->enable_slow_log= opt_log_slow_admin_statements;
+#ifdef WITH_WSREP
+  WSREP_TO_ISOLATION_BEGIN(first_table->db, first_table->table_name, NULL);
+#endif
   res= mysql_admin_table(thd, first_table, &m_lex->check_opt,
                          "analyze", lock_type, 1, 0, 0, 0,
                          &handler::ha_analyze, 0);
@@ -1171,7 +1174,6 @@ bool Sql_cmd_optimize_table::execute(THD *thd)
                          FALSE, UINT_MAX, FALSE))
     goto error; /* purecov: inspected */
   thd->enable_slow_log= opt_log_slow_admin_statements;
-  WSREP_TO_ISOLATION_BEGIN(first_table->db, first_table->table_name, NULL)
   res= (specialflag & SPECIAL_NO_NEW_FUNC) ?
  
     mysql_recreate_table(thd, first_table) :

sql/sql_parse.cc

@@ -972,7 +972,7 @@ bool do_command(THD *thd)
   }
 
   if ((WSREP(thd)  && packet_length == packet_error) ||
-      (!WSREP(thd) && (packet_length= my_net_read(net)) == packet_error))
+      (!WSREP(thd) && (packet_length == packet_error)))
 #else
   if (packet_length == packet_error)
 #endif /* WITH_WSREP */
@@ -3240,6 +3240,12 @@ case SQLCOM_PREPARE:
       /* So that CREATE TEMPORARY TABLE gets to binlog at commit/rollback */
       if (create_info.tmp_table())
         thd->variables.option_bits|= OPTION_KEEP_LOG;
+#ifdef WITH_WSREP
+      if (!thd->is_current_stmt_binlog_format_row() ||
+	  !(create_info.options & HA_LEX_CREATE_TMP_TABLE))
+          WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name,
+                                 NULL)
+#endif /* WITH_WSREP */
       /* regular create */
       if (create_info.options & HA_LEX_CREATE_TABLE_LIKE)
       {
@@ -3249,13 +3255,6 @@ case SQLCOM_PREPARE:
       }
       else
       {
-#ifdef WITH_WSREP
-      if (!thd->is_current_stmt_binlog_format_row() ||
-	  !(create_info.options & HA_LEX_CREATE_TMP_TABLE))
-       WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name,
-                                 NULL)
-#endif /* WITH_WSREP */
-
         /* Regular CREATE TABLE */
         res= mysql_create_table(thd, create_table,
                                 &create_info, &alter_info);