From 3d428e017dbc51ebbaace4b13802b5bab6a2b16a Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Sat, 3 Jun 2017 16:16:18 +0300
Subject: [PATCH] Cleanups (LINT_INIT & --debug-mutex-deadlock-detector

- Removed duplicate entry for --debug-mutex-deadlock-detector
- Fixed wrong usage of LINT_INIT
---
 sql/mysqld.cc    | 7 -------
 sql/opt_range.cc | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d7c46071c38..74efb91cbd1 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7297,13 +7297,6 @@ struct my_option my_long_options[]=
    &max_binlog_dump_events, &max_binlog_dump_events, 0,
    GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif /* HAVE_REPLICATION */
-#ifdef SAFE_MUTEX
-  {"debug-mutex-deadlock-detector", 0,
-   "Enable checking of wrong mutex usage.",
-   &safe_mutex_deadlock_detector,
-   &safe_mutex_deadlock_detector,
-   0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
-#endif
   {"debug-no-sync", 0,
    "Disables system sync calls. Only for running tests or debugging!",
    &my_disable_sync, &my_disable_sync, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 284f4348080..40184d7a421 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -7501,7 +7501,7 @@ SEL_TREE *Item_bool_func::get_full_func_mm_tree(RANGE_OPT_PARAM *param,
 		          param->current_table);
 #ifdef HAVE_SPATIAL
   Field::geometry_type sav_geom_type;
-  LINT_INIT(sav_geom_type);
+  LINT_INIT_STRUCT(sav_geom_type);
 
   if (field_item->field->type() == MYSQL_TYPE_GEOMETRY)
   {