diff --git a/include/m_string.h b/include/m_string.h
index a8b4e4d4c49..1e2bb0ba6c8 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -242,12 +242,6 @@ static inline void lex_string_set(LEX_CSTRING *lex_str, const char *c_str)
   lex_str->str= c_str;
   lex_str->length= strlen(c_str);
 }
-static inline void lex_string_set3(LEX_CSTRING *lex_str, const char *c_str,
-                                   size_t len)
-{
-  lex_str->str= c_str;
-  lex_str->length= len;
-}
 
 /**
   Copies a string.
diff --git a/sql/ddl_log.cc b/sql/ddl_log.cc
index efa4a7e4250..51ee66a8c0a 100644
--- a/sql/ddl_log.cc
+++ b/sql/ddl_log.cc
@@ -2212,8 +2212,7 @@ static int ddl_log_execute_action(THD *thd, MEM_ROOT *mem_root,
 
         mysql_mutex_unlock(&LOCK_gdl);
         save_db= thd->db;
-        lex_string_set3(&thd->db, recovery_state.db.ptr(),
-                        recovery_state.db.length());
+        thd->db= recovery_state.db.to_lex_cstring();
         (void) thd->binlog_query(THD::STMT_QUERY_TYPE,
                                  recovery_state.query.ptr(),
                                  recovery_state.query.length(),
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 9bec1ed78bc..68d4c287377 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -144,9 +144,9 @@ int ha_partition::notify_tabledef_changed(LEX_CSTRING *db,
     if (create_partition_name(from_buff, sizeof(from_buff), from_path,
                               name_buffer_ptr, NORMAL_PART_NAME, FALSE))
       res=1;
-    table_name_ptr= from_buff + dirname_length(from_buff);
 
-    lex_string_set3(&table_name, table_name_ptr, strlen(table_name_ptr));
+    table_name_ptr= from_buff + dirname_length(from_buff);
+    lex_string_set(&table_name, table_name_ptr);
 
     if (((*file)->ht)->notify_tabledef_changed((*file)->ht, db, &table_name,
                                                frm, version, *file))
diff --git a/sql/json_table.cc b/sql/json_table.cc
index 4ec7337897f..905ad1ac303 100644
--- a/sql/json_table.cc
+++ b/sql/json_table.cc
@@ -1062,19 +1062,19 @@ int Json_table_column::On_response::print(const char *name, String *str) const
   switch (m_response)
   {
     case Json_table_column::RESPONSE_NULL:
-      lex_string_set3(&resp, STRING_WITH_LEN("NULL"));
+      resp= { STRING_WITH_LEN("NULL") };
       break;
     case Json_table_column::RESPONSE_ERROR:
-      lex_string_set3(&resp, STRING_WITH_LEN("ERROR"));
+      resp= { STRING_WITH_LEN("ERROR") };
       break;
     case Json_table_column::RESPONSE_DEFAULT:
     {
-      lex_string_set3(&resp, STRING_WITH_LEN("DEFAULT"));
+      resp= { STRING_WITH_LEN("DEFAULT") };
       ds= m_default->val_str(&val);
       break;
     }
     default:
-      lex_string_set3(&resp, "", 0);
+      resp= { "", 0 };
       DBUG_ASSERT(FALSE); /* should never happen. */
   }
 
@@ -1477,5 +1477,3 @@ table_map add_table_function_dependencies(List<TABLE_LIST> *join_list,
 
   return res;
 }
-
-
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index f2be192fb77..a4bb473d705 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -16823,17 +16823,17 @@ const char *dbug_print_sel_arg(SEL_ARG *sel_arg)
   }
 
   if (sel_arg->min_flag & NEAR_MIN)
-    lex_string_set3(&tmp, "<", 1);
+    tmp = { STRING_WITH_LEN("<") };
   else
-    lex_string_set3(&tmp, "<=", 2);
+    tmp = { STRING_WITH_LEN("<=") };
   out.append(&tmp);
 
   out.append(sel_arg->field->field_name);
 
   if (sel_arg->min_flag & NEAR_MAX)
-    lex_string_set3(&tmp, "<", 1);
+    tmp = { STRING_WITH_LEN("<") };
   else
-    lex_string_set3(&tmp, "<=", 2);
+    tmp = { STRING_WITH_LEN("<=") };
   out.append(&tmp);
 
   if (sel_arg->max_flag & NO_MAX_RANGE)
diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc
index af7dd362c3e..655b43099fc 100644
--- a/sql/sql_explain.cc
+++ b/sql/sql_explain.cc
@@ -540,21 +540,20 @@ uint Explain_union::make_union_table_name(char *buf)
   switch (operation)
   {
     case OP_MIX:
-      lex_string_set3(&type, STRING_WITH_LEN("<unit"));
+      type= { STRING_WITH_LEN("<unit") };
       break;
     case OP_UNION:
-      lex_string_set3(&type, STRING_WITH_LEN("<union"));
+      type= { STRING_WITH_LEN("<union") };
       break;
     case OP_INTERSECT:
-      lex_string_set3(&type, STRING_WITH_LEN("<intersect"));
+      type= { STRING_WITH_LEN("<intersect") };
       break;
     case OP_EXCEPT:
-      lex_string_set3(&type, STRING_WITH_LEN("<except"));
+      type= { STRING_WITH_LEN("<except") };
       break;
     default:
       DBUG_ASSERT(0);
-      type.str= NULL;
-      type.length= 0;
+      type= { NULL, 0 };
   }
   memcpy(buf, type.str, (len= (uint)type.length));
 
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 7fe97aa6a22..b5122896828 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4711,7 +4711,6 @@ int mysql_create_table_no_lock(THD *thd,
   int res;
   uint path_length;
   char path[FN_REFLEN + 1];
-  LEX_CSTRING cpath;
   const Lex_ident_db *db= &table_list->db;
   const Lex_ident_table *table_name= &table_list->table_name;
   LEX_CUSTRING frm= {0,0};
@@ -4734,8 +4733,8 @@ int mysql_create_table_no_lock(THD *thd,
       return true;
     }
   }
-  lex_string_set3(&cpath, path, path_length);
 
+  LEX_CSTRING cpath= { path, path_length };
   res= create_table_impl(thd, ddl_log_state_create, ddl_log_state_rm, *db,
                          *table_name, *db, *table_name, cpath, *create_info,
                          create_info, alter_info, create_table_mode,
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index dc0ac162bde..f0a8e876e79 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -1383,7 +1383,7 @@ bool Table_triggers_list::drop_trigger(THD *thd, TABLE_LIST *tables,
     if (stmt_query)
     {
       /* This code is executed in case of DROP TRIGGER */
-      lex_string_set3(&query, thd->query(), thd->query_length());
+      query = { thd->query(), thd->query_length() };
     }
     if (ddl_log_drop_trigger(ddl_log_state, &tables->db, &tables->table_name,
                              sp_name, &query))
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index d230423cc39..8e339d7b314 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -1945,12 +1945,10 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
 
   for (view= views; view; view= view->next_local)
   {
-    LEX_CSTRING cpath;
     bool not_exist;
-    size_t length;
-    length= build_table_filename(path, sizeof(path) - 1,
-                                 view->db.str, view->table_name.str, reg_ext, 0);
-    lex_string_set3(&cpath, path, length);
+    size_t length= build_table_filename(path, sizeof(path) - 1, view->db.str,
+                                        view->table_name.str, reg_ext, 0);
+    LEX_CSTRING cpath= { path, length };
 
     if ((not_exist= my_access(path, F_OK)) || !dd_frm_is_view(thd, path))
     {