Bug#20788853 MUTEX ISSUE IN SQL/SQL_SHOW.CC RESULTING IN SIG6. SOURCE LIKELY

Adoption of below commit to MySQL Cluster 7.2 commit afc2a9ceab6711d6276488c0d588254689d9c459 Author: Marc Alff <marc.alff@oracle.com> Date: Wed Apr 8 07:01:39 2015 +0200 FILL_VARIABLES Prevent mutexes used in SHOW VARIABLES from being locked twice.

Author: zmur

sql/sql_class.cc

@@ -802,13 +802,10 @@ THD::THD()
  rli_fake(0), rli_slave(NULL),
  user_time(0), in_sub_stmt(0),
  fill_status_recursion_level(0),
-<<<<<<< HEAD
+ fill_variables_recursion_level(0),
 #ifndef MCP_WL5353
  binlog_row_event_extra_data(NULL),
 #endif
-=======
- fill_variables_recursion_level(0),
->>>>>>> mysql-5.5.44
  binlog_unsafe_warning_flags(0),
  binlog_table_maps(0),
  table_map_for_update(0),