lots of post-merge changes

3 files changed, 2 insertions, 25 deletions

diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 7866e60016b..4d9785a4f35 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -69,7 +69,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
            ../sql/sql_list.cc ../sql/sql_load.cc ../sql/sql_locale.cc 
            ../sql/sql_binlog.cc ../sql/sql_manager.cc
            ../sql/sql_parse.cc ../sql/sql_partition.cc ../sql/sql_plugin.cc 
-           ../sql/debug_sync.cc
+           ../sql/debug_sync.cc ../sql/opt_table_elimination.cc
            ../sql/sql_prepare.cc ../sql/sql_rename.cc ../sql/sql_repl.cc 
            ../sql/sql_select.cc ../sql/sql_servers.cc
            ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 7e784cc51f4..98674552812 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -80,7 +80,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
 	rpl_injector.cc my_user.c partition_info.cc sql_alter.cc \
 	sql_servers.cc event_parse_data.cc sql_signal.cc \
 	rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc \
-	sql_partition_admin.cc
+	sql_partition_admin.cc \
 	create_options.cc opt_table_elimination.cc \
 	multi_range_read.cc opt_index_cond_pushdown.cc \
 	sql_expression_cache.cc
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index b41bd50b2c6..847b1fd7ad9 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -1241,26 +1241,3 @@ int vprint_msg_to_log(enum loglevel level __attribute__((unused)),
   return 0;
 }
 
-
-bool Protocol::net_store_data(const uchar *from, size_t length,
-                              CHARSET_INFO *from_cs, CHARSET_INFO *to_cs)
-{
-  uint conv_length= to_cs->mbmaxlen * length / from_cs->mbminlen;
-  uint dummy_error;
-  char *field_buf;
-  if (!thd->mysql)            // bootstrap file handling
-    return false;
-
-  if (!(field_buf= (char*) alloc_root(alloc, conv_length + sizeof(uint) + 1)))
-    return true;
-  *next_field= field_buf + sizeof(uint);
-  length= copy_and_convert(*next_field, conv_length, to_cs,
-                           (const char*) from, length, from_cs, &dummy_error);
-  *(uint *) field_buf= length;
-  (*next_field)[length]= 0;
-  if (next_mysql_field->max_length < length)
-    next_mysql_field->max_length= length;
-  ++next_field;
-  ++next_mysql_field;
-  return false;
-}