From b5d54292a4012d2cbe63ebf474f277f896c4eebc Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Fri, 30 Jun 2017 11:07:00 +0200
Subject: [PATCH] Fix merge error

---
 .../qc_mysqlembedded/qc_mysqlembedded.cc      | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
index 91a6e87ff..2c850168d 100644
--- a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
+++ b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
@@ -199,32 +199,6 @@ static struct
     function_name_mappings_default
 };
 
-#if MYSQL_VERSION_MAJOR >= 10 && MYSQL_VERSION_MINOR >= 3
-inline void get_string_and_length(const LEX_CSTRING& ls, const char** s, size_t* length)
-{
-    *s = ls.str;
-    *length = ls.length;
-}
-#else
-inline void get_string_and_length(const char* cs, const char** s, size_t* length)
-{
-    *s = cs;
-    *length = cs ? strlen(cs) : 0;
-}
-#endif
-
-static struct
-{
-    qc_sql_mode_t   sql_mode;
-    pthread_mutex_t sql_mode_mutex;
-    NAME_MAPPING*   function_name_mappings;
-} this_unit =
-{
-    QC_SQL_MODE_DEFAULT,
-    PTHREAD_MUTEX_INITIALIZER,
-    function_name_mappings_default
-};
-
 static thread_local struct
 {
     qc_sql_mode_t sql_mode;