Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

24 files changed, 8862 insertions, 0 deletions

diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
new file mode 100644
index 00000000..04cc2159
--- /dev/null
+++ b/libmysqld/CMakeLists.txt
@@ -0,0 +1,419 @@
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates.
+# Copyright (c) 2009, 2022, MariaDB Corporation
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335 USA
+
+ADD_DEFINITIONS(-DMYSQL_SERVER -DEMBEDDED_LIBRARY
+ ${SSL_DEFINES})
+
+INCLUDE_DIRECTORIES(
+${CMAKE_SOURCE_DIR}/include 
+${CMAKE_SOURCE_DIR}/libmysqld
+${CMAKE_SOURCE_DIR}/sql
+${CMAKE_SOURCE_DIR}/tpool
+${CMAKE_BINARY_DIR}/sql 
+${PCRE_INCLUDES}
+${LIBFMT_INCLUDE_DIR}
+${ZLIB_INCLUDE_DIR}
+${SSL_INCLUDE_DIRS}
+${SSL_INTERNAL_INCLUDE_DIRS}
+)
+
+SET(GEN_SOURCES
+${CMAKE_BINARY_DIR}/sql/sql_yacc.hh
+${CMAKE_BINARY_DIR}/sql/yy_mariadb.cc
+${CMAKE_BINARY_DIR}/sql/yy_oracle.hh
+${CMAKE_BINARY_DIR}/sql/yy_oracle.cc
+${CMAKE_BINARY_DIR}/sql/lex_hash.h
+)
+
+SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCES} PROPERTIES GENERATED TRUE)
+
+IF(CMAKE_C_COMPILER_ID MATCHES "Clang" AND
+   NOT CMAKE_C_COMPILER_VERSION VERSION_LESS "13.0.0")
+ ADD_COMPILE_FLAGS(
+   ${CMAKE_BINARY_DIR}/sql/yy_mariadb.cc
+   ${CMAKE_BINARY_DIR}/sql/yy_oracle.cc
+   COMPILE_FLAGS "-Wno-unused-but-set-variable")
+ENDIF()
+
+SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc 
+           libmysql.c ../sql-common/errmsg.c
+           ../sql-common/client.c
+           ../sql/cset_narrowing.cc
+           ../sql-common/my_user.c ../sql-common/pack.c
+           ../sql-common/client_plugin.c
+           ../sql/password.c ../sql/discover.cc ../sql/derror.cc 
+           ../sql/field.cc ../sql/field_conv.cc ../sql/field_comp.cc
+           ../sql/filesort_utils.cc ../sql/sql_digest.cc
+           ../sql/filesort.cc ../sql/grant.cc
+           ../sql/gstream.cc ../sql/slave.cc
+           ../sql/signal_handler.cc
+           ../sql/handler.cc ../sql/hash_filo.cc ../sql/hostname.cc 
+           ../sql/init.cc ../sql/item_buff.cc ../sql/item_cmpfunc.cc 
+           ../sql/item.cc ../sql/item_create.cc ../sql/item_func.cc 
+           ../sql/item_geofunc.cc ../sql/item_row.cc ../sql/item_strfunc.cc 
+           ../sql/item_subselect.cc ../sql/item_sum.cc ../sql/item_timefunc.cc 
+           ../sql/item_xmlfunc.cc ../sql/item_jsonfunc.cc
+           ../sql/key.cc ../sql/lock.cc ../sql/log.cc 
+           ../sql/log_event.cc ../sql/log_event_server.cc 
+           ../sql/mf_iocache.cc ../sql/my_decimal.cc 
+           ../sql/net_serv.cc ../sql/opt_range.cc ../sql/opt_sum.cc 
+           ../sql/parse_file.cc ../sql/procedure.cc ../sql/protocol.cc 
+           ../sql/records.cc ../sql/repl_failsafe.cc ../sql/rpl_filter.cc
+           ../sql/rpl_record.cc ../sql/des_key_file.cc
+           ../sql/rpl_injector.cc ../sql/set_var.cc ../sql/spatial.cc 
+           ../sql/sp_cache.cc ../sql/sp.cc ../sql/sp_head.cc 
+           ../sql/sp_pcontext.cc ../sql/sp_rcontext.cc ../sql/sql_acl.cc 
+           ../sql/sql_analyse.cc ../sql/sql_base.cc ../sql/sql_cache.cc 
+           ../sql/sql_class.cc ../sql/sql_crypt.cc ../sql/sql_cursor.cc 
+           ../sql/sql_db.cc ../sql/sql_delete.cc ../sql/sql_derived.cc 
+           ../sql/sql_do.cc ../sql/sql_error.cc ../sql/sql_handler.cc
+            ../sql/sql_get_diagnostics.cc
+           ../sql/sql_help.cc ../sql/sql_insert.cc ../sql/datadict.cc
+           ../sql/sql_admin.cc ../sql/sql_truncate.cc ../sql/sql_reload.cc
+           ../sql/sql_lex.cc ../sql/keycaches.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_bootstrap.cc
+           ../sql/sql_partition.cc ../sql/sql_plugin.cc 
+           ../sql/debug_sync.cc ../sql/debug.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/group_by_handler.cc ../sql/derived_handler.cc
+           ../sql/select_handler.cc
+           ../sql/sql_show.cc ../sql/sql_state.c 
+           ../sql/sql_statistics.cc ../sql/sql_string.cc
+           ../sql/sql_table.cc ../sql/sql_test.cc
+           ../sql/ddl_log.cc
+           ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc
+           ../sql/sql_update.cc ../sql/sql_view.cc ../sql/sql_profile.cc
+           ../sql/gcalc_tools.cc ../sql/gcalc_slicescan.cc
+           ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
+           ../sql/sql_time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
+           ../sql/partition_info.cc ../sql/sql_connect.cc 
+           ../sql/scheduler.cc ../sql/sql_audit.cc
+           ../sql/sql_alter.cc ../sql/sql_partition_admin.cc
+           ../sql/event_parse_data.cc
+           ../sql/sql_signal.cc
+           ../sql/sys_vars.cc
+           ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
+           ../sql/mdl.cc ../sql/transaction.cc
+           ../sql/sql_join_cache.cc
+           ../sql/multi_range_read.cc
+           ../sql/opt_index_cond_pushdown.cc
+           ../sql/opt_subselect.cc
+           ../sql/create_options.cc
+           ../sql/rpl_utility.cc
+           ../sql/rpl_utility_server.cc
+           ../sql/rpl_reporting.cc
+           ../sql/sql_expression_cache.cc
+           ../sql/my_apc.cc ../sql/my_apc.h
+           ../sql/my_json_writer.cc ../sql/my_json_writer.h
+	   ../sql/rpl_gtid.cc
+           ../sql/sql_explain.cc ../sql/sql_explain.h
+           ../sql/sql_analyze_stmt.cc ../sql/sql_analyze_stmt.h
+           ../sql/compat56.cc
+           ../sql/sql_schema.cc
+           ../sql/lex_charset.cc
+           ../sql/sql_type.cc ../sql/sql_type.h
+           ../sql/sql_mode.cc
+           ../sql/sql_type_string.cc
+           ../sql/sql_type_json.cc
+           ../sql/sql_type_geom.cc
+           ../sql/table_cache.cc ../sql/mf_iocache_encr.cc
+           ../sql/wsrep_dummy.cc ../sql/encryption.cc
+           ../sql/item_windowfunc.cc ../sql/sql_window.cc
+           ../sql/sql_cte.cc
+           ../sql/sql_sequence.cc ../sql/sql_sequence.h
+           ../sql/ha_sequence.cc ../sql/ha_sequence.h
+           ../sql/temporary_tables.cc
+           ../sql/proxy_protocol.cc ../sql/backup.cc
+           ../sql/sql_tvc.cc ../sql/sql_tvc.h
+           ../sql/opt_split.cc
+           ../sql/rowid_filter.cc ../sql/rowid_filter.h
+           ../sql/item_vers.cc
+           ../sql/opt_trace.cc
+           ../sql/xa.cc
+           ../sql/json_table.cc
+           ../sql/opt_histogram_json.cc
+           ${GEN_SOURCES}
+           ${MYSYS_LIBWRAP_SOURCE}
+)
+
+
+ADD_CONVENIENCE_LIBRARY(sql_embedded ${SQL_EMBEDDED_SOURCES})
+DTRACE_INSTRUMENT(sql_embedded)
+ADD_DEPENDENCIES(sql_embedded GenError GenServerSource)
+IF(TARGET pcre2)
+  ADD_DEPENDENCIES(sql_embedded pcre2)
+ENDIF()
+IF(TARGET libfmt)
+  ADD_DEPENDENCIES(sql_embedded libfmt)
+ENDIF()
+TARGET_LINK_LIBRARIES(sql_embedded LINK_PRIVATE tpool ${CRC32_LIBRARY})
+
+# On Windows, static embedded server library is called mysqlserver.lib
+# On Unix, it is libmysqld.a
+IF(WIN32)
+  SET(MYSQLSERVER_OUTPUT_NAME mysqlserver)
+  SET(COMPONENT_MYSQLSERVER "Embedded")
+  SET(COMPONENT_LIBMYSQLD "Embedded")
+ELSE()
+  SET(MYSQLSERVER_OUTPUT_NAME mariadbd)
+  SET(COMPONENT_MYSQLSERVER "Development")
+  SET(COMPONENT_LIBMYSQLD "Server")
+ENDIF()
+
+
+SET(LIBS 
+  dbug strings mysys mysys_ssl pcre2-8 vio
+  ${ZLIB_LIBRARY} ${SSL_LIBRARIES} 
+  ${LIBWRAP} ${LIBCRYPT} ${CMAKE_DL_LIBS}
+  ${EMBEDDED_PLUGIN_LIBS}
+  sql_embedded
+)
+
+# Some storage engine were compiled for embedded specifically
+# (with corresponding target ${engine}_embedded)
+SET(EMBEDDED_LIBS)
+FOREACH(LIB ${LIBS})
+  IF(TARGET ${LIB}_embedded)
+    LIST(APPEND EMBEDDED_LIBS ${LIB}_embedded)
+  ELSE()
+    LIST(APPEND EMBEDDED_LIBS ${LIB})
+  ENDIF()
+ENDFOREACH()
+
+MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} 
+  OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER})
+IF(UNIX)
+  INSTALL_SYMLINK(libmysqld.a mysqlserver ${INSTALL_LIBDIR} ${COMPONENT_MYSQLSERVER})
+ENDIF()
+INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT  ${COMPONENT_MYSQLSERVER})
+
+
+SET(CLIENT_API_FUNCTIONS_5_1
+get_tty_password
+mysql_thread_end
+mysql_thread_init
+myodbc_remove_escape
+mysql_affected_rows
+mysql_autocommit
+mysql_stmt_bind_param
+mysql_stmt_bind_result
+mysql_change_user
+mysql_character_set_name
+mysql_close
+mysql_commit
+mysql_data_seek
+mysql_debug
+mysql_dump_debug_info
+mysql_eof
+mysql_errno
+mysql_error
+mysql_escape_string
+mysql_hex_string
+mysql_stmt_execute
+mysql_stmt_fetch
+mysql_stmt_fetch_column
+mysql_fetch_field
+mysql_fetch_field_direct
+mysql_fetch_fields
+mysql_fetch_lengths
+mysql_fetch_row
+mysql_field_count
+mysql_field_seek
+mysql_field_tell
+mysql_free_result
+mysql_get_parameters
+mysql_get_client_info
+mysql_get_host_info
+mysql_get_proto_info
+mysql_get_server_info
+mysql_get_client_version
+mysql_get_ssl_cipher
+mysql_info
+mysql_init
+mysql_insert_id
+mysql_kill
+mysql_set_server_option
+mysql_list_dbs
+mysql_list_fields
+mysql_list_processes
+mysql_list_tables
+mysql_more_results
+mysql_next_result
+mysql_num_fields
+mysql_num_rows
+mysql_options
+mysql_stmt_param_count
+mysql_stmt_param_metadata
+mysql_ping
+mysql_stmt_result_metadata
+mysql_query
+mysql_read_query_result
+mysql_real_connect
+mysql_real_escape_string
+mysql_real_query
+mysql_refresh
+mysql_rollback
+mysql_row_seek
+mysql_row_tell
+mysql_select_db
+mysql_stmt_send_long_data
+mysql_send_query
+mysql_shutdown
+mysql_ssl_set
+mysql_stat
+mysql_stmt_affected_rows
+mysql_stmt_close
+mysql_stmt_reset
+mysql_stmt_data_seek
+mysql_stmt_errno
+mysql_stmt_error
+mysql_stmt_free_result
+mysql_stmt_num_rows
+mysql_stmt_row_seek
+mysql_stmt_row_tell
+mysql_stmt_store_result
+mysql_store_result
+mysql_thread_id
+mysql_thread_safe
+mysql_use_result
+mysql_warning_count
+mysql_stmt_sqlstate
+mysql_sqlstate
+mysql_get_server_version
+mysql_stmt_prepare
+mysql_stmt_init
+mysql_stmt_insert_id
+mysql_stmt_attr_get
+mysql_stmt_attr_set
+mysql_stmt_field_count
+mysql_set_local_infile_default
+mysql_set_local_infile_handler
+mysql_embedded
+mysql_server_init
+mysql_server_end
+mysql_set_character_set
+mysql_get_character_set_info
+# These are documented in Paul DuBois' MySQL book,
+# so we treat them as part of the de-facto API.
+handle_options
+load_defaults
+free_defaults
+my_print_help
+)
+
+SET(CLIENT_API_FUNCTIONS_5_5
+my_progname
+mysql_stmt_next_result
+# Charsets
+my_charset_bin
+my_charset_latin1
+my_charset_utf8mb3_general_ci
+# Client plugins
+mysql_client_find_plugin
+mysql_client_register_plugin
+mysql_load_plugin
+mysql_load_plugin_v
+mysql_plugin_options
+
+#dynamic columns api
+dynamic_column_create
+dynamic_column_create_many
+dynamic_column_update
+dynamic_column_update_many
+dynamic_column_exists
+dynamic_column_list
+dynamic_column_get
+dynamic_column_prepare_decimal
+mariadb_dyncol_create_many_num
+mariadb_dyncol_create_many_named
+mariadb_dyncol_update_many_num
+mariadb_dyncol_update_many_named
+mariadb_dyncol_exists_num
+mariadb_dyncol_exists_named
+mariadb_dyncol_free
+mariadb_dyncol_list_num
+mariadb_dyncol_list_named
+mariadb_dyncol_get_num
+mariadb_dyncol_get_named
+mariadb_dyncol_has_names
+mariadb_dyncol_check
+mariadb_dyncol_json
+mariadb_dyncol_val_str
+mariadb_dyncol_val_long
+mariadb_dyncol_val_double
+mariadb_dyncol_unpack
+mariadb_dyncol_unpack_free
+mariadb_dyncol_column_cmp_named
+mariadb_dyncol_column_count
+mariadb_dyncol_prepare_decimal
+#
+mariadb_deinitialize_ssl
+# low-level API to MySQL protocol
+mysql_net_read_packet
+mysql_net_field_length
+# Added in MariaDB-10.0 to stay compatible with MySQL-5.6, yuck!
+mysql_options4
+)
+
+
+SET(CLIENT_API_FUNCTIONS_10_5
+mariadb_field_attr
+)
+
+SET(CLIENT_API_FUNCTIONS
+  ${CLIENT_API_FUNCTIONS_5_1}
+  ${CLIENT_API_FUNCTIONS_5_5}
+  ${CLIENT_API_FUNCTIONS_10_5}
+)
+
+
+# List of exported functions in embedded (client api except client plugin or 
+# async (*_start/*_cont functions)
+
+SET(EMBEDDED_API)
+
+FOREACH(f ${CLIENT_API_FUNCTIONS})
+  IF(f MATCHES "plugin|_start$|_cont$")
+    # Ignore functions, embedded does not export them
+  ELSE()
+    SET(EMBEDDED_API ${EMBEDDED_API} ${f})
+  ENDIF()	
+ENDFOREACH()
+
+IF(NOT DISABLE_SHARED)
+  MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${EMBEDDED_API}
+    COMPONENT  ${COMPONENT_LIBMYSQLD})
+  IF(UNIX)
+    # Name the shared library, handle versioning (provides same api as client
+    # library hence the same version)
+    SET_TARGET_PROPERTIES(libmysqld PROPERTIES 
+      OUTPUT_NAME mariadbd
+      SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
+    INSTALL_SYMLINK(libmysqld.so libmysqld ${INSTALL_LIBDIR} ${COMPONENT_LIBMYSQLD})
+    # Clean direct output flags, as 2 targets have the same base name
+    # libmysqld
+    SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+    SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+    TARGET_LINK_LIBRARIES(mysqlserver LINK_PRIVATE tpool ${CRC32_LIBRARY})
+    IF(LIBMYSQLD_SO_EXTRA_LIBS)
+       TARGET_LINK_LIBRARIES(libmysqld LINK_PRIVATE ${LIBMYSQLD_SO_EXTRA_LIBS})
+    ENDIF()
+  ENDIF()
+ENDIF()
diff --git a/libmysqld/client_settings.h b/libmysqld/client_settings.h
new file mode 100644
index 00000000..29f7c6c0
--- /dev/null
+++ b/libmysqld/client_settings.h
@@ -0,0 +1,72 @@
+/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+#ifndef CLIENT_SETTINGS_INCLUDED
+#define CLIENT_SETTINGS_INCLUDED
+#else
+#error You have already included an client_settings.h and it should not be included twice
+#endif /* CLIENT_SETTINGS_INCLUDED */
+
+extern uint		mysql_port;
+extern char *	mysql_unix_port;
+
+/*
+ Note: CLIENT_CAPABILITIES is also defined in sql/client_settings.h.
+ When adding capabilities here, consider if they should be also added to
+ the server's version.
+*/
+#define CLIENT_CAPABILITIES (CLIENT_MYSQL | \
+                             CLIENT_LONG_FLAG |     \
+                             CLIENT_TRANSACTIONS |  \
+                             CLIENT_PROTOCOL_41 | \
+                             CLIENT_SECURE_CONNECTION | \
+                             CLIENT_MULTI_RESULTS | \
+                             CLIENT_PS_MULTI_RESULTS | \
+                             CLIENT_PLUGIN_AUTH | \
+                             CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | \
+                             CLIENT_CONNECT_ATTRS)
+
+sig_handler my_pipe_sig_handler(int sig);
+void read_user_name(char *name);
+my_bool handle_local_infile(MYSQL *mysql, const char *net_filename);
+
+void mysql_read_default_options(struct st_mysql_options *options,
+				const char *filename,const char *group);
+void mysql_detach_stmt_list(LIST **stmt_list, const char *func_name);
+MYSQL * STDCALL
+cli_mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
+		       const char *passwd, const char *db,
+		       uint port, const char *unix_socket,ulong client_flag);
+
+void cli_mysql_close(MYSQL *mysql);
+
+MYSQL_FIELD * cli_list_fields(MYSQL *mysql);
+my_bool cli_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt);
+MYSQL_DATA * cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
+				   uint fields);
+int cli_stmt_execute(MYSQL_STMT *stmt);
+int cli_read_binary_rows(MYSQL_STMT *stmt);
+int cli_unbuffered_fetch(MYSQL *mysql, char **row);
+const char * cli_read_statistics(MYSQL *mysql);
+int cli_read_change_user_result(MYSQL *mysql);
+
+#ifdef EMBEDDED_LIBRARY
+int init_embedded_server(int argc, char **argv, char **groups);
+void end_embedded_server();
+#endif /*EMBEDDED_LIBRARY*/
+
+C_MODE_START
+extern int mysql_init_character_set(MYSQL *mysql);
+C_MODE_END
diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc
new file mode 100644
index 00000000..31f4cf11
--- /dev/null
+++ b/libmysqld/emb_qcache.cc
@@ -0,0 +1,502 @@
+/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+#include "mariadb.h"
+#include "sql_priv.h"
+
+#ifdef HAVE_QUERY_CACHE
+#include <mysql.h>
+#include "sql_basic_types.h"
+#include "emb_qcache.h"
+#include "embedded_priv.h"
+#include "sql_class.h"                          // THD
+
+void Querycache_stream::store_uchar(uchar c)
+{
+  if (data_end == cur_data)
+    use_next_block(TRUE);
+  *(cur_data++)= c;
+#ifdef DBUG_ASSERT_EXISTS
+  stored_size++;
+#endif
+}
+
+void Querycache_stream::store_short(ushort s)
+{
+#ifdef DBUG_ASSERT_EXISTS
+  stored_size+= 2;
+#endif
+  if (data_end - cur_data > 1)
+  {
+    int2store(cur_data, s);
+    cur_data+= 2;
+    return;
+  }
+  if (data_end == cur_data)
+  {
+    use_next_block(TRUE);
+    int2store(cur_data, s);
+    cur_data+= 2;
+    return;
+  }
+  *cur_data= ((uchar *)(&s))[0];
+  use_next_block(TRUE);
+  *(cur_data++)= ((uchar *)(&s))[1];
+}
+
+void Querycache_stream::store_int(uint i)
+{
+#ifdef DBUG_ASSERT_EXISTS
+  stored_size+= 4;
+#endif
+  size_t rest_len= data_end - cur_data;
+  if (rest_len > 3)
+  {
+    int4store(cur_data, i);
+    cur_data+= 4;
+    return;
+  }
+  if (!rest_len)
+  {
+    use_next_block(TRUE);
+    int4store(cur_data, i);
+    cur_data+= 4;
+    return;
+  }
+  char buf[4];
+  int4store(buf, i);
+  memcpy(cur_data, buf, rest_len);
+  use_next_block(TRUE);
+  memcpy(cur_data, buf+rest_len, 4-rest_len);
+  cur_data+= 4-rest_len;
+}
+
+void Querycache_stream::store_ll(ulonglong ll)
+{
+#ifdef DBUG_ASSERT_EXISTS
+  stored_size+= 8;
+#endif
+  size_t rest_len= data_end - cur_data;
+  if (rest_len > 7)
+  {
+    int8store(cur_data, ll);
+    cur_data+= 8;
+    return;
+  }
+  if (!rest_len)
+  {
+    use_next_block(TRUE);
+    int8store(cur_data, ll);
+    cur_data+= 8;
+    return;
+  }
+  memcpy(cur_data, &ll, rest_len);
+  use_next_block(TRUE);
+  memcpy(cur_data, ((uchar*)&ll)+rest_len, 8-rest_len);
+  cur_data+= 8-rest_len;
+}
+
+void Querycache_stream::store_str_only(const char *str, uint str_len)
+{
+#ifdef DBUG_ASSERT_EXISTS
+  stored_size+= str_len;
+#endif
+  do
+  {
+    size_t rest_len= data_end - cur_data;
+    if (rest_len >= str_len)
+    {
+      memcpy(cur_data, str, str_len);
+      cur_data+= str_len;
+      return;
+    }
+    memcpy(cur_data, str, rest_len);
+    use_next_block(TRUE);
+    str_len-= rest_len;
+    str+= rest_len;
+  } while(str_len);
+}
+
+void Querycache_stream::store_str(const char *str, uint str_len)
+{
+  store_int(str_len);
+  store_str_only(str, str_len);
+}
+
+void Querycache_stream::store_safe_str(const char *str, uint str_len)
+{
+  if (str)
+  {
+    store_int(str_len+1);
+    store_str_only(str, str_len);
+  }
+  else
+    store_int(0);
+}
+
+uchar Querycache_stream::load_uchar()
+{
+  if (cur_data == data_end)
+    use_next_block(FALSE);
+  return *(cur_data++);
+}
+
+ushort Querycache_stream::load_short()
+{
+  ushort result;
+  if (data_end-cur_data > 1)
+  {
+    result= uint2korr(cur_data);
+    cur_data+= 2;
+    return result;
+  }
+  if (data_end == cur_data)
+  {
+    use_next_block(FALSE);
+    result= uint2korr(cur_data);
+    cur_data+= 2;
+    return result;
+  }
+  ((uchar*)&result)[0]= *cur_data;
+  use_next_block(FALSE);
+  ((uchar*)&result)[1]= *(cur_data++);
+  return result;
+}
+
+uint Querycache_stream::load_int()
+{
+  int result;
+  size_t rest_len= data_end - cur_data;
+  if (rest_len > 3)
+  {
+    result= uint4korr(cur_data);
+    cur_data+= 4;
+    return result;
+  }
+  if (!rest_len)
+  {
+    use_next_block(FALSE);
+    result= uint4korr(cur_data);
+    cur_data+= 4;
+    return result;
+  }
+  char buf[4];
+  memcpy(buf, cur_data, rest_len);
+  use_next_block(FALSE);
+  memcpy(buf+rest_len, cur_data, 4-rest_len);
+  cur_data+= 4-rest_len;
+  result= uint4korr(buf);
+  return result;
+}
+
+ulonglong Querycache_stream::load_ll()
+{
+  ulonglong result;
+  size_t rest_len= data_end - cur_data;
+  if (rest_len > 7)
+  {
+    result= uint8korr(cur_data);
+    cur_data+= 8;
+    return result;
+  }
+  if (!rest_len)
+  {
+    use_next_block(FALSE);
+    result= uint8korr(cur_data);
+    cur_data+= 8;
+    return result;
+  }
+  memcpy(&result, cur_data, rest_len);
+  use_next_block(FALSE);
+  memcpy(((uchar*)&result)+rest_len, cur_data, 8-rest_len);
+  cur_data+= 8-rest_len;
+  return result;
+}
+
+void Querycache_stream::load_str_only(char *buffer, uint str_len)
+{
+  do
+  {
+    size_t rest_len= data_end - cur_data;
+    if (rest_len >= str_len)
+    {
+      memcpy(buffer, cur_data, str_len);
+      cur_data+= str_len;
+      buffer+= str_len;
+      break;
+    }
+    memcpy(buffer, cur_data, rest_len);
+    use_next_block(FALSE);
+    str_len-= rest_len;
+    buffer+= rest_len;
+  } while(str_len);
+  *buffer= 0;
+}
+
+char *Querycache_stream::load_str(MEM_ROOT *alloc, uint *str_len)
+{
+  char *result;
+  *str_len= load_int();
+  if (!(result= (char*) alloc_root(alloc, *str_len + 1)))
+    return 0;
+  load_str_only(result, *str_len);
+  return result;
+}
+
+int Querycache_stream::load_safe_str(MEM_ROOT *alloc, char **str, uint *str_len)
+{
+  if (!(*str_len= load_int()))
+  {
+    *str= NULL;
+    return 0;
+  }
+  (*str_len)--;
+  if (!(*str= (char*) alloc_root(alloc, *str_len + 1)))
+    return 1;
+  load_str_only(*str, *str_len);
+  return 0;
+}
+
+int Querycache_stream::load_column(MEM_ROOT *alloc, char** column)
+{
+  int len;
+  if (!(len = load_int()))
+  {
+    *column= NULL;
+    return 0;
+  }
+  len--;
+  if (!(*column= (char *)alloc_root(alloc, len + sizeof(uint) + 1)))
+    return 1;
+  *((uint*)*column)= len;
+  (*column)+= sizeof(uint);
+  load_str_only(*column, len);
+  return 1;
+}
+
+uint emb_count_querycache_size(THD *thd)
+{
+  uint result= 0;
+  MYSQL_FIELD *field;
+  MYSQL_FIELD *field_end;
+  MYSQL_ROWS *cur_row;
+  my_ulonglong n_rows;
+  MYSQL_DATA *data= thd->first_data;
+
+  while (data->embedded_info->next)
+    data= data->embedded_info->next;
+  field= data->embedded_info->fields_list;
+  field_end= field + data->fields;
+  
+  if (!field)
+    return result;
+  *data->embedded_info->prev_ptr= NULL; // this marks the last record
+  cur_row= data->data;
+  n_rows= data->rows;
+  /* n_fields + n_rows + field_info * n_fields */
+  result+= (uint) (4+8 + 42*data->fields);
+
+  for(; field < field_end; field++)
+  {
+    result+= field->name_length + field->table_length +
+      field->org_name_length + field->org_table_length + field->db_length +
+      field->catalog_length;
+    if (field->def)
+      result+= field->def_length;
+  }
+  
+  if (thd->protocol == &thd->protocol_binary ||
+      thd->get_command() == COM_STMT_EXECUTE)
+  {
+    result+= (uint) (4*n_rows);
+    for (; cur_row; cur_row=cur_row->next)
+      result+= cur_row->length;
+  }
+  else
+  {
+    result+= (uint) (4*n_rows*data->fields);
+    for (; cur_row; cur_row=cur_row->next)
+    {
+      MYSQL_ROW col= cur_row->data;
+      MYSQL_ROW col_end= col + data->fields;
+      for (; col < col_end; col++)
+        if (*col)
+          result+= *(uint *)((*col) - sizeof(uint));
+    }
+  }
+  return result;
+}
+
+void emb_store_querycache_result(Querycache_stream *dst, THD *thd)
+{
+  MYSQL_FIELD *field;
+  MYSQL_FIELD *field_end;
+  MYSQL_ROWS *cur_row;
+  my_ulonglong n_rows;
+  MYSQL_DATA *data= thd->first_data;
+
+  DBUG_ENTER("emb_store_querycache_result");
+
+  while (data->embedded_info->next)
+    data= data->embedded_info->next;
+  field= data->embedded_info->fields_list;
+  field_end= field + data->fields;
+
+  if (!field)
+    DBUG_VOID_RETURN;
+
+  *data->embedded_info->prev_ptr= NULL; // this marks the last record
+  cur_row= data->data;
+  n_rows= data->rows;
+
+  dst->store_int((uint)data->fields);
+  dst->store_ll((ulonglong)n_rows);
+
+  for(; field < field_end; field++)
+  {
+    dst->store_int((uint)field->length);
+    dst->store_int((uint)field->max_length);
+    dst->store_uchar((uchar)field->type);
+    dst->store_short((ushort)field->flags);
+    dst->store_short((ushort)field->charsetnr);
+    dst->store_uchar((uchar)field->decimals);
+    dst->store_str(field->name, field->name_length);
+    dst->store_str(field->table, field->table_length);
+    dst->store_str(field->org_name, field->org_name_length);
+    dst->store_str(field->org_table, field->org_table_length);
+    dst->store_str(field->db, field->db_length);
+    dst->store_str(field->catalog, field->catalog_length);
+    dst->store_safe_str(field->def, field->def_length);
+  }
+  
+  if (thd->protocol == &thd->protocol_binary ||
+      thd->get_command() == COM_STMT_EXECUTE)
+  {
+    for (; cur_row; cur_row=cur_row->next)
+      dst->store_str((char *) cur_row->data, cur_row->length);
+  }
+  else
+  {
+    for (; cur_row; cur_row=cur_row->next)
+    {
+      MYSQL_ROW col= cur_row->data;
+      MYSQL_ROW col_end= col + data->fields;
+      for (; col < col_end; col++)
+      {
+        uint len= *col ? *(uint *)((*col) - sizeof(uint)) : 0;
+        dst->store_safe_str(*col, len);
+      }
+    }
+  }
+  DBUG_ASSERT(emb_count_querycache_size(thd) == dst->stored_size);
+  DBUG_VOID_RETURN;
+}
+
+int emb_load_querycache_result(THD *thd, Querycache_stream *src)
+{
+  MYSQL_DATA *data= thd->alloc_new_dataset();
+  MYSQL_FIELD *field;
+  MYSQL_FIELD *field_end;
+  MEM_ROOT *f_alloc;
+  MYSQL_ROWS *row, *end_row;
+  MYSQL_ROWS **prev_row;
+  ulonglong rows;
+  MYSQL_ROW columns;
+  DBUG_ENTER("emb_load_querycache_result");
+
+  if (!data)
+    goto err;
+  init_alloc_root(PSI_NOT_INSTRUMENTED, &data->alloc, 8192, 0, MYF(0));
+  f_alloc= &data->alloc;
+
+  data->fields= src->load_int();
+  rows= src->load_ll();
+
+  if (!(field= (MYSQL_FIELD *)
+        alloc_root(f_alloc,data->fields*sizeof(MYSQL_FIELD))))
+    goto err;
+  data->embedded_info->fields_list= field;
+  for(field_end= field+data->fields; field < field_end; field++)
+  {
+    field->length= src->load_int();
+    field->max_length= (unsigned int)src->load_int();
+    field->type= (enum enum_field_types)src->load_uchar();
+    field->flags= (unsigned int)src->load_short();
+    field->charsetnr= (unsigned int)src->load_short();
+    field->decimals= src->load_uchar();
+
+    if (!(field->name= src->load_str(f_alloc, &field->name_length))          ||
+        !(field->table= src->load_str(f_alloc,&field->table_length))         ||
+        !(field->org_name= src->load_str(f_alloc, &field->org_name_length))  ||
+        !(field->org_table= src->load_str(f_alloc, &field->org_table_length))||
+        !(field->db= src->load_str(f_alloc, &field->db_length))              ||
+        !(field->catalog= src->load_str(f_alloc, &field->catalog_length))    ||
+        src->load_safe_str(f_alloc, &field->def, &field->def_length))
+      goto err;
+    field->extension= NULL;
+  }
+  
+  data->rows= rows;
+  if (!rows)
+    goto return_ok;
+  if (thd->protocol == &thd->protocol_binary ||
+      thd->get_command() == COM_STMT_EXECUTE)
+  {
+    uint length;
+    row= (MYSQL_ROWS *)alloc_root(&data->alloc,
+                                  (size_t) (rows * sizeof(MYSQL_ROWS)));
+    end_row= row + rows;
+    data->data= row;
+
+    for (prev_row= &row->next; row < end_row; prev_row= &row->next, row++)
+    {
+      *prev_row= row;
+      row->data= (MYSQL_ROW) src->load_str(&data->alloc, &length);
+      row->length= length;
+    }
+  }
+  else
+  {
+    row= (MYSQL_ROWS *)alloc_root(&data->alloc,
+        (uint) (rows * sizeof(MYSQL_ROWS) +
+          rows*(data->fields+1)*sizeof(char*)));
+    end_row= row + rows;
+    columns= (MYSQL_ROW)end_row;
+
+    data->data= row;
+
+    for (prev_row= &row->next; row < end_row; prev_row= &row->next, row++)
+    {
+      *prev_row= row;
+      row->data= columns;
+      MYSQL_ROW col_end= columns + data->fields;
+      for (; columns < col_end; columns++)
+        src->load_column(&data->alloc, columns);
+
+      *(columns++)= NULL;
+    }
+  }
+  *prev_row= NULL;
+  data->embedded_info->prev_ptr= prev_row;
+return_ok:
+  thd->protocol->net_send_eof(thd, thd->server_status,
+    thd->get_stmt_da()->current_statement_warn_count());
+  DBUG_RETURN(0);
+err:
+  DBUG_RETURN(1);
+}
+
+#endif /*HAVE_QUERY_CACHE*/
+
diff --git a/libmysqld/emb_qcache.h b/libmysqld/emb_qcache.h
new file mode 100644
index 00000000..e3b6339b
--- /dev/null
+++ b/libmysqld/emb_qcache.h
@@ -0,0 +1,83 @@
+/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+#include "sql_cache.h"                         /* Query_cache_block */
+
+class Querycache_stream
+{
+  uchar *cur_data;
+  uchar *data_end;
+  Query_cache_block *block;
+  uint headers_len;
+public:
+#ifdef DBUG_ASSERT_EXISTS
+  Query_cache_block *first_block;
+  uint stored_size;
+#endif
+  Querycache_stream(Query_cache_block *ini_block, uint ini_headers_len) :
+    block(ini_block), headers_len(ini_headers_len)    
+  {
+    cur_data= ((uchar*)block)+headers_len;
+    data_end= cur_data + (block->used-headers_len);
+#ifdef DBUG_ASSERT_EXISTS
+    first_block= ini_block;
+    stored_size= 0;
+#endif
+  }
+  void use_next_block(bool writing)
+  {
+    /*
+      This shouldn't be called if there is only one block, or to loop
+      around to the first block again. That means we're trying to write
+      more data than we allocated space for.
+    */
+    DBUG_ASSERT(block->next != block);
+    DBUG_ASSERT(block->next != first_block);
+
+    block= block->next;
+    /*
+      While writing, update the type of each block as we write to it.
+      While reading, make sure that the block is of the expected type.
+    */
+    if (writing)
+      block->type= Query_cache_block::RES_CONT;
+    else
+      DBUG_ASSERT(block->type == Query_cache_block::RES_CONT);
+
+    cur_data= ((uchar*)block)+headers_len;
+    data_end= cur_data + (block->used-headers_len);
+  }
+
+  void store_uchar(uchar c);
+  void store_short(ushort s);
+  void store_int(uint i);
+  void store_ll(ulonglong ll);
+  void store_str_only(const char *str, uint str_len);
+  void store_str(const char *str, uint str_len);
+  void store_safe_str(const char *str, uint str_len);
+
+  uchar load_uchar();
+  ushort load_short();
+  uint load_int();
+  ulonglong load_ll();
+  void load_str_only(char *buffer, uint str_len);
+  char *load_str(MEM_ROOT *alloc, uint *str_len);
+  int load_safe_str(MEM_ROOT *alloc, char **str, uint *str_len);
+  int load_column(MEM_ROOT *alloc, char **column);
+};
+
+uint emb_count_querycache_size(THD *thd);
+int emb_load_querycache_result(THD *thd, Querycache_stream *src);
+void emb_store_querycache_result(Querycache_stream *dst, THD* thd);
diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h
new file mode 100644
index 00000000..22627062
--- /dev/null
+++ b/libmysqld/embedded_priv.h
@@ -0,0 +1,48 @@
+/* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+/* Prototypes for the embedded version of MySQL */
+
+#include <sql_common.h>
+
+C_MODE_START
+void lib_connection_phase(NET *net, int phase);
+void init_embedded_mysql(MYSQL *mysql, ulong client_flag);
+void *create_embedded_thd(ulong client_flag);
+int check_embedded_connection(MYSQL *mysql, const char *db);
+void free_old_query(MYSQL *mysql);
+extern MYSQL_METHODS embedded_methods;
+
+/* This one is used by embedded library to gather returning data */
+typedef struct embedded_query_result
+{
+  MYSQL_ROWS **prev_ptr;
+  unsigned int warning_count, server_status;
+  struct st_mysql_data *next;
+  my_ulonglong affected_rows, insert_id;
+  char info[MYSQL_ERRMSG_SIZE];
+  MYSQL_FIELD *fields_list;
+  unsigned int last_errno;
+  char sqlstate[SQLSTATE_LENGTH+1];
+} EQR;
+
+
+typedef struct st_mariadb_field_extension
+{
+  MARIADB_CONST_STRING metadata[MARIADB_FIELD_ATTR_LAST+1]; /* 10.5 */
+} MARIADB_FIELD_EXTENSION;
+
+
+C_MODE_END
diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt
new file mode 100644
index 00000000..2a10def8
--- /dev/null
+++ b/libmysqld/examples/CMakeLists.txt
@@ -0,0 +1,63 @@
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335 USA
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
+                    ${CMAKE_SOURCE_DIR}/libmysqld/include
+                    ${PCRE_INCLUDES}
+                    ${CMAKE_SOURCE_DIR}/sql
+                    ${MY_READLINE_INCLUDE_DIR}
+                    )
+
+
+ADD_DEFINITIONS(-DEMBEDDED_LIBRARY -UMYSQL_CLIENT)
+
+
+MYSQL_ADD_EXECUTABLE(mariadb-embedded ../../client/completion_hash.cc
+               ../../client/mysql.cc ../../client/readline.cc
+               COMPONENT Client)
+TARGET_LINK_LIBRARIES(mariadb-embedded mysqlserver)
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(mariadb-embedded ${MY_READLINE_LIBRARY})
+ENDIF(UNIX)
+
+MYSQL_ADD_EXECUTABLE(mariadb-test-embedded ../../client/mysqltest.cc
+  COMPONENT Test)
+TARGET_LINK_LIBRARIES(mariadb-test-embedded mysqlserver pcre2-posix pcre2-8)
+SET_SOURCE_FILES_PROPERTIES(../../client/mysqltest.cc PROPERTIES COMPILE_FLAGS "${PCRE2_DEBIAN_HACK}")
+
+IF(CMAKE_GENERATOR MATCHES "Xcode")
+# It does not seem possible to tell Xcode the resulting target might need
+# to be linked with C++ runtime. The project needs to have at least one C++
+# file. Add a dummy one.
+  ADD_CUSTOM_COMMAND(OUTPUT
+    ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc
+   COMMAND ${CMAKE_COMMAND} -E touch
+    ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc
+  )
+  MYSQL_ADD_EXECUTABLE(mariadb-client-test-embedded
+    ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc
+    ../../tests/mysql_client_test.c)
+ELSE()
+  MYSQL_ADD_EXECUTABLE(mariadb-client-test-embedded ../../tests/mysql_client_test.c
+    COMPONENT Test)
+  SET_TARGET_PROPERTIES(mariadb-client-test-embedded  PROPERTIES HAS_CXX TRUE)
+ENDIF()
+TARGET_LINK_LIBRARIES(mariadb-client-test-embedded mysqlserver)
+
+IF(UNIX)
+SET_TARGET_PROPERTIES(mariadb-embedded PROPERTIES ENABLE_EXPORTS TRUE)
+SET_TARGET_PROPERTIES(mariadb-test-embedded PROPERTIES ENABLE_EXPORTS TRUE)
+SET_TARGET_PROPERTIES(mariadb-client-test-embedded PROPERTIES ENABLE_EXPORTS TRUE)
+ENDIF()
diff --git a/libmysqld/examples/builder-sample/emb_sample.bpr b/libmysqld/examples/builder-sample/emb_sample.bpr
new file mode 100644
index 00000000..ab66dce8
--- /dev/null
+++ b/libmysqld/examples/builder-sample/emb_sample.bpr
@@ -0,0 +1,208 @@
+# Copyright (c) 2002 MySQL AB
+# Use is subject to license terms.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
+
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.04.04
+# ---------------------------------------------------------------------------
+PROJECT = emb_sample.exe
+OBJFILES = emb_sample.obj emb_samples.obj
+RESFILES = emb_sample.res
+RESDEPEN = $(RESFILES) emb_samples.dfm
+LIBFILES = libmysqld.lib
+LIBRARIES =
+SPARELIBS = Vcl40.lib
+PACKAGES = Vcl40.bpi Vclx40.bpi vcljpg40.bpi bcbsmp40.bpi Qrpt40.bpi Vcldb40.bpi \
+  ibsmp40.bpi vcldbx40.bpi TeeUI40.bpi teedb40.bpi tee40.bpi nmfast40.bpi \
+  dclocx40.bpi
+DEFFILE =
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+USERDEFINES =
+SYSDEFINES = _RTLDLL;NO_STRICT;USEPACKAGES
+# ---------------------------------------------------------------------------
+CFLAG1 = -I$(BCB)\include;$(BCB)\include\vcl;..\..\..\include -Od -Hc \
+  -H=$(BCB)\lib\vcl40.csm -w -Ve -r- -a8 -k -y -v -vi- -c -b- -w-par -w-inl -Vx \
+  -tW -tWM -D$(SYSDEFINES);$(USERDEFINES)
+PFLAGS = -U$(BCB)\lib\obj;$(BCB)\lib;$(RELEASELIBPATH) \
+  -I$(BCB)\include;$(BCB)\include\vcl;..\..\..\include -$YD -$W -$O- -v -JPHNE -M
+RFLAGS = -i$(BCB)\include;$(BCB)\include\vcl;..\..\..\include
+AFLAGS = /i$(BCB)\include /i$(BCB)\include\vcl /i..\..\..\include /mx /w2 /zd
+LFLAGS = -L$(BCB)\lib\obj;$(BCB)\lib;$(RELEASELIBPATH) -aa -Tpe -x -Gn -v
+# ---------------------------------------------------------------------------
+ALLOBJ = c0w32.obj Memmgr.Lib $(PACKAGES) sysinit.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=1
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1046
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=MySQL AB
+FileDescription=Embedded Server Sample
+FileVersion=1.0.0.0
+InternalName=Builder Embedded Server Sample
+LegalCopyright=GNU
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=$(BCB)\include;$(BCB)\include\vcl;..\..\..\include
+Item1=$(BCB)\include;$(BCB)\include\vcl;..\..\..\inluce
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+InMemoryExe=0
+ShowInfoMsgs=0
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(CPP32)
+CPP32 = cpp32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) -n$(@D) {$< }
+
+.c.i:
+    $(BCB)\BIN\$(CPP32) $(CFLAG1) -n. {$< }
+
+.cpp.i:
+    $(BCB)\BIN\$(CPP32) $(CFLAG1) -n. {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/libmysqld/examples/builder-sample/emb_sample.cpp b/libmysqld/examples/builder-sample/emb_sample.cpp
new file mode 100644
index 00000000..61b867c9
--- /dev/null
+++ b/libmysqld/examples/builder-sample/emb_sample.cpp
@@ -0,0 +1,39 @@
+// Copyright (c) 2002 MySQL AB
+// Use is subject to license terms.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
+
+//---------------------------------------------------------------------------
+#include <vcl.h>
+#pragma hdrstop
+USERES("emb_sample.res");
+USEFORM("emb_samples.cpp", Form1);
+USELIB("libmysqld.lib");
+//---------------------------------------------------------------------------
+WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+{
+        try
+        {
+                 Application->Initialize();
+                 Application->Title = "MySQL Embedded Server Sample";
+                 Application->CreateForm(__classid(TForm1), &Form1);
+                 Application->Run();
+        }
+        catch (Exception &exception)
+        {
+                 Application->ShowException(&exception);
+        }
+        return 0;
+}
+//---------------------------------------------------------------------------
diff --git a/libmysqld/examples/builder-sample/emb_samples.cpp b/libmysqld/examples/builder-sample/emb_samples.cpp
new file mode 100644
index 00000000..94787d58
--- /dev/null
+++ b/libmysqld/examples/builder-sample/emb_samples.cpp
@@ -0,0 +1,300 @@
+// Copyright (c) 2002, 2004, 2007 MySQL AB
+// Use is subject to license terms.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
+
+//---------------------------------------------------------------------------
+#include <vcl.h>
+#pragma hdrstop
+
+#include "emb_samples.h"
+#include <winsock2.h>
+#include <mysql.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <deque.h>
+bool b_new_line = false;
+const char *server_groups[] = {
+  "", "embedded", "server", NULL
+};
+MYSQL *MySQL;
+deque<string> fill_rows(MYSQL_RES *res);
+//---------------------------------------------------------------------------
+#pragma package(smart_init)
+#pragma resource "*.dfm"
+TForm1 *Form1;
+//---------------------------------------------------------------------------
+deque<string> fill_rows(MYSQL_RES *res)
+{
+ MYSQL_ROW row;
+ deque<string> rows;
+
+ while ((row=mysql_fetch_row(res)) != 0)
+ {
+   mysql_field_seek(res,0);
+   for (unsigned int i=0 ; i < mysql_num_fields(res); i++)
+    rows.push_back(row[i]);
+ }
+ return rows;
+}
+//---------------------------------------------------------------------------
+__fastcall TForm1::TForm1(TComponent* Owner)
+        : TForm(Owner)
+{
+}
+//---------------------------------------------------------------------------
+
+void __fastcall TForm1::Timer1Timer(TObject *Sender)
+{
+ if (is_server_started)
+ {
+  ToggleButton->Caption = "Quit";
+  Timer1->Enabled = false;
+ }
+}
+//---------------------------------------------------------------------------
+void __fastcall TForm1::FormCreate(TObject *Sender)
+{
+  is_server_started = false;
+  computer_ip(); /* get the computer name and IP number */
+  /* init the tree database screen */
+  db_root = DBView->Items->Add(NULL, db_root_caption.UpperCase());
+  db_root->ImageIndex = 0;
+}
+//---------------------------------------------------------------------------
+/* button which handle the init of mysql server or quit the app */
+void __fastcall TForm1::ToggleButtonClick(TObject *Sender)
+{
+ if (!is_server_started)
+ {
+  mysql_server_init(NULL, NULL, (char **)server_groups) ;
+  connect_server();
+  get_dbs();
+ }
+ else
+ {
+  mysql_server_end();
+  Close();
+ }
+}
+//---------------------------------------------------------------------------
+void __fastcall TForm1::computer_ip(void)
+{
+  WORD wVersionRequested;
+  WSADATA WSAData;
+  wVersionRequested = MAKEWORD(1,1);
+  WSAStartup(wVersionRequested,&WSAData);
+  hostent *P;
+  char s[128];
+  in_addr in;
+  char *P2;
+
+  gethostname(s, 128);
+  P = gethostbyname(s);
+  db_root_caption = P->h_name;
+  in.S_un.S_un_b.s_b1 = P->h_addr_list[0][0];
+  in.S_un.S_un_b.s_b2 = P->h_addr_list[0][1];
+  in.S_un.S_un_b.s_b3 = P->h_addr_list[0][2];
+  in.S_un.S_un_b.s_b4 = P->h_addr_list[0][3];
+  P2 = inet_ntoa(in);
+  db_root_caption += " ( " + (AnsiString)P2 + " )";
+}
+//---------------------------------------------------------------------------
+bool __fastcall TForm1::connect_server()
+{
+  bool ret_value = false;
+
+  MySQL = mysql_init(MySQL);
+  if (!MySQL)
+   return ret_value;
+  if (mysql_real_connect(MySQL, NULL, NULL, NULL, NULL, 0, NULL, 0))
+  {
+   ret_value = true;
+   is_server_started = true;
+  }
+  MySQL->reconnect= 1;
+  return ret_value;
+}
+//---------------------------------------------------------------------------
+void __fastcall TForm1::FormDestroy(TObject *Sender)
+{
+  if (is_server_started)
+   mysql_server_end();
+}
+//---------------------------------------------------------------------------
+
+void __fastcall TForm1::DBViewClick(TObject *Sender)
+{
+  if (DBView->Selected != db_root && DBView->Selected != NULL)
+  {
+   get_tables(DBView->Selected->Text);
+   clean_desc_grid();
+  }
+}
+//---------------------------------------------------------------------------
+bool __fastcall TForm1::get_tables(String db_name)
+{
+  MYSQL_RES *res;
+  AnsiString s_cmd;
+
+  TableView->Items->Clear();
+  s_cmd = "use ";
+  s_cmd+= db_name.c_str();
+
+  if (mysql_query(MySQL, s_cmd.c_str()) ||
+      !(res=mysql_list_tables(MySQL,"%")))
+   return false;
+
+  tables_node = TableView->Items->Add(NULL, db_name.c_str());
+  tables_node->ImageIndex = 1;
+  tables_node->SelectedIndex = 1;
+
+  deque<string> rows = fill_rows(res);
+
+  mysql_free_result(res);
+  fill_tree(rows,tables_tree,tables_node,TableView,2);
+
+  return true;
+}
+//---------------------------------------------------------------------------
+bool __fastcall TForm1::get_dbs(void)
+{
+ MYSQL_RES *res;
+
+ if (!is_server_started)
+  return false;
+
+ if (!(res=mysql_list_dbs(MySQL,"%")))
+  return false;
+
+ deque<string> rows = fill_rows(res);
+
+ mysql_free_result(res);
+ fill_tree(rows,MySQLDbs,db_root,DBView,1);
+ info_server->Text = mysql_get_server_info(MySQL);
+
+ return true;
+}
+//---------------------------------------------------------------------------
+void __fastcall TForm1::fill_tree(deque<string> rows,
+                                  TTreeNode *root,
+                                  TTreeNode *child,
+                                  TTreeView *View,
+                                  int image_index)
+{
+  deque<string>::iterator r;
+  for(r = rows.begin(); r != rows.end() ; r++)
+  {
+   root = View->Items->AddChild(child, (*r).c_str());
+   root->ImageIndex = image_index;
+   root->SelectedIndex = image_index;
+  }
+  child->Expanded = true;
+}
+//---------------------------------------------------------------------------
+bool __fastcall TForm1::get_desc_table(String table_name)
+{
+ MYSQL_RES *res, *res1;
+ MYSQL_ROW row;
+ AnsiString use_db, show_cols, show_desc;
+ unsigned int num_fields;
+ int fields_control = 0, grid_row = 1, fields_number;
+ b_new_line= true;
+
+ clean_desc_grid();
+ use_db = "use ";
+ use_db+= DBView->Selected->Text.c_str();
+ show_desc = "desc ";
+ show_cols = "show full columns from ";
+ show_cols+= table_name.c_str();
+ show_desc+= table_name.c_str();
+
+ if (mysql_query(MySQL, use_db.c_str() ))
+  return false;
+
+ if (mysql_query(MySQL, show_cols.c_str() ) ||
+      !(res1=mysql_store_result(MySQL)))
+ {
+  if (mysql_query(MySQL, show_desc.c_str() ) ||
+       !(res1=mysql_store_result(MySQL)))
+   return false ;
+ }
+  mysql_fetch_row(res1);
+  mysql_field_seek(res1,0);
+  fields_number = (mysql_num_fields(res1) - 2);
+  mysql_free_result(res1);
+
+ if (mysql_query(MySQL, show_cols.c_str() ) ||
+ !(res=mysql_store_result(MySQL)))
+ {
+  if (mysql_query(MySQL, show_desc.c_str() ) ||
+      !(res=mysql_store_result(MySQL)))
+   return false ;
+ }
+ titles_grid();
+ while ((row=mysql_fetch_row(res)) != 0)
+ {
+   mysql_field_seek(res,0);
+   for (num_fields=0 ; num_fields < mysql_num_fields(res); num_fields++)
+   {
+    if (fields_control <= fields_number )
+    {
+     desc_table_grid->Cells[fields_control][grid_row] = row[num_fields];
+     fields_control++;
+    }
+    else
+    {
+     desc_table_grid->Cells[(fields_control)][grid_row] = row[num_fields];
+     fields_control = 0;
+     grid_row++ ;
+     desc_table_grid->RowCount++;
+    }
+   }
+ }
+ desc_table_grid->RowCount--;
+ mysql_free_result(res);
+ return true;
+}
+//---------------------------------------------------------------------------
+void __fastcall TForm1::TableViewClick(TObject *Sender)
+{
+ if (DBView->Selected != db_root && DBView->Selected != NULL)
+  if (DBView->Selected != tables_tree)
+   get_desc_table(TableView->Selected->Text);
+}
+//---------------------------------------------------------------------------
+void __fastcall TForm1::clean_desc_grid(void)
+{
+  desc_table_grid->RowCount= 2;
+  desc_table_grid->Cells[0][1] = "";
+  desc_table_grid->Cells[1][1] = "";
+  desc_table_grid->Cells[2][1] = "";
+  desc_table_grid->Cells[3][1] = "";
+  desc_table_grid->Cells[4][1] = "";
+  desc_table_grid->Cells[5][1]  = "";
+}
+//---------------------------------------------------------------------------
+void __fastcall TForm1::titles_grid(void)
+{
+ desc_table_grid->Cells[0][0] = "Field";
+ desc_table_grid->Cells[1][0] = "Type";
+ desc_table_grid->Cells[2][0] = "Null";
+ desc_table_grid->Cells[3][0] = "Key";
+ desc_table_grid->Cells[4][0] = "Default";
+ desc_table_grid->Cells[5][0] = "Extra";
+ desc_table_grid->Cells[6][0] = "Privileges";
+}
+
diff --git a/libmysqld/examples/builder-sample/emb_samples.dfm b/libmysqld/examples/builder-sample/emb_samples.dfm
new file mode 100644
index 00000000..399509ee
--- /dev/null
+++ b/libmysqld/examples/builder-sample/emb_samples.dfm
diff --git a/libmysqld/examples/builder-sample/emb_samples.h b/libmysqld/examples/builder-sample/emb_samples.h
new file mode 100644
index 00000000..310f051a
--- /dev/null
+++ b/libmysqld/examples/builder-sample/emb_samples.h
@@ -0,0 +1,77 @@
+// Copyright (c) 2002 MySQL AB
+// Use is subject to license terms.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
+
+//---------------------------------------------------------------------------
+#ifndef emb_samplesH
+#define emb_samplesH
+//---------------------------------------------------------------------------
+#include <Classes.hpp>
+#include <Controls.hpp>
+#include <StdCtrls.hpp>
+#include <Forms.hpp>
+#include <ComCtrls.hpp>
+#include <Grids.hpp>
+#include <ImgList.hpp>
+#include <ExtCtrls.hpp>
+#include <Graphics.hpp>
+#include <Buttons.hpp>
+#include <deque.h>
+//---------------------------------------------------------------------------
+class TForm1 : public TForm
+{
+__published:	// IDE-managed Components
+        TGroupBox *GroupBox1;
+        TTreeView *DBView;
+        TTreeView *TableView;
+        TStringGrid *desc_table_grid;
+        TImageList *ImageList2;
+        TStatusBar *StatusBar1;
+        TImage *Image1;
+        TBitBtn *ToggleButton;
+        TTimer *Timer1;
+        TLabel *Label1;
+        TEdit *info_server;
+        TLabel *Label2;
+        void __fastcall Timer1Timer(TObject *Sender);
+        void __fastcall FormCreate(TObject *Sender);
+        void __fastcall ToggleButtonClick(TObject *Sender);
+        void __fastcall FormDestroy(TObject *Sender);
+        void __fastcall DBViewClick(TObject *Sender);
+        void __fastcall TableViewClick(TObject *Sender);
+private:	// User declarations
+public:		// User declarations
+        bool is_server_started;
+        AnsiString db_root_caption;
+        TTreeNode *db_root, *MySQLDbs, *tables_node, *tables_tree;
+        void __fastcall computer_ip(void);
+        bool __fastcall get_dbs(void);
+        bool __fastcall get_tables(String db_name);
+        bool __fastcall get_desc_table(String table_name);
+        bool __fastcall connect_server();
+        void __fastcall clean_desc_grid(void);
+        void __fastcall titles_grid(void);
+        void __fastcall fill_tree(deque<string> rows,
+                                  TTreeNode *root,
+                                  TTreeNode *child,
+                                  TTreeView *View,
+                                  int image_index);
+
+        __fastcall TForm1(TComponent* Owner);
+};
+//---------------------------------------------------------------------------
+extern PACKAGE TForm1 *Form1;
+//---------------------------------------------------------------------------
+#endif
diff --git a/libmysqld/examples/builder-sample/images/db.ico b/libmysqld/examples/builder-sample/images/db.ico
new file mode 100644
index 00000000..ca749002
--- /dev/null
+++ b/libmysqld/examples/builder-sample/images/db.ico
diff --git a/libmysqld/examples/builder-sample/images/find.ico b/libmysqld/examples/builder-sample/images/find.ico
new file mode 100644
index 00000000..2e0f96c5
--- /dev/null
+++ b/libmysqld/examples/builder-sample/images/find.ico
diff --git a/libmysqld/examples/builder-sample/images/logo.ico b/libmysqld/examples/builder-sample/images/logo.ico
new file mode 100644
index 00000000..9409cad7
--- /dev/null
+++ b/libmysqld/examples/builder-sample/images/logo.ico
diff --git a/libmysqld/examples/builder-sample/images/mysql.bmp b/libmysqld/examples/builder-sample/images/mysql.bmp
new file mode 100644
index 00000000..ed5c7f90
--- /dev/null
+++ b/libmysqld/examples/builder-sample/images/mysql.bmp
diff --git a/libmysqld/examples/builder-sample/images/net.ico b/libmysqld/examples/builder-sample/images/net.ico
new file mode 100644
index 00000000..bb11e34b
--- /dev/null
+++ b/libmysqld/examples/builder-sample/images/net.ico
diff --git a/libmysqld/examples/builder-sample/snapshot.jpg b/libmysqld/examples/builder-sample/snapshot.jpg
new file mode 100644
index 00000000..b132fac8
--- /dev/null
+++ b/libmysqld/examples/builder-sample/snapshot.jpg
diff --git a/libmysqld/examples/test-run b/libmysqld/examples/test-run
new file mode 100755
index 00000000..7c221ad9
--- /dev/null
+++ b/libmysqld/examples/test-run
@@ -0,0 +1,154 @@
+#! /bin/sh
+
+# Copyright (C) 2001, 2006 MySQL AB
+# Use is subject to license terms
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
+
+# This is slapped together as a quick way to run the tests and
+# is not meant for prime time.  Please hack at it and submit
+# changes, though, so we can gradually turn it into something
+# that will run on all platforms (or incorporate it into the
+# standard mysql-test-run).
+
+# All paths below must be relative to $test_data_dir
+top_builddir=../..
+mysql_test_dir=$top_builddir/mysql-test
+examples=$top_builddir/libmysqld/examples
+mysqltest=$examples/mysqltest_embedded
+datadir=$mysql_test_dir/var/master-data
+test_data_dir=test
+gdb=0
+list=0
+run=
+tests=
+start=
+clean=1
+
+cr="
+"
+er="\b\b\b\b\b\b\b\b"
+
+usage () {
+    cat <<EOF
+usage: $0 [-g|-h|-r] [test-name ...]
+
+    -C | --noclean	Do not remove old innodb and bdb files at start.
+    -g | --gdb          run $mysqltest in gdb
+    -h | --help         show this help
+    -l | --list )       list all available tests
+    -r | --run          automatically 'run' program in gdb
+    -s t | --start=t    start with test t (skip all tests before t)
+EOF
+}
+
+init_args="--server-arg=--language=$top_builddir/sql/share/english"
+while test $# -gt 0
+do
+    arg=
+    argset=0
+    case "$1" in
+        --?*=* ) arg=`echo "$1" | sed -e 's,^[^=][^=]*=,,'`; argset=1 ;;
+    esac
+
+    case "$1" in
+        -g | --gdb )  gdb=1; shift;;
+        -h | --help | -\? ) usage; exit 0;;
+        -l | --list ) list=1 ; shift ;;
+        -r | --run ) run="${cr}run"; shift;;
+        --debug)     init_args="$init_args --debug" ; shift ;;
+        -C | --noclean) clean=0 ; shift ;;
+        -s | --start=* )
+            test $argset -eq 0 && { shift; arg="$1"; }
+            start="$arg"
+            shift
+            ;;
+        -* ) usage; exit 1;;
+        * ) tests="$tests $1"; shift;;
+    esac
+done
+
+if test ! -d "$datadir/$test_data_dir"
+then
+    echo "bad setup (is '$datadir/$test_data_dir'', missing ?)" >&2
+    exit 1
+fi
+
+test -n "$tests" ||
+    tests=`/bin/ls -1 "$mysql_test_dir"/t/*.test | grep -v '^.*/rpl[^/]*$' | \
+        sed -e 's,^.*/,,' -e 's,.test$,,'`
+
+echo "cleaning data directory '$datadir/$test_data_dir'"
+if test $clean = 1
+then
+  rm -f $datadir/ib_* $datadir/ibdata*
+  rm -f $datadir/log.00*
+  rm -f $datadir/test/*.db
+fi
+rm -f $datadir/../tmp/*
+rm -f test-gdbinit
+
+TZ=GMT-3; export TZ
+
+# At least one of the tests needs the following environment variable
+MYSQL_TEST_DIR=`( cd $mysql_test_dir ; pwd )` ; export MYSQL_TEST_DIR
+
+skip=1
+test -z "$start" && skip=0
+
+for b in $tests
+do
+    test $list -eq 1 && { echo "  $b"; continue; }
+    test $skip -eq 1 && test -n "$start" && test "$start" = "$b" && skip=0
+    test $skip -eq 1 && { echo "skipping '$b'"; continue; }
+
+    t="t/$b.test"
+    r="r/$b.result"
+
+    # Only test if $t exists; there is no $r for some tests
+    test -f $mysql_test_dir/$t || {
+        echo "test '$mysql_test_dir/$t' doesn't exist" >&2
+        continue
+    }
+    args="$init_args -v --basedir=$mysql_test_dir/ -R $r -x $t --server-arg=--datadir=$datadir"
+    if test -f "$mysql_test_dir/t/$b-master.opt" ; then
+       args="$args --server-file=t/$b-master.opt"
+    fi
+
+    args="$args $test_data_dir"		# Add database last
+    echo "set args $args$run" > test-gdbinit
+    #if false && test -n "$run"
+    if test -n "$run" -o $gdb -eq 1
+    then
+        echo -e "$er>>> $b"
+    else
+        echo -e "$er>>> $b> \c"
+        read junk
+    fi
+    if test $gdb -eq 1
+    then
+	if [ -x "$top_builddir/libtool" ]; then
+	  $top_builddir/libtool gdb -x test-gdbinit -q $mysqltest
+	else
+	  gdb -x test-gdbinit -q $mysqltest
+	fi
+        res=$?
+        rm -f test-gdbinit
+    else
+        $mysqltest $args
+        res=$?
+    fi
+
+    test $res -eq 0 -o $res -eq 2 || echo "!!! error: $res"
+done
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
new file mode 100644
index 00000000..d4edd242
--- /dev/null
+++ b/libmysqld/lib_sql.cc
@@ -0,0 +1,1449 @@
+/*
+ * Copyright (c)  2000
+ * SWsoft  company
+ *
+ * Modifications copyright (c) 2001, 2013. Oracle and/or its affiliates.
+ * All rights reserved.
+ *
+ * This material is provided "as is", with absolutely no warranty expressed
+ * or implied. Any use is at your own risk.
+ *
+ * Permission to use or copy this software for any purpose is hereby granted 
+ * without fee, provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ *
+
+  This code was modified by the MySQL team
+*/
+
+/*
+  The following is needed to not cause conflicts when we include mysqld.cc
+*/
+
+#define main main1
+#define mysql_unix_port mysql_inix_port1
+#define mysql_port mysql_port1
+
+extern "C"
+{
+  extern unsigned long max_allowed_packet, net_buffer_length;
+}
+
+#include "../sql/mysqld.cc"
+
+C_MODE_START
+
+#include <mysql.h>
+#undef ER
+#include "errmsg.h"
+#include "embedded_priv.h"
+
+extern unsigned int mysql_server_last_errno;
+extern char mysql_server_last_error[MYSQL_ERRMSG_SIZE];
+static my_bool emb_read_query_result(MYSQL *mysql);
+static void free_embedded_thd(MYSQL *mysql);
+static bool embedded_print_errors= 0;
+
+extern "C" void unireg_clear(int exit_code)
+{
+  DBUG_ENTER("unireg_clear");
+  embedded_print_errors= 0;
+  clean_up(!opt_help && !exit_code); /* purecov: inspected */
+  clean_up_mutexes();
+  my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
+  DBUG_VOID_RETURN;
+}
+
+
+static my_bool mysql_embedded_init= 0;
+
+/*
+  Wrapper error handler for embedded server to call client/server error 
+  handler based on whether thread is in client/server context
+*/
+
+static void embedded_error_handler(uint error, const char *str, myf MyFlags)
+{
+  DBUG_ENTER("embedded_error_handler");
+
+  /* 
+    If current_thd is NULL, it means restore_global has been called and 
+    thread is in client context, then call client error handler else call 
+    server error handler.
+  */
+  DBUG_RETURN(current_thd ? my_message_sql(error, str, MyFlags):
+              my_message_stderr(error, str, MyFlags));
+}
+
+/*
+  Reads error information from the MYSQL_DATA and puts
+  it into proper MYSQL members
+
+  SYNOPSIS
+    embedded_get_error()
+    mysql        connection handler
+    data         query result
+
+  NOTES
+    after that function error information will be accessible
+       with usual functions like mysql_error()
+    data is my_free-d in this function
+    most of the data is stored in data->embedded_info structure
+*/
+
+void embedded_get_error(MYSQL *mysql, MYSQL_DATA *data)
+{
+  NET *net= &mysql->net;
+  struct embedded_query_result *ei= data->embedded_info;
+  net->last_errno= ei->last_errno;
+  strmake_buf(net->last_error, ei->info);
+  memcpy(net->sqlstate, ei->sqlstate, sizeof(net->sqlstate));
+  mysql->server_status= ei->server_status;
+  my_free(data);
+}
+
+static my_bool
+emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
+		     const uchar *header, ulong header_length,
+		     const uchar *arg, ulong arg_length, my_bool skip_check,
+                     MYSQL_STMT *stmt)
+{
+  my_bool result= 1;
+  THD *thd=(THD *) mysql->thd;
+  NET *net= &mysql->net;
+  my_bool stmt_skip= stmt ? stmt->state != MYSQL_STMT_INIT_DONE : FALSE;
+
+  if (thd && thd->killed != NOT_KILLED)
+  {
+    if (thd->killed < KILL_CONNECTION)
+      thd->killed= NOT_KILLED;
+    else
+    {
+      free_embedded_thd(mysql);
+      thd= 0;
+    }
+  }
+
+  if (!thd)
+  {
+    /* Do "reconnect" if possible */
+    if (mysql_reconnect(mysql) || stmt_skip)
+      return 1;
+    thd= (THD *) mysql->thd;
+  }
+
+  thd->clear_data_list();
+  /* Check that we are calling the client functions in right order */
+  if (mysql->status != MYSQL_STATUS_READY)
+  {
+    set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
+    result= 1;
+    goto end;
+  }
+
+  /* Clear result variables */
+  thd->clear_error(1);
+  mysql->affected_rows= ~(my_ulonglong) 0;
+  mysql->field_count= 0;
+  net_clear_error(net);
+  thd->current_stmt= stmt;
+
+  thd->thread_stack= (char*) &thd;
+  thd->store_globals();				// Fix if more than one connect
+  /* 
+     We have to call free_old_query before we start to fill mysql->fields 
+     for new query. In the case of embedded server we collect field data
+     during query execution (not during data retrieval as it is in remote
+     client). So we have to call free_old_query here
+  */
+  free_old_query(mysql);
+
+  thd->extra_length= arg_length;
+  thd->extra_data= (char *)arg;
+  if (header)
+  {
+    arg= header;
+    arg_length= header_length;
+  }
+
+  result= dispatch_command(command, thd, (char *) arg, arg_length);
+  thd->cur_data= 0;
+  thd->mysys_var= NULL;
+
+  if (!skip_check)
+    result= thd->is_error() ? -1 : 0;
+
+  thd->mysys_var= 0;
+
+end:
+  thd->reset_globals();
+  return result;
+}
+
+static void emb_flush_use_result(MYSQL *mysql, my_bool)
+{
+  THD *thd= (THD*) mysql->thd;
+  if (thd->cur_data)
+  {
+    free_rows(thd->cur_data);
+    thd->cur_data= 0;
+  }
+  else if (thd->first_data)
+  {
+    MYSQL_DATA *data= thd->first_data;
+    thd->first_data= data->embedded_info->next;
+    free_rows(data);
+  }
+}
+
+
+/*
+  reads dataset from the next query result
+
+  SYNOPSIS
+  emb_read_rows()
+  mysql		connection handle
+  other parameters are not used
+
+  NOTES
+    It just gets next MYSQL_DATA from the result's queue
+
+  RETURN
+    pointer to MYSQL_DATA with the coming recordset
+*/
+
+static MYSQL_DATA *
+emb_read_rows(MYSQL *mysql, MYSQL_FIELD *mysql_fields __attribute__((unused)),
+	      unsigned int fields __attribute__((unused)))
+{
+  MYSQL_DATA *result= ((THD*)mysql->thd)->cur_data;
+  ((THD*)mysql->thd)->cur_data= 0;
+  if (result->embedded_info->last_errno)
+  {
+    embedded_get_error(mysql, result);
+    return NULL;
+  }
+  *result->embedded_info->prev_ptr= NULL;
+  return result;
+}
+
+
+static MYSQL_FIELD *emb_list_fields(MYSQL *mysql)
+{
+  MYSQL_DATA *res;
+  if (emb_read_query_result(mysql))
+    return 0;
+  res= ((THD*) mysql->thd)->cur_data;
+  ((THD*) mysql->thd)->cur_data= 0;
+  mysql->field_alloc= res->alloc;
+  my_free(res);
+  mysql->status= MYSQL_STATUS_READY;
+  return mysql->fields;
+}
+
+static my_bool emb_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
+{
+  THD *thd= (THD*) mysql->thd;
+  MYSQL_DATA *res;
+
+  stmt->stmt_id= thd->client_stmt_id;
+  stmt->param_count= thd->client_param_count;
+  stmt->field_count= 0;
+  mysql->warning_count= thd->get_stmt_da()->current_statement_warn_count();
+
+  if (thd->first_data)
+  {
+    if (emb_read_query_result(mysql))
+      return 1;
+    stmt->field_count= mysql->field_count;
+    mysql->status= MYSQL_STATUS_READY;
+    res= thd->cur_data;
+    thd->cur_data= NULL;
+    if (!(mysql->server_status & SERVER_STATUS_AUTOCOMMIT))
+      mysql->server_status|= SERVER_STATUS_IN_TRANS;
+
+    stmt->fields= mysql->fields;
+    stmt->mem_root= res->alloc;
+    mysql->fields= NULL;
+    my_free(res);
+  }
+
+  return 0;
+}
+
+/**************************************************************************
+  Get column lengths of the current row
+  If one uses mysql_use_result, res->lengths contains the length information,
+  else the lengths are calculated from the offset between pointers.
+**************************************************************************/
+
+static void emb_fetch_lengths(ulong *to, MYSQL_ROW column,
+			      unsigned int field_count)
+{ 
+  MYSQL_ROW end;
+
+  for (end=column + field_count; column != end ; column++,to++)
+    *to= *column ? *(uint *)((*column) - sizeof(uint)) : 0;
+}
+
+static my_bool emb_read_query_result(MYSQL *mysql)
+{
+  THD *thd= (THD*) mysql->thd;
+  MYSQL_DATA *res= thd->first_data;
+  DBUG_ASSERT(!thd->cur_data);
+  thd->first_data= res->embedded_info->next;
+  if (res->embedded_info->last_errno &&
+      !res->embedded_info->fields_list)
+  {
+    embedded_get_error(mysql, res);
+    return 1;
+  }
+
+  mysql->warning_count= res->embedded_info->warning_count;
+  mysql->server_status= res->embedded_info->server_status;
+  mysql->field_count= res->fields;
+  if (!(mysql->fields= res->embedded_info->fields_list))
+  {
+    mysql->affected_rows= res->embedded_info->affected_rows;
+    mysql->insert_id= res->embedded_info->insert_id;
+  }
+  net_clear_error(&mysql->net);
+  mysql->info= 0;
+
+  if (res->embedded_info->info[0])
+  {
+    strmake(mysql->info_buffer, res->embedded_info->info, MYSQL_ERRMSG_SIZE-1);
+    mysql->info= mysql->info_buffer;
+  }
+
+  if (res->embedded_info->fields_list)
+  {
+    mysql->status=MYSQL_STATUS_GET_RESULT;
+    thd->cur_data= res;
+  }
+  else
+    my_free(res);
+
+  return 0;
+}
+
+static int emb_stmt_execute(MYSQL_STMT *stmt)
+{
+  DBUG_ENTER("emb_stmt_execute");
+  uchar header[9];
+  THD *thd;
+  my_bool res;
+
+  if (stmt->param_count && !stmt->bind_param_done)
+  {
+    set_stmt_error(stmt, CR_PARAMS_NOT_BOUND, unknown_sqlstate, NULL);
+    DBUG_RETURN(1);
+  }
+
+  int4store(header, stmt->stmt_id);
+  header[4]= (uchar) stmt->flags;
+  header[5]= header[6]= header[7]= header[8]= 0; // safety
+  thd= (THD*)stmt->mysql->thd;
+  thd->client_param_count= stmt->param_count;
+  thd->client_params= stmt->params;
+
+  res= MY_TEST(emb_advanced_command(stmt->mysql, COM_STMT_EXECUTE, 0, 0,
+                                    header, sizeof(header), 1, stmt) ||
+            emb_read_query_result(stmt->mysql));
+  stmt->affected_rows= stmt->mysql->affected_rows;
+  stmt->insert_id= stmt->mysql->insert_id;
+  stmt->server_status= stmt->mysql->server_status;
+  if (res)
+  {
+    NET *net= &stmt->mysql->net;
+    set_stmt_errmsg(stmt, net);
+    DBUG_RETURN(1);
+  }
+  else if (stmt->mysql->status == MYSQL_STATUS_GET_RESULT)
+           stmt->mysql->status= MYSQL_STATUS_STATEMENT_GET_RESULT;
+  DBUG_RETURN(0);
+}
+
+int emb_read_binary_rows(MYSQL_STMT *stmt)
+{
+  MYSQL_DATA *data;
+  if (!(data= emb_read_rows(stmt->mysql, 0, 0)))
+  {
+    set_stmt_errmsg(stmt, &stmt->mysql->net);
+    return 1;
+  }
+  stmt->result= *data;
+  my_free(data);
+  set_stmt_errmsg(stmt, &stmt->mysql->net);
+  return 0;
+}
+
+int emb_read_rows_from_cursor(MYSQL_STMT *stmt)
+{
+  MYSQL *mysql= stmt->mysql;
+  THD *thd= (THD*) mysql->thd;
+  MYSQL_DATA *res= thd->first_data;
+  DBUG_ASSERT(!thd->first_data->embedded_info->next);
+  thd->first_data= 0;
+  if (res->embedded_info->last_errno)
+  {
+    embedded_get_error(mysql, res);
+    set_stmt_errmsg(stmt, &mysql->net);
+    return 1;
+  }
+
+  thd->cur_data= res;
+  mysql->warning_count= res->embedded_info->warning_count;
+  mysql->server_status= res->embedded_info->server_status;
+  net_clear_error(&mysql->net);
+
+  return emb_read_binary_rows(stmt);
+}
+
+int emb_unbuffered_fetch(MYSQL *mysql, char **row)
+{
+  THD *thd= (THD*) mysql->thd;
+  MYSQL_DATA *data= thd->cur_data;
+  if (data && data->embedded_info->last_errno)
+  {
+    embedded_get_error(mysql, data);
+    thd->cur_data= 0;
+    return 1;
+  }
+  if (!data || !data->data)
+  {
+    *row= NULL;
+    if (data)
+    {
+      thd->cur_data= thd->first_data;
+      thd->first_data= data->embedded_info->next;
+      free_rows(data);
+    }
+  }
+  else
+  {
+    *row= (char *)data->data->data;
+    data->data= data->data->next;
+  }
+  return 0;
+}
+
+static void free_embedded_thd(MYSQL *mysql)
+{
+  THD *thd= (THD*)mysql->thd;
+  server_threads.erase(thd);
+  thd->clear_data_list();
+  thd->store_globals();
+  delete thd;
+  set_current_thd(nullptr);
+  mysql->thd=0;
+}
+
+static const char * emb_read_statistics(MYSQL *mysql)
+{
+  THD *thd= (THD*)mysql->thd;
+  return thd->is_error() ? thd->get_stmt_da()->message() : "";
+}
+
+
+static MYSQL_RES * emb_store_result(MYSQL *mysql)
+{
+  return mysql_store_result(mysql);
+}
+
+static int emb_read_change_user_result(MYSQL *mysql)
+{
+  mysql->net.read_pos= (uchar*)""; // fake an OK packet
+  return mysql_errno(mysql) ? (int)packet_error : 1 /* length of the OK packet */;
+}
+
+static void emb_on_close_free(MYSQL *mysql)
+{
+  my_free(mysql->info_buffer);
+  mysql->info_buffer= 0;
+  if (mysql->thd)
+  {
+    free_embedded_thd(mysql);
+    mysql->thd= 0;
+  }
+}
+
+MYSQL_METHODS embedded_methods= 
+{
+  emb_read_query_result,
+  emb_advanced_command,
+  emb_read_rows,
+  emb_store_result,
+  emb_fetch_lengths, 
+  emb_flush_use_result,
+  emb_read_change_user_result,
+  emb_on_close_free,
+  emb_list_fields,
+  emb_read_prepare_result,
+  emb_stmt_execute,
+  emb_read_binary_rows,
+  emb_unbuffered_fetch,
+  emb_read_statistics,
+  emb_read_query_result,
+  emb_read_rows_from_cursor
+};
+
+/*
+  Make a copy of array and the strings array points to
+*/
+
+char **copy_arguments(int argc, char **argv)
+{
+  size_t length= 0;
+  char **from, **res, **end= argv+argc;
+
+  for (from=argv ; from != end ; from++)
+    length+= strlen(*from);
+
+  if ((res= (char**) my_malloc(PSI_NOT_INSTRUMENTED,
+                               sizeof(argv)*(argc+1)+length+argc, MYF(MY_WME))))
+  {
+    char **to= res, *to_str= (char*) (res+argc+1);
+    for (from=argv ; from != end ;)
+    {
+      *to++= to_str;
+      to_str= strmov(to_str, *from++)+1;
+    }
+    *to= 0;					// Last ptr should be null
+  }
+  return res;
+}
+
+char **		copy_arguments_ptr= 0;
+
+int init_embedded_server(int argc, char **argv, char **groups)
+{
+  /*
+    This mess is to allow people to call the init function without
+    having to mess with a fake argv
+   */
+  int *argcp;
+  char ***argvp;
+  char *fake_argv[] = { (char *)"", 0 };
+  const char *fake_groups[] = { "server", "embedded", 0 };
+  my_bool acl_error;
+
+  DBUG_ASSERT(mysql_embedded_init == 0);
+  embedded_print_errors= 1;
+  if (my_thread_init())
+    return 1;
+
+  if (init_early_variables())
+    return 1;
+
+  if (!argc)
+  {
+    argc= 1;
+    argv= fake_argv;
+  }
+  argcp= &argc;
+  argvp= &argv;
+
+  if (!groups)
+    groups= (char**) fake_groups;
+
+  if (!my_progname)
+    my_progname= (char *)"mysql_embedded";
+
+  /*
+    Perform basic logger initialization logger. Should be called after
+    MY_INIT, as it initializes mutexes. Log tables are inited later.
+  */
+  logger.init_base();
+
+  orig_argc= *argcp;
+  orig_argv= *argvp;
+  if (load_defaults("my", (const char **)groups, argcp, argvp))
+    return 1;
+  defaults_argc= *argcp;
+  defaults_argv= *argvp;
+  remaining_argc= *argcp;
+  remaining_argv= *argvp;
+
+  /* Must be initialized early for comparison of options name */
+  system_charset_info= &my_charset_utf8mb3_general_ci;
+  sys_var_init();
+
+  int ho_error= handle_early_options();
+  if (ho_error != 0)
+    return 1;
+
+  my_timer_init(&sys_timer_info);
+
+  if (init_common_variables())
+  {
+    mysql_server_end();
+    return 1;
+  }
+
+  mysql_data_home= mysql_real_data_home;
+  mysql_data_home_len= mysql_real_data_home_len;
+
+  /* Get default temporary directory */
+  opt_mysql_tmpdir=getenv("TMPDIR");	/* Use this if possible */
+#if defined(_WIN32)
+  if (!opt_mysql_tmpdir)
+    opt_mysql_tmpdir=getenv("TEMP");
+  if (!opt_mysql_tmpdir)
+    opt_mysql_tmpdir=getenv("TMP");
+#endif
+  if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0])
+    opt_mysql_tmpdir= const_cast<char*>(DEFAULT_TMPDIR); /* purecov: inspected*/
+
+  init_ssl();
+  umask(((~my_umask) & 0666));
+  if (init_server_components())
+  {
+    mysql_server_end();
+    return 1;
+  }
+
+  /* 
+    set error_handler_hook to embedded_error_handler wrapper.
+  */
+  error_handler_hook= embedded_error_handler;
+
+  acl_error= 0;
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
+  if (!(acl_error= acl_init(opt_noacl)) &&
+      !opt_noacl)
+    (void) grant_init();
+#endif
+  if (acl_error || my_tz_init((THD *)0, default_tz_name, opt_bootstrap))
+  {
+    mysql_server_end();
+    return 1;
+  }
+
+  init_max_user_conn();
+  init_update_queries();
+
+#ifdef HAVE_DLOPEN
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
+  if (!opt_noacl)
+#endif
+    udf_init();
+#endif
+
+  (void) thr_setconcurrency(concurrency);	// 10 by default
+
+  if (flush_time && flush_time != ~(ulong) 0L)
+    start_handle_manager();
+
+  // FIXME initialize binlog_filter and rpl_filter if not already done
+  //       corresponding delete is in clean_up()
+  if(!binlog_filter) binlog_filter = new Rpl_filter;
+  if(!global_rpl_filter) global_rpl_filter = new Rpl_filter;
+
+  if (opt_init_file)
+  {
+    if (read_init_file(opt_init_file))
+    {
+      mysql_server_end();
+      return 1;
+    }
+  }
+
+  if (ddl_log_execute_recovery() > 0)
+  {
+    mysql_server_end();
+    return 1;
+  }
+  mysql_embedded_init= 1;
+  return 0;
+}
+
+void end_embedded_server()
+{
+  if (mysql_embedded_init)
+  {
+    my_free(copy_arguments_ptr);
+    copy_arguments_ptr=0;
+    clean_up(0);
+    clean_up_mutexes();
+    mysql_embedded_init= 0;
+  }
+}
+
+
+void init_embedded_mysql(MYSQL *mysql, ulong client_flag)
+{
+  THD *thd = (THD *)mysql->thd;
+  thd->mysql= mysql;
+  mysql->server_version= server_version;
+  mysql->client_flag= client_flag;
+  init_alloc_root(PSI_NOT_INSTRUMENTED, &mysql->field_alloc, 8192, 0, MYF(0));
+}
+
+/**
+  @brief Initialize a new THD for a connection in the embedded server
+
+  @param client_flag  Client capabilities which this thread supports
+  @return pointer to the created THD object
+
+  @todo
+  This function copies code from several places in the server, including
+  create_new_thread(), and prepare_new_connection_state().  This should
+  be refactored to avoid code duplication.
+*/
+void *create_embedded_thd(ulong client_flag)
+{
+  THD * thd= new THD(next_thread_id());
+
+  thd->thread_stack= (char*) &thd;
+  thd->store_globals();
+  lex_start(thd);
+
+  /* TODO - add init_connect command execution */
+
+  if (thd->variables.max_join_size == HA_POS_ERROR)
+    thd->variables.option_bits |= OPTION_BIG_SELECTS;
+  thd->proc_info=0;				// Remove 'login'
+  thd->set_command(COM_SLEEP);
+  thd->set_time();
+  thd->init_for_queries();
+  thd->client_capabilities= client_flag | MARIADB_CLIENT_EXTENDED_METADATA;
+  thd->real_id= pthread_self();
+
+  thd->db= null_clex_str;
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
+  thd->security_ctx->db_access= DB_ACLS;
+  thd->security_ctx->master_access= ALL_KNOWN_ACL;
+#endif
+  thd->cur_data= 0;
+  thd->first_data= 0;
+  thd->data_tail= &thd->first_data;
+  bzero((char*) &thd->net, sizeof(thd->net));
+  server_threads.insert(thd);
+  thd->mysys_var= 0;
+  thd->reset_globals();
+  return thd;
+}
+
+
+#ifdef NO_EMBEDDED_ACCESS_CHECKS
+static void
+emb_transfer_connect_attrs(MYSQL *mysql)
+{
+#ifdef HAVE_PSI_THREAD_INTERFACE
+  if (mysql->options.extension &&
+      mysql->options.extension->connection_attributes_length)
+  {
+    uchar *buf, *ptr;
+    THD *thd= (THD*)mysql->thd;
+    size_t length= mysql->options.extension->connection_attributes_length;
+
+    /* 9 = max length of the serialized length */
+    ptr= buf= (uchar *) my_alloca(length + 9);
+    send_client_connect_attrs(mysql, buf);
+    net_field_length_ll(&ptr);
+    PSI_CALL_set_thread_connect_attrs((char *) ptr, length, thd->charset());
+    my_afree(buf);
+  }
+#endif
+}
+
+
+int check_embedded_connection(MYSQL *mysql, const char *db)
+{
+  int result;
+  LEX_CSTRING db_str = { db, safe_strlen(db) };
+  THD *thd= (THD*)mysql->thd;
+
+  /* the server does the same as the client */
+  mysql->server_capabilities= mysql->client_flag;
+
+  thd_init_client_charset(thd, mysql->charset->number);
+  thd->update_charset();
+  Security_context *sctx= thd->security_ctx;
+  sctx->host_or_ip= sctx->host= (char*) my_localhost;
+  strmake_buf(sctx->priv_host, (char*) my_localhost);
+  strmake_buf(sctx->priv_user, mysql->user);
+  sctx->user= my_strdup(PSI_NOT_INSTRUMENTED, mysql->user, MYF(0));
+  sctx->proxy_user[0]= 0;
+  sctx->master_access= GLOBAL_ACLS;       // Full rights
+  emb_transfer_connect_attrs(mysql);
+  /* Change database if necessary */
+  if (!(result= (db && db[0] && mysql_change_db(thd, &db_str, FALSE))))
+    my_ok(thd);
+  thd->protocol->end_statement();
+  emb_read_query_result(mysql);
+  return result;
+}
+
+#else
+int check_embedded_connection(MYSQL *mysql, const char *db)
+{
+  /*
+    we emulate a COM_CHANGE_USER user here,
+    it's easier than to emulate the complete 3-way handshake
+  */
+  char *buf, *end;
+  NET *net= &mysql->net;
+  THD *thd= (THD*)mysql->thd;
+  Security_context *sctx= thd->security_ctx;
+  size_t connect_attrs_len=
+    (mysql->options.extension) ?
+    mysql->options.extension->connection_attributes_length : 0;
+
+  buf= (char *)my_alloca(USERNAME_LENGTH + SCRAMBLE_LENGTH + 1 +
+                         2*NAME_LEN + 2 +
+                         connect_attrs_len + 2);
+  if (mysql->options.client_ip)
+  {
+    sctx->host= my_strdup(mysql->options.client_ip, MYF(0));
+    sctx->ip= my_strdup(sctx->host, MYF(0));
+  }
+  else
+    sctx->host= (char*)my_localhost;
+  sctx->host_or_ip= sctx->host;
+
+  if (acl_check_host(sctx->host, sctx->ip))
+    goto err;
+
+  /* construct a COM_CHANGE_USER packet */
+  end= strmake(buf, mysql->user, USERNAME_LENGTH) + 1;
+
+  memset(thd->scramble, 55, SCRAMBLE_LENGTH); // dummy scramble
+  thd->scramble[SCRAMBLE_LENGTH]= 0;
+  //strcpy(mysql->scramble, thd->scramble);
+
+  if (mysql->passwd && mysql->passwd[0])
+  {
+    *end++= SCRAMBLE_LENGTH;
+    scramble(end, thd->scramble, mysql->passwd);
+    end+= SCRAMBLE_LENGTH;
+  }
+  else
+    *end++= 0;
+
+  end= strmake(end, db ? db : "", NAME_LEN) + 1;
+
+  int2store(end, (ushort) mysql->charset->number);
+  end+= 2;
+
+  // There is no pluging compatibility in the embedded server
+  //end= strmake(end, "mysql_native_password", NAME_LEN) + 1;
+
+  /* the server does the same as the client */
+  mysql->server_capabilities= mysql->client_flag;
+
+  end= (char *) send_client_connect_attrs(mysql, (uchar *) end);
+
+  /* acl_authenticate() takes the data from thd->net->read_pos */
+  thd->net.read_pos= (uchar*)buf;
+
+  if (acl_authenticate(thd, (uint) (end - buf)))
+  {
+    my_free(thd->security_ctx->user);
+    goto err;
+  }
+  my_afree(buf);
+  return 0;
+
+err:
+  strmake_buf(net->last_error, thd->get_stmt_da()->message());
+  memcpy(net->sqlstate,
+         mysql_errno_to_sqlstate(thd->get_stmt_da()->sql_errno()),
+         sizeof(net->sqlstate)-1);
+  my_afree(buf);
+  return 1;
+}
+#endif
+
+C_MODE_END
+
+void THD::clear_data_list()
+{
+  while (first_data)
+  {
+    MYSQL_DATA *data= first_data;
+    first_data= data->embedded_info->next;
+    free_rows(data);
+  }
+  data_tail= &first_data;
+  free_rows(cur_data);
+  cur_data= 0;
+}
+
+
+static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length,
+			 CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
+{
+  uint32 dummy32;
+  uint dummy_err;
+  char *result;
+
+  /* 'tocs' is set 0 when client issues SET character_set_results=NULL */
+  if (tocs && String::needs_conversion(0, fromcs, tocs, &dummy32))
+  {
+    uint new_len= (tocs->mbmaxlen * length) / fromcs->mbminlen + 1;
+    result= (char *)alloc_root(root, new_len);
+    length= copy_and_convert(result, new_len,
+                             tocs, from, length, fromcs, &dummy_err);
+  }
+  else
+  {
+    result= (char *)alloc_root(root, length + 1);
+    memcpy(result, from, length);
+  }
+
+  result[length]= 0;
+  return result;
+}
+
+
+static char *dup_str_aux(MEM_ROOT *root, const LEX_CSTRING &from,
+                         CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
+{
+  return dup_str_aux(root, from.str, (uint) from.length, fromcs, tocs);
+}
+
+
+/*
+  creates new result and hooks it to the list
+
+  SYNOPSIS
+  alloc_new_dataset()
+
+  NOTES
+    allocs the MYSQL_DATA + embedded_query_result couple
+    to store the next query result,
+    links these two and attach it to the THD::data_tail
+
+  RETURN
+    pointer to the newly created query result
+*/
+
+MYSQL_DATA *THD::alloc_new_dataset()
+{
+  MYSQL_DATA *data;
+  struct embedded_query_result *emb_data;
+  if (!my_multi_malloc(PSI_NOT_INSTRUMENTED, MYF(MY_WME | MY_ZEROFILL),
+                       &data, sizeof(*data), &emb_data, sizeof(*emb_data), NULL))
+    return NULL;
+
+  emb_data->prev_ptr= &data->data;
+  cur_data= data;
+  *data_tail= data;
+  data_tail= &emb_data->next;
+  data->embedded_info= emb_data;
+  return data;
+}
+
+
+/**
+  Stores server_status and warning_count in the current
+  query result structures.
+
+  @param thd            current thread
+
+  @note Should be called after we get the recordset-result.
+*/
+
+static
+bool
+write_eof_packet(THD *thd, uint server_status, uint statement_warn_count)
+{
+  if (!thd->mysql)            // bootstrap file handling
+    return FALSE;
+  /*
+    The following test should never be true, but it's better to do it
+    because if 'is_fatal_error' is set the server is not going to execute
+    other queries (see the if test in dispatch_command / COM_QUERY)
+  */
+  if (thd->is_fatal_error)
+    thd->server_status&= ~SERVER_MORE_RESULTS_EXISTS;
+  thd->cur_data->embedded_info->server_status= server_status;
+  /*
+    Don't send warn count during SP execution, as the warn_list
+    is cleared between substatements, and mysqltest gets confused
+  */
+  thd->cur_data->embedded_info->warning_count=
+    (thd->spcont ? 0 : MY_MIN(statement_warn_count, 65535));
+  return FALSE;
+}
+
+
+/*
+  allocs new query result and initialises Protocol::alloc
+
+  SYNOPSIS
+  Protocol::begin_dataset()
+
+  RETURN
+    0 if success
+    1 if memory allocation failed
+*/
+
+bool Protocol::begin_dataset()
+{
+  MYSQL_DATA *data= thd->alloc_new_dataset();
+  if (!data)
+    return 1;
+  alloc= &data->alloc;
+  /* Assume rowlength < 8192 */
+  init_alloc_root(PSI_NOT_INSTRUMENTED, alloc, 8192, 0, MYF(0));
+  alloc->min_malloc= sizeof(MYSQL_ROWS);
+  return 0;
+}
+
+
+bool Protocol::begin_dataset(THD *thd, uint numfields)
+{
+  if (begin_dataset())
+    return true;
+  MYSQL_DATA *data= thd->cur_data;
+  data->fields= field_count= numfields;
+  if (!(data->embedded_info->fields_list=
+      (MYSQL_FIELD*)alloc_root(&data->alloc, sizeof(MYSQL_FIELD)*field_count)))
+    return true;
+  return false;
+}
+
+
+/*
+  remove last row of current recordset
+
+  SYNOPSIS
+  Protocol_text::remove_last_row()
+
+  NOTES
+    does the loop from the beginning of the current recordset to
+    the last record and cuts it off.
+    Not supposed to be frequently called.
+*/
+
+void Protocol_text::remove_last_row()
+{
+  MYSQL_DATA *data= thd->cur_data;
+  MYSQL_ROWS **last_row_hook= &data->data;
+  my_ulonglong count= data->rows;
+  DBUG_ENTER("Protocol_text::remove_last_row");
+  while (--count)
+    last_row_hook= &(*last_row_hook)->next;
+
+  *last_row_hook= 0;
+  data->embedded_info->prev_ptr= last_row_hook;
+  data->rows--;
+
+  DBUG_VOID_RETURN;
+}
+
+
+
+static MARIADB_CONST_STRING ma_const_string_copy_root(MEM_ROOT *memroot,
+                                                      const char *str,
+                                                      size_t length)
+{
+  MARIADB_CONST_STRING res;
+  if (!str || !(res.str= strmake_root(memroot, str, length)))
+    return null_clex_str;
+  res.length= length;
+  return res;
+}
+
+
+class Client_field_extension: public Sql_alloc,
+                              public MARIADB_FIELD_EXTENSION
+{
+public:
+  Client_field_extension()
+  {
+    memset((void*) this, 0, sizeof(*this));
+  }
+  void copy_extended_metadata(MEM_ROOT *memroot,
+                              const Send_field_extended_metadata &src)
+  {
+    for (uint i= 0; i <= MARIADB_FIELD_ATTR_LAST; i++)
+    {
+      LEX_CSTRING attr= src.attr(i);
+      metadata[i]= ma_const_string_copy_root(memroot, attr.str, attr.length);
+    }
+  }
+};
+
+
+bool Protocol_text::store_field_metadata(const THD * thd,
+                                         const Send_field &server_field,
+                                         CHARSET_INFO *charset_for_protocol,
+                                         uint pos)
+{
+  CHARSET_INFO *cs= system_charset_info;
+  CHARSET_INFO *thd_cs= thd->variables.character_set_results;
+  MYSQL_DATA *data= thd->cur_data;
+  MEM_ROOT *field_alloc= &data->alloc;
+  MYSQL_FIELD *client_field= &thd->cur_data->embedded_info->fields_list[pos];
+  DBUG_ASSERT(server_field.is_sane());
+
+  client_field->db= dup_str_aux(field_alloc, server_field.db_name,
+                                cs, thd_cs);
+  client_field->table= dup_str_aux(field_alloc, server_field.table_name,
+                                   cs, thd_cs);
+  client_field->name= dup_str_aux(field_alloc, server_field.col_name,
+                                  cs, thd_cs);
+  client_field->org_table= dup_str_aux(field_alloc, server_field.org_table_name,
+                                       cs, thd_cs);
+  client_field->org_name= dup_str_aux(field_alloc, server_field.org_col_name,
+                                      cs, thd_cs);
+  if (charset_for_protocol == &my_charset_bin || thd_cs == NULL)
+  {
+    /* No conversion */
+    client_field->charsetnr= charset_for_protocol->
+                               get_id(MY_COLLATION_ID_TYPE_COMPAT_100800);
+    client_field->length= server_field.length;
+  }
+  else
+  {
+    /* With conversion */
+    client_field->charsetnr= thd_cs->
+                               get_id(MY_COLLATION_ID_TYPE_COMPAT_100800);
+    client_field->length= server_field.max_octet_length(charset_for_protocol,
+                                                        thd_cs);
+  }
+  client_field->type= server_field.type_handler()->type_code_for_protocol();
+  client_field->flags= (uint16) server_field.flags;
+  client_field->decimals= server_field.decimals;
+
+  client_field->db_length=		(uint)strlen(client_field->db);
+  client_field->table_length=		(uint)strlen(client_field->table);
+  client_field->name_length=		(uint)strlen(client_field->name);
+  client_field->org_name_length=	(uint)strlen(client_field->org_name);
+  client_field->org_table_length=	(uint)strlen(client_field->org_table);
+
+  client_field->catalog= dup_str_aux(field_alloc, "def", 3, cs, thd_cs);
+  client_field->catalog_length= 3;
+
+  if (server_field.has_extended_metadata())
+  {
+    Client_field_extension *ext= new (field_alloc) Client_field_extension();
+    if ((client_field->extension= static_cast<MARIADB_FIELD_EXTENSION*>(ext)))
+      ext->copy_extended_metadata(field_alloc, server_field);
+  }
+  else
+  {
+    client_field->extension= NULL;
+  }
+
+  if (IS_NUM(client_field->type))
+    client_field->flags|= NUM_FLAG;
+
+  client_field->max_length= 0;
+  client_field->def= 0;
+  return false;
+}
+
+
+bool Protocol::send_result_set_metadata(List<Item> *list, uint flags)
+{
+  List_iterator_fast<Item> it(*list);
+  Item                     *item;
+  Protocol_text prot(thd);
+  DBUG_ENTER("send_result_set_metadata");
+
+  if (!thd->mysql)            // bootstrap file handling
+    DBUG_RETURN(0);
+
+  if (begin_dataset(thd, list->elements))
+    goto err;
+
+  for (uint pos= 0 ; (item= it++); pos++)
+  {
+    if (prot.store_item_metadata(thd, item, pos))
+      goto err;
+  }
+
+  if (flags & SEND_EOF)
+    write_eof_packet(thd, thd->server_status,
+                     thd->get_stmt_da()->current_statement_warn_count());
+
+  DBUG_RETURN(prepare_for_send(list->elements));
+ err:
+  my_error(ER_OUT_OF_RESOURCES, MYF(0));        /* purecov: inspected */
+  DBUG_RETURN(1);				/* purecov: inspected */
+}
+
+
+static void
+list_fields_send_default(THD *thd, Protocol *p, Field *fld, uint pos)
+{
+  char buff[80];
+  String tmp(buff, sizeof(buff), default_charset_info), *res;
+  MYSQL_FIELD *client_field= &thd->cur_data->embedded_info->fields_list[pos];
+
+  if (fld->is_null() || !(res= fld->val_str(&tmp)))
+  {
+    client_field->def_length= 0;
+    client_field->def= strmake_root(&thd->cur_data->alloc, "", 0);
+  }
+  else
+  {
+    client_field->def_length= res->length();
+    client_field->def= strmake_root(&thd->cur_data->alloc, res->ptr(),
+                                    client_field->def_length);
+  }
+}
+
+
+bool Protocol::send_list_fields(List<Field> *list, const TABLE_LIST *table_list)
+{
+  DBUG_ENTER("send_result_set_metadata");
+  Protocol_text prot(thd);
+  List_iterator_fast<Field> it(*list);
+  Field *fld;
+
+  if (!thd->mysql)            // bootstrap file handling
+    DBUG_RETURN(0);
+
+  if (begin_dataset(thd, list->elements))
+    goto err;
+
+  for (uint pos= 0 ; (fld= it++); pos++)
+  {
+    if (prot.store_field_metadata_for_list_fields(thd, fld, table_list, pos))
+      goto err;
+    list_fields_send_default(thd, this, fld, pos);
+  }
+
+  DBUG_RETURN(prepare_for_send(list->elements));
+err:
+  my_error(ER_OUT_OF_RESOURCES, MYF(0));
+  DBUG_RETURN(1);
+}
+
+
+bool Protocol::write()
+{
+  if (!thd->mysql)            // bootstrap file handling
+    return false;
+
+  *next_field= 0;
+  return false;
+}
+
+bool Protocol_binary::write()
+{
+  MYSQL_ROWS *cur;
+  MYSQL_DATA *data= thd->cur_data;
+
+  data->rows++;
+  if (!(cur= (MYSQL_ROWS *)alloc_root(alloc,
+                                      sizeof(MYSQL_ROWS)+packet->length())))
+  {
+    my_error(ER_OUT_OF_RESOURCES,MYF(0));
+    return true;
+  }
+  cur->data= (MYSQL_ROW)(((char *)cur) + sizeof(MYSQL_ROWS));
+  memcpy(cur->data, packet->ptr()+1, packet->length()-1);
+  cur->length= packet->length();       /* To allow us to do sanity checks */
+
+  *data->embedded_info->prev_ptr= cur;
+  data->embedded_info->prev_ptr= &cur->next;
+  cur->next= 0;
+  
+  return false;
+}
+
+
+/**
+  Embedded library implementation of OK response.
+
+  This function is used by the server to write 'OK' packet to
+  the "network" when the server is compiled as an embedded library.
+  Since there is no network in the embedded configuration,
+  a different implementation is necessary.
+  Instead of marshalling response parameters to a network representation
+  and then writing it to the socket, here we simply copy the data to the
+  corresponding client-side connection structures. 
+
+  @sa Server implementation of net_send_ok in protocol.cc for
+  description of the arguments.
+
+  @return
+    @retval TRUE An error occurred
+    @retval FALSE Success
+*/
+
+bool Protocol::net_send_ok(THD *thd,
+            uint server_status, uint statement_warn_count,
+            ulonglong affected_rows, ulonglong id, const char *message,
+            bool)
+{
+  DBUG_ENTER("emb_net_send_ok");
+  MYSQL_DATA *data;
+  MYSQL *mysql= thd->mysql;
+
+  if (!mysql)            // bootstrap file handling
+    DBUG_RETURN(FALSE);
+  if (!(data= thd->alloc_new_dataset()))
+    DBUG_RETURN(TRUE);
+  data->embedded_info->affected_rows= affected_rows;
+  data->embedded_info->insert_id= id;
+  if (message)
+    strmake_buf(data->embedded_info->info, message);
+
+  bool error= write_eof_packet(thd, server_status, statement_warn_count);
+  thd->cur_data= 0;
+  DBUG_RETURN(error);
+}
+
+
+/**
+  Embedded library implementation of EOF response.
+
+  @sa net_send_ok
+
+  @return
+    @retval TRUE  An error occurred
+    @retval FALSE Success
+*/
+
+bool
+Protocol::net_send_eof(THD *thd, uint server_status, uint statement_warn_count)
+{
+  bool error= write_eof_packet(thd, server_status, statement_warn_count);
+  thd->cur_data= 0;
+  return error;
+}
+
+
+bool Protocol::net_send_error_packet(THD *thd, uint sql_errno, const char *err,
+                                     const char *sqlstate)
+{
+  uint error;
+  char converted_err[MYSQL_ERRMSG_SIZE];
+  MYSQL_DATA *data= thd->cur_data;
+  struct embedded_query_result *ei;
+
+  if (!thd->mysql)            // bootstrap file handling
+  {
+    fprintf(stderr, "ERROR: %d  %s\n", sql_errno, err);
+    return TRUE;
+  }
+
+  if (!data)
+    data= thd->alloc_new_dataset();
+
+  ei= data->embedded_info;
+  ei->last_errno= sql_errno;
+  convert_error_message(converted_err, sizeof(converted_err),
+                        thd->variables.character_set_results,
+                        err, strlen(err),
+                        system_charset_info, &error);
+  /* Converted error message is always null-terminated. */
+  strmake_buf(ei->info, converted_err);
+  strmov(ei->sqlstate, sqlstate);
+  ei->server_status= thd->server_status;
+  thd->cur_data= 0;
+  return FALSE;
+}
+
+
+void Protocol_text::prepare_for_resend()
+{
+  MYSQL_ROWS *cur;
+  MYSQL_DATA *data= thd->cur_data;
+  DBUG_ENTER("send_data");
+
+  if (!thd->mysql)            // bootstrap file handling
+    DBUG_VOID_RETURN;
+
+  data->rows++;
+  if (!(cur= (MYSQL_ROWS *)alloc_root(alloc, sizeof(MYSQL_ROWS)+(field_count + 1) * sizeof(char *))))
+  {
+    my_error(ER_OUT_OF_RESOURCES,MYF(0));
+    DBUG_VOID_RETURN;
+  }
+  cur->data= (MYSQL_ROW)(((char *)cur) + sizeof(MYSQL_ROWS));
+
+  *data->embedded_info->prev_ptr= cur;
+  data->embedded_info->prev_ptr= &cur->next;
+  next_field=cur->data;
+  next_mysql_field= data->embedded_info->fields_list;
+#ifndef DBUG_OFF
+  field_pos= 0;
+#endif
+
+  DBUG_VOID_RETURN;
+}
+
+bool Protocol_text::store_null()
+{
+  *(next_field++)= NULL;
+  ++next_mysql_field;
+  return false;
+}
+
+
+bool Protocol::net_store_data(const uchar *from, size_t length)
+{
+  char *field_buf;
+  if (!thd->mysql)            // bootstrap file handling
+    return FALSE;
+
+  if (!(field_buf= (char*) alloc_root(alloc, length + sizeof(uint) + 1)))
+    return TRUE;
+  *(uint *)field_buf= (uint)length;
+  *next_field= field_buf + sizeof(uint);
+  memcpy((uchar*) *next_field, from, length);
+  (*next_field)[length]= 0;
+  if (next_mysql_field->max_length < length)
+    next_mysql_field->max_length=(ulong)length;
+  ++next_field;
+  ++next_mysql_field;
+  return FALSE;
+}
+
+
+bool Protocol::net_store_data_cs(const uchar *from, size_t length,
+                              CHARSET_INFO *from_cs, CHARSET_INFO *to_cs)
+{
+  size_t conv_length= length * to_cs->mbmaxlen / 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= (uint)length;
+  (*next_field)[length]= 0;
+  if (next_mysql_field->max_length < length)
+    next_mysql_field->max_length= (ulong)length;
+  ++next_field;
+  ++next_mysql_field;
+  return false;
+}
+
+#if defined(_MSC_VER) && _MSC_VER < 1400
+#define vsnprintf _vsnprintf
+#endif
+
+int vprint_msg_to_log(enum loglevel level __attribute__((unused)),
+                       const char *format, va_list argsi)
+{
+  vsnprintf(mysql_server_last_error, sizeof(mysql_server_last_error),
+            format, argsi);
+  mysql_server_last_errno= CR_UNKNOWN_ERROR;
+  if (embedded_print_errors && level == ERROR_LEVEL)
+  {
+    /* The following is for testing when someone removes the above test */
+    const char *tag= (level == ERROR_LEVEL ? "ERROR" :
+                      level == WARNING_LEVEL ? "Warning" :
+                      "Note");
+    fprintf(stderr,"Got %s: \"%s\" errno: %d\n",
+            tag, mysql_server_last_error, mysql_server_last_errno);
+  }
+  return 0;
+}
+
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c
new file mode 100644
index 00000000..7f55b0c2
--- /dev/null
+++ b/libmysqld/libmysql.c
@@ -0,0 +1,4977 @@
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates
+   Copyright (c) 2009, 2020, MariaDB Corporation
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation.
+
+   There are special exceptions to the terms and conditions of the GPL as it
+   is applied to this software. View the full text of the exception in file
+   EXCEPTIONS-CLIENT in the directory of this software distribution.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+#include <my_global.h>
+#include <my_sys.h>
+#include <my_time.h>
+#include <mysys_err.h>
+#include <m_string.h>
+#include <m_ctype.h>
+#include "mysql.h"
+#include "mysql_version.h"
+#include "mysqld_error.h"
+#include "errmsg.h"
+#include <violite.h>
+#include <sys/stat.h>
+#include <signal.h>
+#include <time.h>
+#ifdef	 HAVE_PWD_H
+#include <pwd.h>
+#endif
+#if !defined(_WIN32)
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#ifdef HAVE_SELECT_H
+#include <select.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#endif /* !defined(_WIN32) */
+#if defined(HAVE_POLL_H)
+#include <poll.h>
+#elif defined(HAVE_SYS_POLL_H)
+#include <sys/poll.h>
+#endif /* defined(HAVE_POLL_H) */
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#if !defined(_WIN32)
+#include <my_pthread.h>				/* because of signal()	*/
+#endif
+#ifndef INADDR_NONE
+#define INADDR_NONE	-1
+#endif
+
+#include <sql_common.h>
+#include "client_settings.h"
+#include "embedded_priv.h"
+
+#undef net_buffer_length
+#undef max_allowed_packet
+
+ulong 		net_buffer_length=8192;
+ulong		max_allowed_packet= 1024L*1024L*1024L;
+
+
+#ifdef EMBEDDED_LIBRARY
+#undef net_flush
+my_bool	net_flush(NET *net);
+#endif
+
+#if defined(_WIN32)
+/* socket_errno is defined in my_global.h for all platforms */
+#define perror(A)
+#else
+#include <errno.h>
+#define SOCKET_ERROR -1
+#endif /* _WIN32 */
+
+/*
+  If allowed through some configuration, then this needs to
+  be changed
+*/
+#define MAX_LONG_DATA_LENGTH 8192
+#define unsigned_field(A) ((A)->flags & UNSIGNED_FLAG)
+
+static void append_wild(char *to,char *end,const char *wild);
+sig_handler my_pipe_sig_handler(int sig);
+
+static my_bool mysql_client_init= 0;
+static my_bool org_my_init_done= 0;
+
+typedef struct st_mysql_stmt_extension
+{
+  MEM_ROOT fields_mem_root;
+} MYSQL_STMT_EXT;
+
+
+/*
+  Initialize the MySQL client library
+
+  SYNOPSIS
+    mysql_server_init()
+
+  NOTES
+    Should be called before doing any other calls to the MySQL
+    client library to initialize thread specific variables etc.
+    It's called by mysql_init() to ensure that things will work for
+    old not threaded applications that doesn't call mysql_server_init()
+    directly.
+
+  RETURN
+    0  ok
+    1  could not initialize environment (out of memory or thread keys)
+*/
+
+int STDCALL mysql_server_init(int argc __attribute__((unused)),
+                              char **argv __attribute__((unused)),
+                              char **groups __attribute__((unused)))
+{
+  int result= 0;
+  if (!mysql_client_init)
+  {
+    mysql_client_init=1;
+    org_my_init_done=my_init_done;
+    if (my_init())				/* Will init threads */
+      return 1;
+    init_client_errs();
+    if (mysql_client_plugin_init())
+      return 1;
+    if (!mysql_port)
+    {
+      char *env;
+      struct servent *serv_ptr __attribute__((unused));
+
+      mysql_port = MYSQL_PORT;
+
+      /*
+        if builder specifically requested a default port, use that
+        (even if it coincides with our factory default).
+        only if they didn't do we check /etc/services (and, failing
+        on that, fall back to the factory default of 3306).
+        either default can be overridden by the environment variable
+        MYSQL_TCP_PORT, which in turn can be overridden with command
+        line options.
+      */
+
+#if MYSQL_PORT_DEFAULT == 0
+# if !__has_feature(memory_sanitizer) // Work around MSAN deficiency
+      if ((serv_ptr= getservbyname("mysql", "tcp")))
+        mysql_port= (uint) ntohs((ushort) serv_ptr->s_port);
+# endif
+#endif
+      if ((env= getenv("MYSQL_TCP_PORT")))
+        mysql_port=(uint) atoi(env);
+    }
+
+    if (!mysql_unix_port)
+    {
+      char *env;
+#ifdef _WIN32
+      mysql_unix_port = (char*) MYSQL_NAMEDPIPE;
+#else
+      mysql_unix_port = (char*) MYSQL_UNIX_ADDR;
+#endif
+      if ((env = getenv("MYSQL_UNIX_PORT")))
+	mysql_unix_port = env;
+    }
+    mysql_debug(NullS);
+#if defined(SIGPIPE) && !defined(_WIN32)
+    (void) signal(SIGPIPE, SIG_IGN);
+#endif
+#ifdef EMBEDDED_LIBRARY
+    if (argc > -1)
+       result= init_embedded_server(argc, argv, groups);
+#endif
+  }
+  else
+    result= (int)my_thread_init();         /* Init if new thread */
+  return result;
+}
+
+
+/*
+  Free all memory and resources used by the client library
+
+  NOTES
+    When calling this there should not be any other threads using
+    the library.
+
+    To make things simpler when used with windows dll's (which calls this
+    function automatically), it's safe to call this function multiple times.
+*/
+
+
+void STDCALL mysql_server_end()
+{
+  if (!mysql_client_init)
+    return;
+
+  mysql_client_plugin_deinit();
+
+  finish_client_errs();
+  if (mariadb_deinitialize_ssl)
+    vio_end();
+#ifdef EMBEDDED_LIBRARY
+  end_embedded_server();
+#endif
+
+  /* If library called my_init(), free memory allocated by it */
+  if (!org_my_init_done)
+  {
+    my_end(0);
+  }
+#ifdef NOT_NEEDED
+  /*
+    The following is not needed as if the program explicitly called
+    my_init() then we can assume it will also call my_end().
+    The reason to not also do it here is in that case we can't get
+    statistics from my_end() to debug log.
+  */
+  else
+  {
+    free_charsets();
+    mysql_thread_end();
+  }
+#endif
+
+  mysql_client_init= org_my_init_done= 0;
+}
+
+static MYSQL_PARAMETERS mysql_internal_parameters=
+{&max_allowed_packet, &net_buffer_length, 0};
+
+MYSQL_PARAMETERS *STDCALL mysql_get_parameters(void)
+{
+  return &mysql_internal_parameters;
+}
+
+my_bool STDCALL mysql_thread_init()
+{
+  return my_thread_init();
+}
+
+void STDCALL mysql_thread_end()
+{
+  my_thread_end();
+}
+
+
+/*
+  Expand wildcard to a sql string
+*/
+
+static void
+append_wild(char *to, char *end, const char *wild)
+{
+  end-=5;					/* Some extra */
+  if (wild && wild[0])
+  {
+    to=strmov(to," like '");
+    while (*wild && to < end)
+    {
+      if (*wild == '\\' || *wild == '\'')
+	*to++='\\';
+      *to++= *wild++;
+    }
+    if (*wild)					/* Too small buffer */
+      *to++='%';				/* Nicer this way */
+    to[0]='\'';
+    to[1]=0;
+  }
+}
+
+
+/**************************************************************************
+  Init debugging if MYSQL_DEBUG environment variable is found
+**************************************************************************/
+
+void STDCALL
+mysql_debug(const char *debug __attribute__((unused)))
+{
+#ifndef DBUG_OFF
+  char	*env;
+  if (debug)
+  {
+    DBUG_PUSH(debug);
+  }
+  else if ((env = getenv("MYSQL_DEBUG")))
+  {
+    DBUG_PUSH(env);
+#if !defined(_WINVER) && !defined(WINVER)
+    puts("\n-------------------------------------------------------");
+    puts("MYSQL_DEBUG found. libmysql started with the following:");
+    puts(env);
+    puts("-------------------------------------------------------\n");
+#else
+    {
+      char buff[80];
+      buff[sizeof(buff)-1]= 0;
+      strxnmov(buff,sizeof(buff)-1,"libmysql: ", env, NullS);
+      MessageBox((HWND) 0,"Debugging variable MYSQL_DEBUG used",buff,MB_OK);
+    }
+#endif
+  }
+#endif
+}
+
+
+/**************************************************************************
+  Ignore SIGPIPE handler
+   ARGSUSED
+**************************************************************************/
+
+sig_handler
+my_pipe_sig_handler(int sig __attribute__((unused)))
+{
+  DBUG_PRINT("info",("Hit by signal %d",sig));
+#ifdef SIGNAL_HANDLER_RESET_ON_DELIVERY
+  (void) signal(SIGPIPE, my_pipe_sig_handler);
+#endif
+}
+
+
+/**************************************************************************
+  Connect to sql server
+  If host == 0 then use localhost
+**************************************************************************/
+
+#ifdef USE_OLD_FUNCTIONS
+MYSQL * STDCALL
+mysql_connect(MYSQL *mysql,const char *host,
+	      const char *user, const char *passwd)
+{
+  MYSQL *res;
+  mysql=mysql_init(mysql);			/* Make it thread safe */
+  {
+    DBUG_ENTER("mysql_connect");
+    if (!(res=mysql_real_connect(mysql,host,user,passwd,NullS,0,NullS,0)))
+    {
+      if (mysql->free_me)
+	my_free(mysql);
+    }
+    mysql->reconnect= 1;
+    DBUG_RETURN(res);
+  }
+}
+#endif
+
+
+/**************************************************************************
+  Change user and database
+**************************************************************************/
+
+my_bool	STDCALL mysql_change_user(MYSQL *mysql, const char *user,
+				  const char *passwd, const char *db)
+{
+  int rc;
+  CHARSET_INFO *saved_cs= mysql->charset;
+  char *saved_user= mysql->user;
+  char *saved_passwd= mysql->passwd;
+  char *saved_db= mysql->db;
+
+  DBUG_ENTER("mysql_change_user");
+
+  /* Get the connection-default character set. */
+
+  if (mysql_init_character_set(mysql))
+  {
+    mysql->charset= saved_cs;
+    DBUG_RETURN(TRUE);
+  }
+
+  /* Use an empty string instead of NULL. */
+
+  mysql->user= (char*)(user ? user : "");
+  mysql->passwd= (char*)(passwd ? passwd : "");
+  mysql->db= 0;
+
+  rc= run_plugin_auth(mysql, 0, 0, 0, db);
+
+  /*
+    The server will close all statements no matter was the attempt
+    to change user successful or not.
+  */
+  mysql_detach_stmt_list(&mysql->stmts, "mysql_change_user");
+  if (rc == 0)
+  {
+    /* Free old connect information */
+    my_free(saved_user);
+    my_free(saved_passwd);
+    my_free(saved_db);
+
+    /* alloc new connect information */
+    mysql->user= my_strdup(PSI_NOT_INSTRUMENTED, mysql->user, MYF(MY_WME));
+    mysql->passwd= my_strdup(PSI_NOT_INSTRUMENTED, mysql->passwd, MYF(MY_WME));
+    mysql->db= db ? my_strdup(PSI_NOT_INSTRUMENTED, db, MYF(MY_WME)) : 0;
+  }
+  else
+  {
+    mysql->charset= saved_cs;
+    mysql->user= saved_user;
+    mysql->passwd= saved_passwd;
+    mysql->db= saved_db;
+  }
+
+  DBUG_RETURN(rc != 0);
+}
+
+#if defined(HAVE_GETPWUID) && defined(NO_GETPWUID_DECL)
+struct passwd *getpwuid(uid_t);
+char* getlogin(void);
+#endif
+
+#if !defined(_WIN32)
+
+void read_user_name(char *name)
+{
+  DBUG_ENTER("read_user_name");
+  if (geteuid() == 0)
+    (void) strmov(name,"root");		/* allow use of surun */
+  else
+  {
+#ifdef HAVE_GETPWUID
+    struct passwd *skr;
+    const char *str;
+    if ((str=getlogin()) == NULL)
+    {
+      if ((skr=getpwuid(geteuid())) != NULL)
+	str=skr->pw_name;
+      else if (!(str=getenv("USER")) && !(str=getenv("LOGNAME")) &&
+	       !(str=getenv("LOGIN")))
+	str="UNKNOWN_USER";
+    }
+    (void) strmake(name,str,USERNAME_LENGTH);
+#elif HAVE_CUSERID
+    (void) cuserid(name);
+#else
+    strmov(name,"UNKNOWN_USER");
+#endif
+  }
+  DBUG_VOID_RETURN;
+}
+
+#else /* If Windows */
+
+void read_user_name(char *name)
+{
+  DWORD len= USERNAME_LENGTH;
+  if (!GetUserName(name, &len))
+    strmov(name,"UNKNOWN_USER");
+}
+
+#endif
+
+my_bool handle_local_infile(MYSQL *mysql, const char *net_filename)
+{
+  my_bool result= 1;
+  uint packet_length=MY_ALIGN(mysql->net.max_packet-16,IO_SIZE);
+  NET *net= &mysql->net;
+  int readcount;
+  void *li_ptr;          /* pass state to local_infile functions */
+  char *buf;		/* buffer to be filled by local_infile_read */
+  struct st_mysql_options *options= &mysql->options;
+  DBUG_ENTER("handle_local_infile");
+
+  /* check that we've got valid callback functions */
+  if (!(options->local_infile_init &&
+	options->local_infile_read &&
+	options->local_infile_end &&
+	options->local_infile_error))
+  {
+    /* if any of the functions is invalid, set the default */
+    mysql_set_local_infile_default(mysql);
+  }
+
+  /* copy filename into local memory and allocate read buffer */
+  if (!(buf=my_malloc(PSI_NOT_INSTRUMENTED, packet_length, MYF(0))))
+  {
+    set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
+    DBUG_RETURN(1);
+  }
+
+  /* initialize local infile (open file, usually) */
+  if ((*options->local_infile_init)(&li_ptr, net_filename,
+    options->local_infile_userdata))
+  {
+    (void) my_net_write(net,(const uchar*) "",0); /* Server needs one packet */
+    net_flush(net);
+    strmov(net->sqlstate, unknown_sqlstate);
+    net->last_errno=
+      (*options->local_infile_error)(li_ptr,
+                                     net->last_error,
+                                     sizeof(net->last_error)-1);
+    goto err;
+  }
+
+  /* read blocks of data from local infile callback */
+  while ((readcount =
+	  (*options->local_infile_read)(li_ptr, buf,
+					packet_length)) > 0)
+  {
+    if (my_net_write(net, (uchar*) buf, readcount))
+    {
+      DBUG_PRINT("error",
+		 ("Lost connection to server during LOAD DATA of local file"));
+      set_mysql_error(mysql, CR_SERVER_LOST, unknown_sqlstate);
+      goto err;
+    }
+  }
+
+  /* Send empty packet to mark end of file */
+  if (my_net_write(net, (const uchar*) "", 0) || net_flush(net))
+  {
+    set_mysql_error(mysql, CR_SERVER_LOST, unknown_sqlstate);
+    goto err;
+  }
+
+  if (readcount < 0)
+  {
+    net->last_errno=
+      (*options->local_infile_error)(li_ptr,
+                                     net->last_error,
+                                     sizeof(net->last_error)-1);
+    goto err;
+  }
+
+  result=0;					/* Ok */
+
+err:
+  /* free up memory allocated with _init, usually */
+  (*options->local_infile_end)(li_ptr);
+  my_free(buf);
+  DBUG_RETURN(result);
+}
+
+
+/****************************************************************************
+  Default handlers for LOAD LOCAL INFILE
+****************************************************************************/
+
+typedef struct st_default_local_infile
+{
+  int fd;
+  int error_num;
+  const char *filename;
+  char error_msg[LOCAL_INFILE_ERROR_LEN];
+} default_local_infile_data;
+
+
+/*
+  Open file for LOAD LOCAL INFILE
+
+  SYNOPSIS
+    default_local_infile_init()
+    ptr			Store pointer to internal data here
+    filename		File name to open. This may be in unix format !
+
+
+  NOTES
+    Even if this function returns an error, the load data interface
+    guarantees that default_local_infile_end() is called.
+
+  RETURN
+    0	ok
+    1	error
+*/
+
+static int default_local_infile_init(void **ptr, const char *filename,
+             void *userdata __attribute__ ((unused)))
+{
+  default_local_infile_data *data;
+  char tmp_name[FN_REFLEN];
+
+  if (!(*ptr= data= ((default_local_infile_data *)
+		     my_malloc(PSI_NOT_INSTRUMENTED,
+                               sizeof(default_local_infile_data),  MYF(0)))))
+    return 1; /* out of memory */
+
+  data->error_msg[0]= 0;
+  data->error_num=    0;
+  data->filename= filename;
+
+  fn_format(tmp_name, filename, "", "", MY_UNPACK_FILENAME);
+  if ((data->fd = my_open(tmp_name, O_RDONLY, MYF(0))) < 0)
+  {
+    data->error_num= my_errno;
+    my_snprintf(data->error_msg, sizeof(data->error_msg)-1,
+                EE(EE_FILENOTFOUND), tmp_name, data->error_num);
+    return 1;
+  }
+  return 0; /* ok */
+}
+
+
+/*
+  Read data for LOAD LOCAL INFILE
+
+  SYNOPSIS
+    default_local_infile_read()
+    ptr			Points to handle allocated by _init
+    buf			Read data here
+    buf_len		Amount of data to read
+
+  RETURN
+    > 0		number of bytes read
+    == 0	End of data
+    < 0		Error
+*/
+
+static int default_local_infile_read(void *ptr, char *buf, uint buf_len)
+{
+  int count;
+  default_local_infile_data*data = (default_local_infile_data *) ptr;
+
+  if ((count= (int) my_read(data->fd, (uchar *) buf, buf_len, MYF(0))) < 0)
+  {
+    data->error_num= EE_READ; /* the errmsg for not entire file read */
+    my_snprintf(data->error_msg, sizeof(data->error_msg)-1,
+		EE(EE_READ),
+		data->filename, my_errno);
+  }
+  return count;
+}
+
+
+/*
+  Read data for LOAD LOCAL INFILE
+
+  SYNOPSIS
+    default_local_infile_end()
+    ptr			Points to handle allocated by _init
+			May be NULL if _init failed!
+
+  RETURN
+*/
+
+static void default_local_infile_end(void *ptr)
+{
+  default_local_infile_data *data= (default_local_infile_data *) ptr;
+  if (data)					/* If not error on open */
+  {
+    if (data->fd >= 0)
+      my_close(data->fd, MYF(MY_WME));
+    my_free(ptr);
+  }
+}
+
+
+/*
+  Return error from LOAD LOCAL INFILE
+
+  SYNOPSIS
+    default_local_infile_end()
+    ptr			Points to handle allocated by _init
+			May be NULL if _init failed!
+    error_msg		Store error text here
+    error_msg_len	Max length of error_msg
+
+  RETURN
+    error message number
+*/
+
+static int
+default_local_infile_error(void *ptr, char *error_msg, uint error_msg_len)
+{
+  default_local_infile_data *data = (default_local_infile_data *) ptr;
+  if (data)					/* If not error on open */
+  {
+    strmake(error_msg, data->error_msg, error_msg_len);
+    return data->error_num;
+  }
+  /* This can only happen if we got error on malloc of handle */
+  strmov(error_msg, ER(CR_OUT_OF_MEMORY));
+  return CR_OUT_OF_MEMORY;
+}
+
+
+void
+mysql_set_local_infile_handler(MYSQL *mysql,
+                               int (*local_infile_init)(void **, const char *,
+                               void *),
+                               int (*local_infile_read)(void *, char *, uint),
+                               void (*local_infile_end)(void *),
+                               int (*local_infile_error)(void *, char *, uint),
+                               void *userdata)
+{
+  mysql->options.local_infile_init=  local_infile_init;
+  mysql->options.local_infile_read=  local_infile_read;
+  mysql->options.local_infile_end=   local_infile_end;
+  mysql->options.local_infile_error= local_infile_error;
+  mysql->options.local_infile_userdata = userdata;
+}
+
+
+void mysql_set_local_infile_default(MYSQL *mysql)
+{
+  mysql->options.local_infile_init=  default_local_infile_init;
+  mysql->options.local_infile_read=  default_local_infile_read;
+  mysql->options.local_infile_end=   default_local_infile_end;
+  mysql->options.local_infile_error= default_local_infile_error;
+}
+
+
+/**************************************************************************
+  Do a query. If query returned rows, free old rows.
+  Read data by mysql_store_result or by repeat call of mysql_fetch_row
+**************************************************************************/
+
+int STDCALL
+mysql_query(MYSQL *mysql, const char *query)
+{
+  return mysql_real_query(mysql,query, (uint) strlen(query));
+}
+
+
+/**************************************************************************
+  Return next field of the query results
+**************************************************************************/
+
+MYSQL_FIELD * STDCALL
+mysql_fetch_field(MYSQL_RES *result)
+{
+  if (result->current_field >= result->field_count)
+    return(NULL);
+  return &result->fields[result->current_field++];
+}
+
+
+/**************************************************************************
+** Return mysql field metadata
+**************************************************************************/
+int STDCALL
+mariadb_field_attr(MARIADB_CONST_STRING *attr,
+                   const MYSQL_FIELD *field,
+                   enum mariadb_field_attr_t type)
+{
+  MARIADB_FIELD_EXTENSION *ext= (MARIADB_FIELD_EXTENSION*) field->extension;
+  if (!ext || type > MARIADB_FIELD_ATTR_LAST)
+  {
+    static MARIADB_CONST_STRING null_str= {0,0};
+    *attr= null_str;
+    return 1;
+  }
+  *attr= ext->metadata[type];
+  return 0;
+}
+
+
+/**************************************************************************
+  Move to a specific row and column
+**************************************************************************/
+
+void STDCALL
+mysql_data_seek(MYSQL_RES *result, my_ulonglong row)
+{
+  MYSQL_ROWS	*tmp=0;
+  DBUG_PRINT("info",("mysql_data_seek(%ld)",(long) row));
+  if (result->data)
+    for (tmp=result->data->data; row-- && tmp ; tmp = tmp->next) ;
+  result->current_row=0;
+  result->data_cursor = tmp;
+}
+
+
+/*************************************************************************
+  put the row or field cursor one a position one got from mysql_row_tell()
+  This doesn't restore any data. The next mysql_fetch_row or
+  mysql_fetch_field will return the next row or field after the last used
+*************************************************************************/
+
+MYSQL_ROW_OFFSET STDCALL
+mysql_row_seek(MYSQL_RES *result, MYSQL_ROW_OFFSET row)
+{
+  MYSQL_ROW_OFFSET return_value=result->data_cursor;
+  result->current_row= 0;
+  result->data_cursor= row;
+  return return_value;
+}
+
+
+MYSQL_FIELD_OFFSET STDCALL
+mysql_field_seek(MYSQL_RES *result, MYSQL_FIELD_OFFSET field_offset)
+{
+  MYSQL_FIELD_OFFSET return_value=result->current_field;
+  result->current_field=field_offset;
+  return return_value;
+}
+
+
+/*****************************************************************************
+  List all databases
+*****************************************************************************/
+
+MYSQL_RES * STDCALL
+mysql_list_dbs(MYSQL *mysql, const char *wild)
+{
+  char buff[255];
+  DBUG_ENTER("mysql_list_dbs");
+
+  append_wild(strmov(buff,"show databases"),buff+sizeof(buff),wild);
+  if (mysql_query(mysql,buff))
+    DBUG_RETURN(0);
+  DBUG_RETURN (mysql_store_result(mysql));
+}
+
+
+/*****************************************************************************
+  List all tables in a database
+  If wild is given then only the tables matching wild is returned
+*****************************************************************************/
+
+MYSQL_RES * STDCALL
+mysql_list_tables(MYSQL *mysql, const char *wild)
+{
+  char buff[255];
+  DBUG_ENTER("mysql_list_tables");
+
+  append_wild(strmov(buff,"show tables"),buff+sizeof(buff),wild);
+  if (mysql_query(mysql,buff))
+    DBUG_RETURN(0);
+  DBUG_RETURN (mysql_store_result(mysql));
+}
+
+
+MYSQL_FIELD *cli_list_fields(MYSQL *mysql)
+{
+  MYSQL_DATA *query;
+  if (!(query= cli_read_rows(mysql,(MYSQL_FIELD*) 0, 
+			     protocol_41(mysql) ? 8 : 6)))
+    return NULL;
+
+  mysql->field_count= (uint) query->rows;
+  return unpack_fields(mysql, query,&mysql->field_alloc,
+                       mysql->field_count, 1,
+                       (uint) mysql->server_capabilities);
+}
+
+
+/**************************************************************************
+  List all fields in a table
+  If wild is given then only the fields matching wild is returned
+  Instead of this use query:
+  show fields in 'table' like "wild"
+**************************************************************************/
+
+MYSQL_RES * STDCALL
+mysql_list_fields(MYSQL *mysql, const char *table, const char *wild)
+{
+  MYSQL_RES   *result;
+  MYSQL_FIELD *fields;
+  char	     buff[258],*end;
+  DBUG_ENTER("mysql_list_fields");
+  DBUG_PRINT("enter",("table: '%s'  wild: '%s'",table,wild ? wild : ""));
+
+  end=strmake(strmake(buff, table,128)+1,wild ? wild : "",128);
+  free_old_query(mysql);
+  if (simple_command(mysql, COM_FIELD_LIST, (uchar*) buff,
+                     (ulong) (end-buff), 1) ||
+      !(fields= (*mysql->methods->list_fields)(mysql)))
+    DBUG_RETURN(NULL);
+
+  if (!(result = (MYSQL_RES *) my_malloc(PSI_NOT_INSTRUMENTED, sizeof(MYSQL_RES),
+					 MYF(MY_WME | MY_ZEROFILL))))
+    DBUG_RETURN(NULL);
+
+  result->methods= mysql->methods;
+  result->field_alloc=mysql->field_alloc;
+  mysql->fields=0;
+  result->field_count = mysql->field_count;
+  result->fields= fields;
+  result->eof=1;
+  DBUG_RETURN(result);
+}
+
+/* List all running processes (threads) in server */
+
+MYSQL_RES * STDCALL
+mysql_list_processes(MYSQL *mysql)
+{
+  MYSQL_DATA *UNINIT_VAR(fields);
+  uint field_count;
+  uchar *pos;
+  DBUG_ENTER("mysql_list_processes");
+
+  if (simple_command(mysql,COM_PROCESS_INFO,0,0,0))
+    DBUG_RETURN(0);
+  free_old_query(mysql);
+  pos=(uchar*) mysql->net.read_pos;
+  field_count=(uint) net_field_length(&pos);
+  if (!(fields = (*mysql->methods->read_rows)(mysql,(MYSQL_FIELD*) 0,
+					      protocol_41(mysql) ? 7 : 5)))
+    DBUG_RETURN(NULL);
+  if (!(mysql->fields=unpack_fields(mysql, fields,&mysql->field_alloc,field_count,0,
+				    (uint) mysql->server_capabilities)))
+    DBUG_RETURN(0);
+  mysql->status=MYSQL_STATUS_GET_RESULT;
+  mysql->field_count=field_count;
+  DBUG_RETURN(mysql_store_result(mysql));
+}
+
+
+#ifdef USE_OLD_FUNCTIONS
+int  STDCALL
+mysql_create_db(MYSQL *mysql, const char *db)
+{
+  DBUG_ENTER("mysql_createdb");
+  DBUG_PRINT("enter",("db: %s",db));
+  DBUG_RETURN(simple_command(mysql,COM_CREATE_DB,db, (ulong) strlen(db),0));
+}
+
+
+int  STDCALL
+mysql_drop_db(MYSQL *mysql, const char *db)
+{
+  DBUG_ENTER("mysql_drop_db");
+  DBUG_PRINT("enter",("db: %s",db));
+  DBUG_RETURN(simple_command(mysql,COM_DROP_DB,db,(ulong) strlen(db),0));
+}
+#endif
+
+
+int STDCALL
+mysql_shutdown(MYSQL *mysql, enum mysql_enum_shutdown_level shutdown_level)
+{
+  uchar level[1];
+  DBUG_ENTER("mysql_shutdown");
+  level[0]= (uchar) shutdown_level;
+  DBUG_RETURN(simple_command(mysql, COM_SHUTDOWN, level, 1, 0));
+}
+
+
+int STDCALL
+mysql_refresh(MYSQL *mysql,uint options)
+{
+  uchar bits[1];
+  DBUG_ENTER("mysql_refresh");
+  bits[0]= (uchar) options;
+  DBUG_RETURN(simple_command(mysql, COM_REFRESH, bits, 1, 0));
+}
+
+
+int STDCALL
+mysql_kill(MYSQL *mysql,ulong pid)
+{
+  uchar buff[4];
+  DBUG_ENTER("mysql_kill");
+  int4store(buff,pid);
+  DBUG_RETURN(simple_command(mysql,COM_PROCESS_KILL,buff,sizeof(buff),0));
+}
+
+
+int STDCALL
+mysql_set_server_option(MYSQL *mysql, enum enum_mysql_set_option option)
+{
+  uchar buff[2];
+  DBUG_ENTER("mysql_set_server_option");
+  int2store(buff, (uint) option);
+  DBUG_RETURN(simple_command(mysql, COM_SET_OPTION, buff, sizeof(buff), 0));
+}
+
+
+int STDCALL
+mysql_dump_debug_info(MYSQL *mysql)
+{
+  DBUG_ENTER("mysql_dump_debug_info");
+  DBUG_RETURN(simple_command(mysql,COM_DEBUG,0,0,0));
+}
+
+
+const char *cli_read_statistics(MYSQL *mysql)
+{
+  mysql->net.read_pos[mysql->packet_length]=0;	/* End of stat string */
+  if (!mysql->net.read_pos[0])
+  {
+    set_mysql_error(mysql, CR_WRONG_HOST_INFO, unknown_sqlstate);
+    return mysql->net.last_error;
+  }
+  return (char*) mysql->net.read_pos;
+}
+
+
+const char * STDCALL
+mysql_stat(MYSQL *mysql)
+{
+  DBUG_ENTER("mysql_stat");
+  if (simple_command(mysql,COM_STATISTICS,0,0,0))
+    DBUG_RETURN(mysql->net.last_error);
+  DBUG_RETURN((*mysql->methods->read_statistics)(mysql));
+}
+
+
+int STDCALL
+mysql_ping(MYSQL *mysql)
+{
+  int res;
+  DBUG_ENTER("mysql_ping");
+  res= simple_command(mysql,COM_PING,0,0,0);
+  if (res == CR_SERVER_LOST && mysql->reconnect)
+    res= simple_command(mysql,COM_PING,0,0,0);
+  DBUG_RETURN(res);
+}
+
+
+const char * STDCALL
+mysql_get_server_info(MYSQL *mysql)
+{
+  return((char*) mysql->server_version);
+}
+
+
+my_bool STDCALL mariadb_connection(MYSQL *mysql)
+{
+  return (strstr(mysql->server_version, "MariaDB") ||
+          strstr(mysql->server_version, "-maria-"));
+}
+
+const char * STDCALL
+mysql_get_server_name(MYSQL *mysql)
+{
+  return mariadb_connection(mysql) ? "MariaDB" : "MySQL";
+}
+
+
+const char * STDCALL
+mysql_get_host_info(MYSQL *mysql)
+{
+  return(mysql->host_info);
+}
+
+
+uint STDCALL
+mysql_get_proto_info(MYSQL *mysql)
+{
+  return (mysql->protocol_version);
+}
+
+const char * STDCALL
+mysql_get_client_info(void)
+{
+  return (char*) MYSQL_SERVER_VERSION;
+}
+
+ulong STDCALL mysql_get_client_version(void)
+{
+  return MYSQL_VERSION_ID;
+}
+
+my_bool STDCALL mysql_eof(MYSQL_RES *res)
+{
+  return res->eof;
+}
+
+MYSQL_FIELD * STDCALL mysql_fetch_field_direct(MYSQL_RES *res,uint fieldnr)
+{
+  return &(res)->fields[fieldnr];
+}
+
+MYSQL_FIELD * STDCALL mysql_fetch_fields(MYSQL_RES *res)
+{
+  return (res)->fields;
+}
+
+MYSQL_ROW_OFFSET STDCALL mysql_row_tell(MYSQL_RES *res)
+{
+  return res->data_cursor;
+}
+
+MYSQL_FIELD_OFFSET STDCALL mysql_field_tell(MYSQL_RES *res)
+{
+  return (res)->current_field;
+}
+
+/* MYSQL */
+
+unsigned int STDCALL mysql_field_count(MYSQL *mysql)
+{
+  return mysql->field_count;
+}
+
+my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql)
+{
+  return mysql->insert_id;
+}
+
+const char *STDCALL mysql_sqlstate(MYSQL *mysql)
+{
+  return mysql ? mysql->net.sqlstate : cant_connect_sqlstate;
+}
+
+uint STDCALL mysql_warning_count(MYSQL *mysql)
+{
+  return mysql->warning_count;
+}
+
+const char *STDCALL mysql_info(MYSQL *mysql)
+{
+  return mysql->info;
+}
+
+ulong STDCALL mysql_thread_id(MYSQL *mysql)
+{
+  return (mysql)->thread_id;
+}
+
+const char * STDCALL mysql_character_set_name(MYSQL *mysql)
+{
+  return mysql->charset->cs_name.str;
+}
+
+void STDCALL mysql_get_character_set_info(MYSQL *mysql, MY_CHARSET_INFO *csinfo)
+{
+  csinfo->number   = mysql->charset->number;
+  csinfo->state    = mysql->charset->state;
+  csinfo->csname   = mysql->charset->cs_name.str;
+  csinfo->name     = mysql->charset->coll_name.str;
+  csinfo->comment  = mysql->charset->comment;
+  csinfo->mbminlen = mysql->charset->mbminlen;
+  csinfo->mbmaxlen = mysql->charset->mbmaxlen;
+
+  if (mysql->options.charset_dir)
+    csinfo->dir = mysql->options.charset_dir;
+  else
+    csinfo->dir = charsets_dir;
+}
+
+uint STDCALL mysql_thread_safe(void)
+{
+  return 1;
+}
+
+
+my_bool STDCALL mysql_embedded(void)
+{
+#ifdef EMBEDDED_LIBRARY
+  return 1;
+#else
+  return 0;
+#endif
+}
+
+/****************************************************************************
+  Some support functions
+****************************************************************************/
+
+/*
+  Functions called my my_net_init() to set some application specific variables
+*/
+
+void my_net_local_init(NET *net)
+{
+  net->max_packet=   (uint) net_buffer_length;
+  net->read_timeout= net->write_timeout= 0;
+  my_net_set_read_timeout(net, CLIENT_NET_READ_TIMEOUT);
+  my_net_set_write_timeout(net, CLIENT_NET_WRITE_TIMEOUT);
+  net->retry_count=  1;
+  net->max_packet_size= MY_MAX(net_buffer_length, max_allowed_packet);
+}
+
+/*
+  This function is used to create HEX string that you
+  can use in a SQL statement in of the either ways:
+    INSERT INTO blob_column VALUES (0xAABBCC);  (any MySQL version)
+    INSERT INTO blob_column VALUES (X'AABBCC'); (4.1 and higher)
+  
+  The string in "from" is encoded to a HEX string.
+  The result is placed in "to" and a terminating null byte is appended.
+  
+  The string pointed to by "from" must be "length" bytes long.
+  You must allocate the "to" buffer to be at least length*2+1 bytes long.
+  Each character needs two bytes, and you need room for the terminating
+  null byte. When mysql_hex_string() returns, the contents of "to" will
+  be a null-terminated string. The return value is the length of the
+  encoded string, not including the terminating null character.
+
+  The return value does not contain any leading 0x or a leading X' and
+  trailing '. The caller must supply whichever of those is desired.
+*/
+
+ulong STDCALL
+mysql_hex_string(char *to, const char *from, ulong length)
+{
+  char *to0= to;
+  const char *end;
+            
+  for (end= from + length; from < end; from++)
+  {
+    *to++= _dig_vec_upper[((unsigned char) *from) >> 4];
+    *to++= _dig_vec_upper[((unsigned char) *from) & 0x0F];
+  }
+  *to= '\0';
+  return (ulong) (to-to0);
+}
+
+/*
+  Add escape characters to a string (blob?) to make it suitable for a insert
+  to should at least have place for length*2+1 chars
+  Returns the length of the to string
+*/
+
+ulong STDCALL
+mysql_escape_string(char *to,const char *from,ulong length)
+{
+  my_bool overflow;
+  return (uint) escape_string_for_mysql(default_charset_info, to, 0, from,
+                                        length, &overflow);
+}
+
+ulong STDCALL
+mysql_real_escape_string(MYSQL *mysql, char *to,const char *from,
+			 ulong length)
+{
+  my_bool overflow;
+  if (mysql->server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)
+    return (ulong) escape_quotes_for_mysql(mysql->charset, to, 0, from, length,
+                                           &overflow);
+  return (ulong) escape_string_for_mysql(mysql->charset, to, 0, from, length,
+                                         &overflow);
+}
+
+void STDCALL
+myodbc_remove_escape(MYSQL *mysql,char *name)
+{
+  char *to;
+#ifdef USE_MB
+  my_bool use_mb_flag= my_ci_use_mb(mysql->charset);
+  char *UNINIT_VAR(end);
+  if (use_mb_flag)
+    for (end=name; *end ; end++) ;
+#endif
+
+  for (to=name ; *name ; name++)
+  {
+#ifdef USE_MB
+    int l;
+    if (use_mb_flag && (l = my_ismbchar( mysql->charset, name , end ) ) )
+    {
+      while (l--)
+	*to++ = *name++;
+      name--;
+      continue;
+    }
+#endif
+    if (*name == '\\' && name[1])
+      name++;
+    *to++= *name;
+  }
+  *to=0;
+}
+
+/********************************************************************
+ Implementation of new client API for 4.1 version.
+
+ mysql_stmt_* are real prototypes used by applications.
+
+ To make API work in embedded library all functions performing
+ real I/O are prefixed with 'cli_' (abbreviated from 'Call Level
+ Interface'). This functions are invoked via pointers set in
+ MYSQL::methods structure. Embedded counterparts, prefixed with
+ 'emb_' reside in libmysqld/lib_sql.cc.
+*********************************************************************/
+
+/******************* Declarations ***********************************/
+
+/* Default number of rows fetched per one COM_STMT_FETCH command. */
+
+#define DEFAULT_PREFETCH_ROWS (ulong) 1
+
+/*
+  These functions are called by function pointer MYSQL_STMT::read_row_func.
+  Each function corresponds to one of the read methods:
+  - mysql_stmt_fetch without prior mysql_stmt_store_result,
+  - mysql_stmt_fetch when result is stored,
+  - mysql_stmt_fetch when there are no rows (always returns MYSQL_NO_DATA)
+*/
+
+static int stmt_read_row_unbuffered(MYSQL_STMT *stmt, unsigned char **row);
+static int stmt_read_row_buffered(MYSQL_STMT *stmt, unsigned char **row);
+static int stmt_read_row_from_cursor(MYSQL_STMT *stmt, unsigned char **row);
+static int stmt_read_row_no_data(MYSQL_STMT *stmt, unsigned char **row);
+static int stmt_read_row_no_result_set(MYSQL_STMT *stmt, unsigned char **row);
+
+/*
+  This function is used in mysql_stmt_store_result if
+  STMT_ATTR_UPDATE_MAX_LENGTH attribute is set.
+*/
+static void stmt_update_metadata(MYSQL_STMT *stmt, MYSQL_ROWS *data);
+static my_bool setup_one_fetch_function(MYSQL_BIND *, MYSQL_FIELD *field);
+
+/* Auxiliary function used to reset statement handle. */
+
+#define RESET_SERVER_SIDE 1
+#define RESET_LONG_DATA 2
+#define RESET_STORE_RESULT 4
+#define RESET_CLEAR_ERROR 8
+#define RESET_ALL_BUFFERS 16
+
+static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags);
+
+/*
+  Maximum sizes of MYSQL_TYPE_DATE, MYSQL_TYPE_TIME, MYSQL_TYPE_DATETIME
+  values stored in network buffer.
+*/
+
+/* 1 (length) + 2 (year) + 1 (month) + 1 (day) */
+#define MAX_DATE_REP_LENGTH 5
+
+/*
+  1 (length) + 1 (is negative) + 4 (day count) + 1 (hour)
+  + 1 (minute) + 1 (seconds) + 4 (microseconds)
+*/
+#define MAX_TIME_REP_LENGTH 13
+
+/*
+  1 (length) + 2 (year) + 1 (month) + 1 (day) +
+  1 (hour) + 1 (minute) + 1 (second) + 4 (microseconds)
+*/
+#define MAX_DATETIME_REP_LENGTH 12
+
+#define MAX_DOUBLE_STRING_REP_LENGTH 331
+
+/* A macro to check truncation errors */
+
+#define IS_TRUNCATED(value, is_unsigned, min, max, umax) \
+        ((is_unsigned) ? (((value) > (umax) || (value) < 0) ? 1 : 0) : \
+                         (((value) > (max)  || (value) < (min)) ? 1 : 0))
+
+#define BIND_RESULT_DONE 1
+/*
+  We report truncations only if at least one of MYSQL_BIND::error
+  pointers is set. In this case stmt->bind_result_done |-ed with
+  this flag.
+*/
+#define REPORT_DATA_TRUNCATION 2
+
+/**************** Misc utility functions ****************************/
+
+/*
+  Reallocate the NET package to have at least length bytes available.
+
+  SYNPOSIS
+    my_realloc_str()
+    net                 The NET structure to modify.
+    length              Ensure that net->buff has space for at least
+                        this number of bytes.
+
+  RETURN VALUES
+    0   Success.
+    1   Error, i.e. out of memory or requested packet size is bigger
+        than max_allowed_packet. The error code is stored in net->last_errno.
+*/
+
+static my_bool my_realloc_str(NET *net, ulong length)
+{
+  ulong buf_length= (ulong) (net->write_pos - net->buff);
+  my_bool res=0;
+  DBUG_ENTER("my_realloc_str");
+  if (buf_length + length > net->max_packet)
+  {
+    res= net_realloc(net, buf_length + length);
+    if (res)
+    {
+      if (net->last_errno == ER_OUT_OF_RESOURCES)
+        net->last_errno= CR_OUT_OF_MEMORY;
+      else if (net->last_errno == ER_NET_PACKET_TOO_LARGE)
+        net->last_errno= CR_NET_PACKET_TOO_LARGE;
+      strmov(net->sqlstate, unknown_sqlstate);
+      strmov(net->last_error, ER(net->last_errno));
+    }
+    net->write_pos= net->buff+ buf_length;
+  }
+  DBUG_RETURN(res);
+}
+
+
+static void stmt_clear_error(MYSQL_STMT *stmt)
+{
+  if (stmt->last_errno)
+  {
+    stmt->last_errno= 0;
+    stmt->last_error[0]= '\0';
+    strmov(stmt->sqlstate, not_error_sqlstate);
+  }
+}
+
+/**
+  Set statement error code, sqlstate, and error message
+  from given errcode and sqlstate.
+*/
+
+void set_stmt_error(MYSQL_STMT * stmt, int errcode,
+                    const char *sqlstate, const char *err)
+{
+  DBUG_ENTER("set_stmt_error");
+  DBUG_PRINT("enter", ("error: %d '%s'", errcode, ER(errcode)));
+  DBUG_ASSERT(stmt != 0);
+
+  if (err == 0)
+    err= ER(errcode);
+
+  stmt->last_errno= errcode;
+  strmov(stmt->last_error, ER(errcode));
+  strmov(stmt->sqlstate, sqlstate);
+
+  DBUG_VOID_RETURN;
+}
+
+
+/**
+  Set statement error code, sqlstate, and error message from NET.
+
+  @param stmt  a statement handle. Copy the error here.
+  @param net   mysql->net. Source of the error.
+*/
+
+void set_stmt_errmsg(MYSQL_STMT *stmt, NET *net)
+{
+  DBUG_ENTER("set_stmt_errmsg");
+  DBUG_PRINT("enter", ("error: %d/%s '%s'",
+                       net->last_errno,
+                       net->sqlstate,
+                       net->last_error));
+  DBUG_ASSERT(stmt != 0);
+
+  stmt->last_errno= net->last_errno;
+  if (net->last_error[0])
+    strmov(stmt->last_error, net->last_error);
+  strmov(stmt->sqlstate, net->sqlstate);
+
+  DBUG_VOID_RETURN;
+}
+
+/*
+  Read and unpack server reply to COM_STMT_PREPARE command (sent from
+  mysql_stmt_prepare).
+
+  SYNOPSIS
+    cli_read_prepare_result()
+    mysql   connection handle
+    stmt    statement handle
+
+  RETURN VALUES
+    0	ok
+    1	error
+*/
+
+my_bool cli_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
+{
+  uchar *pos;
+  uint field_count, param_count;
+  ulong packet_length;
+  MYSQL_DATA *fields_data;
+  DBUG_ENTER("cli_read_prepare_result");
+
+  if ((packet_length= cli_safe_read(mysql)) == packet_error)
+    DBUG_RETURN(1);
+  mysql->warning_count= 0;
+
+  pos= (uchar*) mysql->net.read_pos;
+  stmt->stmt_id= uint4korr(pos+1); pos+= 5;
+  /* Number of columns in result set */
+  field_count=   uint2korr(pos);   pos+= 2;
+  /* Number of placeholders in the statement */
+  param_count=   uint2korr(pos);   pos+= 2;
+  if (packet_length >= 12)
+    mysql->warning_count= uint2korr(pos+1);
+
+  if (param_count != 0)
+  {
+    MYSQL_DATA *param_data;
+
+    /* skip parameters data: we don't support it yet */
+    if (!(param_data= (*mysql->methods->read_rows)(mysql, (MYSQL_FIELD*)0, 7)))
+      DBUG_RETURN(1);
+    free_rows(param_data);
+  }
+
+  if (field_count != 0)
+  {
+    if (!(mysql->server_status & SERVER_STATUS_AUTOCOMMIT))
+      mysql->server_status|= SERVER_STATUS_IN_TRANS;
+
+    if (!(fields_data= (*mysql->methods->read_rows)(mysql,(MYSQL_FIELD*)0,7)))
+      DBUG_RETURN(1);
+    if (!(stmt->fields= unpack_fields(mysql, fields_data,&stmt->mem_root,
+                                      field_count,0,
+                                      (uint) mysql->server_capabilities)))
+      DBUG_RETURN(1);
+  }
+  stmt->field_count=  field_count;
+  stmt->param_count=  (uint) param_count;
+  DBUG_PRINT("exit",("field_count: %u  param_count: %u  warning_count: %u",
+                     field_count, param_count, (uint) mysql->warning_count));
+
+  DBUG_RETURN(0);
+}
+
+
+/*
+  Allocate memory and init prepared statement structure.
+
+  SYNOPSIS
+    mysql_stmt_init()
+    mysql   connection handle
+
+  DESCRIPTION
+    This is an entry point of the new API. Returned handle stands for
+    a server-side prepared statement. Memory for this structure (~700
+    bytes) is allocated using 'malloc'. Once created, the handle can be
+    reused many times. Created statement handle is bound to connection
+    handle provided to this call: its lifetime is limited by lifetime
+    of connection.
+    'mysql_stmt_init()' is a pure local call, server side structure is
+    created only in mysql_stmt_prepare.
+    Next steps you may want to make:
+    - set a statement attribute (mysql_stmt_attr_set()),
+    - prepare statement handle with a query (mysql_stmt_prepare()),
+    - close statement handle and free its memory (mysql_stmt_close()),
+    - reset statement with mysql_stmt_reset() (a no-op which will
+      just return).
+    Behaviour of the rest of API calls on this statement is not defined yet
+    (though we're working on making each wrong call sequence return
+    error).
+
+  RETURN VALUE
+    statement structure upon success and NULL if out of
+    memory
+*/
+
+#ifdef EMBEDDED_LIBRARY
+#undef MY_THREAD_SPECIFIC
+#define MY_THREAD_SPECIFIC 0
+#endif /*EMBEDDED_LIBRARY*/
+
+MYSQL_STMT * STDCALL
+mysql_stmt_init(MYSQL *mysql)
+{
+  MYSQL_STMT *stmt;
+  DBUG_ENTER("mysql_stmt_init");
+
+  if (!(stmt=
+          (MYSQL_STMT *) my_malloc(PSI_NOT_INSTRUMENTED, sizeof (MYSQL_STMT),
+                                   MYF(MY_WME | MY_ZEROFILL))) ||
+      !(stmt->extension=
+          (MYSQL_STMT_EXT *) my_malloc(PSI_NOT_INSTRUMENTED, sizeof (MYSQL_STMT_EXT),
+                                       MYF(MY_WME | MY_ZEROFILL))))
+  {
+    set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
+    my_free(stmt);
+    DBUG_RETURN(NULL);
+  }
+
+  init_alloc_root(PSI_NOT_INSTRUMENTED, &stmt->mem_root, 2048,2048, MYF(MY_THREAD_SPECIFIC));
+  init_alloc_root(PSI_NOT_INSTRUMENTED, &stmt->result.alloc, 4096, 4096, MYF(MY_THREAD_SPECIFIC));
+  stmt->result.alloc.min_malloc= sizeof(MYSQL_ROWS);
+  mysql->stmts= list_add(mysql->stmts, &stmt->list);
+  stmt->list.data= stmt;
+  stmt->state= MYSQL_STMT_INIT_DONE;
+  stmt->mysql= mysql;
+  stmt->read_row_func= stmt_read_row_no_result_set;
+  stmt->prefetch_rows= DEFAULT_PREFETCH_ROWS;
+  strmov(stmt->sqlstate, not_error_sqlstate);
+  /* The rest of statement members was bzeroed inside malloc */
+
+  init_alloc_root(PSI_NOT_INSTRUMENTED, &stmt->extension->fields_mem_root, 2048, 0,
+                  MYF(MY_THREAD_SPECIFIC));
+
+  DBUG_RETURN(stmt);
+}
+
+
+/*
+  Prepare server side statement with query.
+
+  SYNOPSIS
+    mysql_stmt_prepare()
+    stmt    statement handle
+    query   statement to prepare
+    length  statement length
+
+  DESCRIPTION
+    Associate statement with statement handle. This is done both on
+    client and server sides. At this point the server parses given query
+    and creates an internal structure to represent it.
+    Next steps you may want to make:
+    - find out if this statement returns a result set by
+      calling mysql_stmt_field_count(), and get result set metadata
+      with mysql_stmt_result_metadata(),
+    - if query contains placeholders, bind input parameters to placeholders
+      using mysql_stmt_bind_param(),
+    - otherwise proceed directly to mysql_stmt_execute().
+
+  IMPLEMENTATION NOTES
+  - if this is a re-prepare of the statement, first close previous data
+    structure on the server and free old statement data
+  - then send the query to server and get back number of placeholders,
+    number of columns in result set (if any), and result set metadata.
+    At the same time allocate memory for input and output parameters
+    to have less checks in mysql_stmt_bind_{param, result}.
+
+  RETURN VALUES
+    0  success
+   !0  error
+*/
+
+int STDCALL
+mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query, ulong length)
+{
+  MYSQL *mysql= stmt->mysql;
+  DBUG_ENTER("mysql_stmt_prepare");
+
+  if (!mysql)
+  {
+    /* mysql can be reset in mysql_close called from mysql_reconnect */
+    set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate, NULL);
+    DBUG_RETURN(1);
+  }
+
+  /*
+    Reset the last error in any case: that would clear the statement
+    if the previous prepare failed.
+  */
+  stmt->last_errno= 0;
+  stmt->last_error[0]= '\0';
+
+  if ((int) stmt->state > (int) MYSQL_STMT_INIT_DONE)
+  {
+    /* This is second prepare with another statement */
+    uchar buff[MYSQL_STMT_HEADER];               /* 4 bytes - stmt id */
+
+    if (reset_stmt_handle(stmt, RESET_LONG_DATA | RESET_STORE_RESULT))
+      DBUG_RETURN(1);
+    /*
+      These members must be reset for API to
+      function in case of error or misuse.
+    */
+    stmt->bind_param_done= stmt->bind_result_done= FALSE;
+    stmt->param_count= stmt->field_count= 0;
+    free_root(&stmt->mem_root, MYF(MY_KEEP_PREALLOC));
+    free_root(&stmt->extension->fields_mem_root, MYF(0));
+
+    int4store(buff, stmt->stmt_id);
+
+    /*
+      Close statement in server
+
+      If there was a 'use' result from another statement, or from
+      mysql_use_result it won't be freed in mysql_stmt_free_result and
+      we should get 'Commands out of sync' here.
+    */
+    stmt->state= MYSQL_STMT_INIT_DONE;
+    if (stmt_command(mysql, COM_STMT_CLOSE, buff, 4, stmt))
+    {
+      set_stmt_errmsg(stmt, &mysql->net);
+      DBUG_RETURN(1);
+    }
+  }
+
+  if (stmt_command(mysql, COM_STMT_PREPARE, (const uchar*) query, length, stmt))
+  {
+    set_stmt_errmsg(stmt, &mysql->net);
+    DBUG_RETURN(1);
+  }
+
+  if ((*mysql->methods->read_prepare_result)(mysql, stmt))
+  {
+    set_stmt_errmsg(stmt, &mysql->net);
+    DBUG_RETURN(1);
+  }
+
+  /*
+    alloc_root will return valid address even in case when param_count
+    and field_count are zero. Thus we should never rely on stmt->bind
+    or stmt->params when checking for existence of placeholders or
+    result set.
+  */
+  if (!(stmt->params= (MYSQL_BIND *) alloc_root(&stmt->mem_root,
+						sizeof(MYSQL_BIND)*
+                                                (stmt->param_count +
+                                                 stmt->field_count))))
+  {
+    set_stmt_error(stmt, CR_OUT_OF_MEMORY, unknown_sqlstate, NULL);
+    DBUG_RETURN(1);
+  }
+  stmt->bind= stmt->params + stmt->param_count;
+  stmt->state= MYSQL_STMT_PREPARE_DONE;
+  DBUG_PRINT("info", ("Parameter count: %u", stmt->param_count));
+  DBUG_RETURN(0);
+}
+
+/*
+  Get result set metadata from reply to mysql_stmt_execute.
+  This is used mainly for SHOW commands, as metadata for these
+  commands is sent only with result set.
+  To be removed when all commands will fully support prepared mode.
+*/
+
+static void alloc_stmt_fields(MYSQL_STMT *stmt)
+{
+  MYSQL_FIELD *fields, *field, *end;
+  MEM_ROOT *fields_mem_root= &stmt->extension->fields_mem_root;
+  MYSQL *mysql= stmt->mysql;
+
+  DBUG_ASSERT(stmt->field_count);
+
+  free_root(fields_mem_root, MYF(0));
+
+  /*
+    Get the field information for non-select statements
+    like SHOW and DESCRIBE commands
+  */
+  if (!(stmt->fields= (MYSQL_FIELD *) alloc_root(fields_mem_root,
+						 sizeof(MYSQL_FIELD) *
+						 stmt->field_count)) ||
+      !(stmt->bind= (MYSQL_BIND *) alloc_root(fields_mem_root,
+					      sizeof(MYSQL_BIND) *
+					      stmt->field_count)))
+  {
+    set_stmt_error(stmt, CR_OUT_OF_MEMORY, unknown_sqlstate, NULL);
+    return;
+  }
+
+  for (fields= mysql->fields, end= fields+stmt->field_count,
+	 field= stmt->fields;
+       field && fields < end; fields++, field++)
+  {
+    *field= *fields; /* To copy all numeric parts. */
+    field->catalog=   strmake_root(fields_mem_root,
+                                   fields->catalog,
+                                   fields->catalog_length);
+    field->db=        strmake_root(fields_mem_root,
+                                   fields->db,
+                                   fields->db_length);
+    field->table=     strmake_root(fields_mem_root,
+                                   fields->table,
+                                   fields->table_length);
+    field->org_table= strmake_root(fields_mem_root,
+                                   fields->org_table,
+                                   fields->org_table_length);
+    field->name=      strmake_root(fields_mem_root,
+                                   fields->name,
+                                   fields->name_length);
+    field->org_name=  strmake_root(fields_mem_root,
+                                   fields->org_name,
+                                   fields->org_name_length);
+    if (fields->def)
+    {
+      field->def= strmake_root(fields_mem_root,
+                               fields->def,
+                               fields->def_length);
+      field->def_length= fields->def_length;
+    }
+    else
+    {
+      field->def= NULL;
+      field->def_length= 0;
+    }
+    field->extension= 0; /* Avoid dangling links. */
+    field->max_length= 0; /* max_length is set in mysql_stmt_store_result() */
+  }
+}
+
+
+/**
+  Update result set columns metadata if it was sent again in
+  reply to COM_STMT_EXECUTE.
+
+  @note If the new field count is different from the original one,
+        an error is set and no update is performed.
+*/
+
+static void update_stmt_fields(MYSQL_STMT *stmt)
+{
+  MYSQL_FIELD *field= stmt->mysql->fields;
+  MYSQL_FIELD *field_end= field + stmt->field_count;
+  MYSQL_FIELD *stmt_field= stmt->fields;
+  MYSQL_BIND *my_bind= stmt->bind_result_done ? stmt->bind : 0;
+
+  if (stmt->field_count != stmt->mysql->field_count)
+  {
+    /*
+      The tables used in the statement were altered,
+      and the query now returns a different number of columns.
+      There is no way to continue without reallocating the bind
+      array:
+      - if the number of columns increased, mysql_stmt_fetch()
+      will write beyond allocated memory
+      - if the number of columns decreased, some user-bound
+      buffers will be left unassigned without user knowing
+      that.
+    */
+    set_stmt_error(stmt, CR_NEW_STMT_METADATA, unknown_sqlstate, NULL);
+    return;
+  }
+
+  for (; field < field_end; ++field, ++stmt_field)
+  {
+    stmt_field->charsetnr= field->charsetnr;
+    stmt_field->length   = field->length;
+    stmt_field->type     = field->type;
+    stmt_field->flags    = field->flags;
+    stmt_field->decimals = field->decimals;
+    if (my_bind)
+    {
+      /* Ignore return value: it should be 0 if bind_result succeeded. */
+      (void) setup_one_fetch_function(my_bind++, stmt_field);
+    }
+  }
+}
+
+/*
+  Returns prepared statement metadata in the form of a result set.
+
+  SYNOPSIS
+    mysql_stmt_result_metadata()
+    stmt  statement handle
+
+  DESCRIPTION
+    This function should be used after mysql_stmt_execute().
+    You can safely check that prepared statement has a result set by calling
+    mysql_stmt_field_count(): if number of fields is not zero, you can call
+    this function to get fields metadata.
+    Next steps you may want to make:
+    - find out number of columns in result set by calling
+      mysql_num_fields(res) (the same value is returned by
+      mysql_stmt_field_count())
+    - fetch metadata for any column with mysql_fetch_field,
+      mysql_fetch_field_direct, mysql_fetch_fields, mysql_field_seek.
+    - free returned MYSQL_RES structure with mysql_free_result.
+    - proceed to binding of output parameters.
+
+  RETURN
+    NULL  statement contains no result set or out of memory.
+          In the latter case you can retrieve error message
+          with mysql_stmt_error.
+    MYSQL_RES  a result set with no rows
+*/
+
+MYSQL_RES * STDCALL
+mysql_stmt_result_metadata(MYSQL_STMT *stmt)
+{
+  MYSQL_RES *result;
+  DBUG_ENTER("mysql_stmt_result_metadata");
+
+  /*
+    stmt->fields is only defined if stmt->field_count is not null;
+    stmt->field_count is initialized in prepare.
+  */
+  if (!stmt->field_count)
+     DBUG_RETURN(0);
+
+  if (!(result=(MYSQL_RES*) my_malloc(PSI_NOT_INSTRUMENTED, sizeof(*result),
+                                      MYF(MY_WME | MY_ZEROFILL))))
+  {
+    set_stmt_error(stmt, CR_OUT_OF_MEMORY, unknown_sqlstate, NULL);
+    DBUG_RETURN(0);
+  }
+
+  result->methods=	stmt->mysql->methods;
+  result->eof=		1;                      /* Marker for buffered */
+  result->fields=	stmt->fields;
+  result->field_count=	stmt->field_count;
+  /* The rest of members of 'result' was bzeroed inside malloc */
+  DBUG_RETURN(result);
+}
+
+
+/*
+  Returns parameter columns meta information in the form of
+  result set.
+
+  SYNOPSIS
+    mysql_stmt_param_metadata()
+    stmt    statement handle
+
+  DESCRIPTION
+    This function can be called after you prepared the statement handle
+    with mysql_stmt_prepare().
+    XXX: not implemented yet.
+
+  RETURN
+    MYSQL_RES on success, 0 if there is no metadata.
+    Currently this function always returns 0.
+*/
+
+MYSQL_RES * STDCALL
+mysql_stmt_param_metadata(MYSQL_STMT *stmt)
+{
+  DBUG_ENTER("mysql_stmt_param_metadata");
+
+  if (!stmt->param_count)
+    DBUG_RETURN(0);
+
+  /*
+    TODO: Fix this when server sends the information.
+    Till then keep a dummy prototype.
+  */
+  DBUG_RETURN(0); 
+}
+
+
+/* Store type of parameter in network buffer. */
+
+static void store_param_type(unsigned char **pos, MYSQL_BIND *param)
+{
+  uint typecode= param->buffer_type | (param->is_unsigned ? 32768 : 0);
+  int2store(*pos, typecode);
+  *pos+= 2;
+}
+
+
+/*
+  Functions to store parameter data in network packet.
+
+  SYNOPSIS
+    store_param_xxx()
+    net			MySQL NET connection
+    param		MySQL bind param
+
+  DESCRIPTION
+    These functions are invoked from mysql_stmt_execute() by
+    MYSQL_BIND::store_param_func pointer. This pointer is set once per
+    many executions in mysql_stmt_bind_param(). The caller must ensure
+    that network buffer have enough capacity to store parameter
+    (MYSQL_BIND::buffer_length contains needed number of bytes).
+*/
+
+static void store_param_tinyint(NET *net, MYSQL_BIND *param)
+{
+  *(net->write_pos++)= *(uchar *) param->buffer;
+}
+
+static void store_param_short(NET *net, MYSQL_BIND *param)
+{
+  short value= *(short*) param->buffer;
+  int2store(net->write_pos,value);
+  net->write_pos+=2;
+}
+
+static void store_param_int32(NET *net, MYSQL_BIND *param)
+{
+  int32 value= *(int32*) param->buffer;
+  int4store(net->write_pos,value);
+  net->write_pos+=4;
+}
+
+static void store_param_int64(NET *net, MYSQL_BIND *param)
+{
+  longlong value= *(longlong*) param->buffer;
+  int8store(net->write_pos,value);
+  net->write_pos+= 8;
+}
+
+static void store_param_float(NET *net, MYSQL_BIND *param)
+{
+  float value= *(float*) param->buffer;
+  float4store(net->write_pos, value);
+  net->write_pos+= 4;
+}
+
+static void store_param_double(NET *net, MYSQL_BIND *param)
+{
+  double value= *(double*) param->buffer;
+  float8store(net->write_pos, value);
+  net->write_pos+= 8;
+}
+
+static void store_param_time(NET *net, MYSQL_BIND *param)
+{
+  MYSQL_TIME *tm= (MYSQL_TIME *) param->buffer;
+  char buff[MAX_TIME_REP_LENGTH], *pos;
+  uint length;
+
+  pos= buff+1;
+  pos[0]= tm->neg ? 1: 0;
+  int4store(pos+1, tm->day);
+  pos[5]= (uchar) tm->hour;
+  pos[6]= (uchar) tm->minute;
+  pos[7]= (uchar) tm->second;
+  int4store(pos+8, tm->second_part);
+  if (tm->second_part)
+    length= 12;
+  else if (tm->hour || tm->minute || tm->second || tm->day)
+    length= 8;
+  else
+    length= 0;
+  buff[0]= (char) length++;
+  memcpy((char *)net->write_pos, buff, length);
+  net->write_pos+= length;
+}
+
+static void net_store_datetime(NET *net, MYSQL_TIME *tm)
+{
+  char buff[MAX_DATETIME_REP_LENGTH], *pos;
+  uint length;
+
+  pos= buff+1;
+
+  int2store(pos, tm->year);
+  pos[2]= (uchar) tm->month;
+  pos[3]= (uchar) tm->day;
+  pos[4]= (uchar) tm->hour;
+  pos[5]= (uchar) tm->minute;
+  pos[6]= (uchar) tm->second;
+  int4store(pos+7, tm->second_part);
+  if (tm->second_part)
+    length= 11;
+  else if (tm->hour || tm->minute || tm->second)
+    length= 7;
+  else if (tm->year || tm->month || tm->day)
+    length= 4;
+  else
+    length= 0;
+  buff[0]= (char) length++;
+  memcpy((char *)net->write_pos, buff, length);
+  net->write_pos+= length;
+}
+
+static void store_param_date(NET *net, MYSQL_BIND *param)
+{
+  MYSQL_TIME tm= *((MYSQL_TIME *) param->buffer);
+  tm.hour= 0;
+  tm.minute= 0;
+  tm.second= 0;
+  tm.second_part= 0;
+  net_store_datetime(net, &tm);
+}
+
+static void store_param_datetime(NET *net, MYSQL_BIND *param)
+{
+  MYSQL_TIME *tm= (MYSQL_TIME *) param->buffer;
+  net_store_datetime(net, tm);
+}
+
+static void store_param_str(NET *net, MYSQL_BIND *param)
+{
+  /* param->length is always set in mysql_stmt_bind_param */
+  ulong length= *param->length;
+  uchar *to= net_store_length(net->write_pos, length);
+  memcpy(to, param->buffer, length);
+  net->write_pos= to+length;
+}
+
+
+/*
+  Mark if the parameter is NULL.
+
+  SYNOPSIS
+    store_param_null()
+    net			MySQL NET connection
+    param		MySQL bind param
+
+  DESCRIPTION
+    A data package starts with a string of bits where we set a bit
+    if a parameter is NULL. Unlike bit string in result set row, here
+    we don't have reserved bits for OK/error packet.
+*/
+
+static void store_param_null(NET *net, MYSQL_BIND *param)
+{
+  uint pos= param->param_number;
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 5
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wconversion" /* GCC 5 needs this */
+#endif
+  net->buff[pos/8]|=  (uchar) (1 << (pos & 7));
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ == 5
+# pragma GCC diagnostic pop
+#endif
+}
+
+
+/*
+  Store one parameter in network packet: data is read from
+  client buffer and saved in network packet by means of one
+  of store_param_xxxx functions.
+*/
+
+static my_bool store_param(MYSQL_STMT *stmt, MYSQL_BIND *param)
+{
+  NET *net= &stmt->mysql->net;
+  DBUG_ENTER("store_param");
+  DBUG_PRINT("enter",("type: %d  buffer:%p  length: %lu  is_null: %d",
+		      param->buffer_type,
+		      param->buffer,
+                      *param->length, *param->is_null));
+
+  if (*param->is_null)
+    store_param_null(net, param);
+  else
+  {
+    /*
+      Param->length should ALWAYS point to the correct length for the type
+      Either to the length pointer given by the user or param->buffer_length
+    */
+    if ((my_realloc_str(net, *param->length)))
+    {
+      set_stmt_errmsg(stmt, net);
+      DBUG_RETURN(1);
+    }
+    (*param->store_param_func)(net, param);
+  }
+  DBUG_RETURN(0);
+}
+
+
+/*
+  Auxiliary function to send COM_STMT_EXECUTE packet to server and read reply.
+  Used from cli_stmt_execute, which is in turn used by mysql_stmt_execute.
+*/
+
+static my_bool execute(MYSQL_STMT *stmt, char *packet, ulong length)
+{
+  MYSQL *mysql= stmt->mysql;
+  NET	*net= &mysql->net;
+  uchar buff[4 /* size of stmt id */ +
+             5 /* execution flags */];
+  my_bool res;
+  DBUG_ENTER("execute");
+  DBUG_DUMP("packet", (uchar *) packet, length);
+
+  int4store(buff, stmt->stmt_id);		/* Send stmt id to server */
+  buff[4]= (char) stmt->flags;
+  int4store(buff+5, 1);                         /* iteration count */
+
+  res= MY_TEST((*mysql->methods->advanced_command)(mysql, COM_STMT_EXECUTE, buff, sizeof(buff),
+                                    (uchar*) packet, length, 1, stmt) ||
+            (*mysql->methods->read_query_result)(mysql));
+  stmt->affected_rows= mysql->affected_rows;
+  stmt->server_status= mysql->server_status;
+  stmt->insert_id= mysql->insert_id;
+  if (res)
+  {
+    /* 
+      Don't set stmt error if stmt->mysql is NULL, as the error in this case 
+      has already been set by mysql_prune_stmt_list(). 
+    */
+    if (stmt->mysql)
+      set_stmt_errmsg(stmt, net);
+    DBUG_RETURN(1);
+  }
+  else if (mysql->status == MYSQL_STATUS_GET_RESULT)
+    stmt->mysql->status= MYSQL_STATUS_STATEMENT_GET_RESULT;
+  DBUG_RETURN(0);
+}
+
+
+int cli_stmt_execute(MYSQL_STMT *stmt)
+{
+  DBUG_ENTER("cli_stmt_execute");
+
+  if (stmt->param_count)
+  {
+    MYSQL *mysql= stmt->mysql;
+    NET        *net= &mysql->net;
+    MYSQL_BIND *param, *param_end;
+    char       *param_data;
+    ulong length;
+    uint null_count;
+    my_bool    result;
+
+    if (!stmt->bind_param_done)
+    {
+      set_stmt_error(stmt, CR_PARAMS_NOT_BOUND, unknown_sqlstate, NULL);
+      DBUG_RETURN(1);
+    }
+    if (mysql->status != MYSQL_STATUS_READY ||
+        mysql->server_status & SERVER_MORE_RESULTS_EXISTS)
+    {
+      set_stmt_error(stmt, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate, NULL);
+      DBUG_RETURN(1);
+    }
+
+    if (net->vio)
+      net_clear(net, 1);          /* Sets net->write_pos */
+    else
+    {
+      set_stmt_errmsg(stmt, net);
+      DBUG_RETURN(1);             
+    }
+
+    /* Reserve place for null-marker bytes */
+    null_count= (stmt->param_count+7) /8;
+    if (my_realloc_str(net, null_count + 1))
+    {
+      set_stmt_errmsg(stmt, net);
+      DBUG_RETURN(1);
+    }
+    bzero((char*) net->write_pos, null_count);
+    net->write_pos+= null_count;
+    param_end= stmt->params + stmt->param_count;
+
+    /* In case if buffers (type) altered, indicate to server */
+    *(net->write_pos)++= (uchar) stmt->send_types_to_server;
+    if (stmt->send_types_to_server)
+    {
+      if (my_realloc_str(net, 2 * stmt->param_count))
+      {
+        set_stmt_errmsg(stmt, net);
+        DBUG_RETURN(1);
+      }
+      /*
+	Store types of parameters in first in first package
+	that is sent to the server.
+      */
+      for (param= stmt->params;	param < param_end ; param++)
+        store_param_type(&net->write_pos, param);
+    }
+
+    for (param= stmt->params; param < param_end; param++)
+    {
+      /* check if mysql_stmt_send_long_data() was used */
+      if (param->long_data_used)
+	param->long_data_used= 0;	/* Clear for next execute call */
+      else if (store_param(stmt, param))
+	DBUG_RETURN(1);
+    }
+    length= (ulong) (net->write_pos - net->buff);
+    /* TODO: Look into avoding the following memdup */
+    if (!(param_data= my_memdup(PSI_NOT_INSTRUMENTED, net->buff, length, MYF(0))))
+    {
+      set_stmt_error(stmt, CR_OUT_OF_MEMORY, unknown_sqlstate, NULL);
+      DBUG_RETURN(1);
+    }
+    result= execute(stmt, param_data, length);
+    stmt->send_types_to_server=0;
+    my_free(param_data);
+    DBUG_RETURN(result);
+  }
+  DBUG_RETURN((int) execute(stmt,0,0));
+}
+
+/*
+  Read one row from buffered result set.  Result set is created by prior
+  call to mysql_stmt_store_result().
+  SYNOPSIS
+    stmt_read_row_buffered()
+
+  RETURN VALUE
+    0             - success; *row is set to valid row pointer (row data
+                    is stored in result set buffer)
+    MYSQL_NO_DATA - end of result set. *row is set to NULL
+*/
+
+static int stmt_read_row_buffered(MYSQL_STMT *stmt, unsigned char **row)
+{
+  if (stmt->data_cursor)
+  {
+    *row= (uchar *) stmt->data_cursor->data;
+    stmt->data_cursor= stmt->data_cursor->next;
+    return 0;
+  }
+  *row= 0;
+  return MYSQL_NO_DATA;
+}
+
+/*
+  Read one row from network: unbuffered non-cursor fetch.
+  If last row was read, or error occurred, erase this statement
+  from record pointing to object unbuffered fetch is performed from.
+
+  SYNOPSIS
+    stmt_read_row_unbuffered()
+    stmt  statement handle
+    row   pointer to write pointer to row data;
+
+  RETURN VALUE
+    0           - success; *row contains valid address of a row;
+                  row data is stored in network buffer
+    1           - error; error code is written to
+                  stmt->last_{errno,error}; *row is not changed
+  MYSQL_NO_DATA - end of file was read from network;
+                  *row is set to NULL
+*/
+
+static int stmt_read_row_unbuffered(MYSQL_STMT *stmt, unsigned char **row)
+{
+  int rc= 1;
+  MYSQL *mysql= stmt->mysql;
+  /*
+    This function won't be called if stmt->field_count is zero
+    or execution wasn't done: this is ensured by mysql_stmt_execute.
+  */
+  if (!mysql)
+  {
+    set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate, NULL);
+    return 1;
+  }
+  if (mysql->status != MYSQL_STATUS_STATEMENT_GET_RESULT)
+  {
+    set_stmt_error(stmt, stmt->unbuffered_fetch_cancelled ?
+                   CR_FETCH_CANCELED : CR_COMMANDS_OUT_OF_SYNC,
+                   unknown_sqlstate, NULL);
+    goto error;
+  }
+  if ((*mysql->methods->unbuffered_fetch)(mysql, (char**) row))
+  {
+    set_stmt_errmsg(stmt, &mysql->net);
+    /*
+      If there was an error, there are no more pending rows:
+      reset statement status to not hang up in following
+      mysql_stmt_close (it will try to flush result set before
+      closing the statement).
+    */
+    mysql->status= MYSQL_STATUS_READY;
+    goto error;
+  }
+  if (!*row)
+  {
+    mysql->status= MYSQL_STATUS_READY;
+    rc= MYSQL_NO_DATA;
+    goto error;
+  }
+  return 0;
+error:
+  if (mysql->unbuffered_fetch_owner == &stmt->unbuffered_fetch_cancelled)
+    mysql->unbuffered_fetch_owner= 0;
+  return rc;
+}
+
+
+/*
+  Fetch statement row using server side cursor.
+
+  SYNOPSIS
+    stmt_read_row_from_cursor()
+
+  RETURN VALUE
+    0            success
+    1            error
+  MYSQL_NO_DATA  end of data
+*/
+
+static int
+stmt_read_row_from_cursor(MYSQL_STMT *stmt, unsigned char **row)
+{
+  if (stmt->data_cursor)
+    return stmt_read_row_buffered(stmt, row);
+  if (stmt->server_status & SERVER_STATUS_LAST_ROW_SENT)
+    stmt->server_status &= ~SERVER_STATUS_LAST_ROW_SENT;
+  else
+  {
+    MYSQL *mysql= stmt->mysql;
+    NET *net= &mysql->net;
+    MYSQL_DATA *result= &stmt->result;
+    uchar buff[4 /* statement id */ +
+               4 /* number of rows to fetch */];
+
+    free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));
+    result->data= NULL;
+    result->rows= 0;
+    /* Send row request to the server */
+    int4store(buff, stmt->stmt_id);
+    int4store(buff + 4, stmt->prefetch_rows); /* number of rows to fetch */
+    if ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH,
+                                            buff, sizeof(buff), (uchar*) 0, 0,
+                                            1, stmt))
+    {
+      /* 
+        Don't set stmt error if stmt->mysql is NULL, as the error in this case 
+        has already been set by mysql_prune_stmt_list(). 
+      */
+      if (stmt->mysql)
+        set_stmt_errmsg(stmt, net);
+      return 1;
+    }
+    if ((*mysql->methods->read_rows_from_cursor)(stmt))
+      return 1;
+    stmt->server_status= mysql->server_status;
+
+    stmt->data_cursor= result->data;
+    return stmt_read_row_buffered(stmt, row);
+  }
+  *row= 0;
+  return MYSQL_NO_DATA;
+}
+
+
+/*
+  Default read row function to not SIGSEGV in client in
+  case of wrong sequence of API calls.
+*/
+
+static int
+stmt_read_row_no_data(MYSQL_STMT *stmt  __attribute__((unused)),
+                      unsigned char **row  __attribute__((unused)))
+{
+  return MYSQL_NO_DATA;
+}
+
+static int
+stmt_read_row_no_result_set(MYSQL_STMT *stmt  __attribute__((unused)),
+                      unsigned char **row  __attribute__((unused)))
+{
+  set_stmt_error(stmt, CR_NO_RESULT_SET, unknown_sqlstate, NULL);
+  return 1;
+}
+
+
+/*
+  Get/set statement attributes
+
+  SYNOPSIS
+    mysql_stmt_attr_get()
+    mysql_stmt_attr_set()
+
+    attr_type  statement attribute
+    value      casted to const void * pointer to value.
+
+  RETURN VALUE
+    0 success
+   !0 wrong attribute type
+*/
+
+my_bool STDCALL mysql_stmt_attr_set(MYSQL_STMT *stmt,
+                                    enum enum_stmt_attr_type attr_type,
+                                    const void *value)
+{
+  switch (attr_type) {
+  case STMT_ATTR_UPDATE_MAX_LENGTH:
+    stmt->update_max_length= value ? *(const my_bool*) value : 0;
+    break;
+  case STMT_ATTR_CURSOR_TYPE:
+  {
+    ulong cursor_type;
+    cursor_type= value ? *(ulong*) value : 0UL;
+    if (cursor_type > (ulong) CURSOR_TYPE_READ_ONLY)
+      goto err_not_implemented;
+    stmt->flags= cursor_type;
+    break;
+  }
+  case STMT_ATTR_PREFETCH_ROWS:
+  {
+    ulong prefetch_rows= value ? *(ulong*) value : DEFAULT_PREFETCH_ROWS;
+    if (value == 0)
+      return TRUE;
+    stmt->prefetch_rows= prefetch_rows;
+    break;
+  }
+  default:
+    goto err_not_implemented;
+  }
+  return FALSE;
+err_not_implemented:
+  set_stmt_error(stmt, CR_NOT_IMPLEMENTED, unknown_sqlstate, NULL);
+  return TRUE;
+}
+
+
+my_bool STDCALL mysql_stmt_attr_get(MYSQL_STMT *stmt,
+                                    enum enum_stmt_attr_type attr_type,
+                                    void *value)
+{
+  switch (attr_type) {
+  case STMT_ATTR_UPDATE_MAX_LENGTH:
+    *(my_bool*) value= stmt->update_max_length;
+    break;
+  case STMT_ATTR_CURSOR_TYPE:
+    *(ulong*) value= stmt->flags;
+    break;
+  case STMT_ATTR_PREFETCH_ROWS:
+    *(ulong*) value= stmt->prefetch_rows;
+    break;
+  default:
+    return TRUE;
+  }
+  return FALSE;
+}
+
+
+/**
+  Update statement result set metadata from with the new field
+  information sent during statement execute.
+
+  @pre mysql->field_count is not zero
+
+  @retval TRUE   if error: out of memory or the new
+                 result set has a different number of columns
+  @retval FALSE  success
+*/
+
+static void reinit_result_set_metadata(MYSQL_STMT *stmt)
+{
+  /* Server has sent result set metadata */
+  if (stmt->field_count == 0)
+  {
+    /*
+      This is 'SHOW'/'EXPLAIN'-like query. Current implementation of
+      prepared statements can't send result set metadata for these queries
+      on prepare stage. Read it now.
+    */
+
+    stmt->field_count= stmt->mysql->field_count;
+
+    alloc_stmt_fields(stmt);
+  }
+  else
+  {
+    /*
+      Update result set metadata if it for some reason changed between
+      prepare and execute, i.e.:
+      - in case of 'SELECT ?' we don't know column type unless data was
+      supplied to mysql_stmt_execute, so updated column type is sent
+      now.
+      - if data dictionary changed between prepare and execute, for
+      example a table used in the query was altered.
+      Note, that now (4.1.3) we always send metadata in reply to
+      COM_STMT_EXECUTE (even if it is not necessary), so either this or
+      previous branch always works.
+      TODO: send metadata only when it's really necessary and add a warning
+      'Metadata changed' when it's sent twice.
+    */
+    update_stmt_fields(stmt);
+  }
+}
+
+
+static int has_cursor(MYSQL_STMT *stmt)
+{
+  return stmt->server_status & SERVER_STATUS_CURSOR_EXISTS &&
+         stmt->flags & CURSOR_TYPE_READ_ONLY;
+}
+
+
+static void prepare_to_fetch_result(MYSQL_STMT *stmt)
+{
+  if (has_cursor(stmt))
+  {
+    stmt->mysql->status= MYSQL_STATUS_READY;
+    stmt->read_row_func= stmt_read_row_from_cursor;
+  }
+  else if (stmt->flags & CURSOR_TYPE_READ_ONLY)
+  {
+    /*
+      This is a single-row result set, a result set with no rows, EXPLAIN,
+      SHOW VARIABLES, or some other command which either a) bypasses the
+      cursors framework in the server and writes rows directly to the
+      network or b) is more efficient if all (few) result set rows are
+      precached on client and server's resources are freed.
+    */
+    mysql_stmt_store_result(stmt);
+  }
+  else
+  {
+    stmt->mysql->unbuffered_fetch_owner= &stmt->unbuffered_fetch_cancelled;
+    stmt->unbuffered_fetch_cancelled= FALSE;
+    stmt->read_row_func= stmt_read_row_unbuffered;
+  }
+}
+
+
+/*
+  Send placeholders data to server (if there are placeholders)
+  and execute prepared statement.
+
+  SYNOPSIS
+    mysql_stmt_execute()
+    stmt  statement handle. The handle must be created
+          with mysql_stmt_init() and prepared with
+          mysql_stmt_prepare(). If there are placeholders
+          in the statement they must be bound to local
+          variables with mysql_stmt_bind_param().
+
+  DESCRIPTION
+    This function will automatically flush pending result
+    set (if there is one), send parameters data to the server
+    and read result of statement execution.
+    If previous result set was cached with mysql_stmt_store_result()
+    it will also be freed in the beginning of this call.
+    The server can return 3 types of responses to this command:
+    - error, can be retrieved with mysql_stmt_error()
+    - ok, no result set pending. In this case we just update
+      stmt->insert_id and stmt->affected_rows.
+    - the query returns a result set: there could be 0 .. N
+    rows in it. In this case the server can also send updated
+    result set metadata.
+
+    Next steps you may want to make:
+    - find out if there is result set with mysql_stmt_field_count().
+    If there is one:
+    - optionally, cache entire result set on client to unblock
+    connection with mysql_stmt_store_result()
+    - bind client variables to result set columns and start read rows
+    with mysql_stmt_fetch().
+    - reset statement with mysql_stmt_reset() or close it with
+    mysql_stmt_close()
+    Otherwise:
+    - find out last insert id and number of affected rows with
+    mysql_stmt_insert_id(), mysql_stmt_affected_rows()
+
+  RETURN
+    0   success
+    1   error, message can be retrieved with mysql_stmt_error().
+*/
+
+int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt)
+{
+  MYSQL *mysql= stmt->mysql;
+  DBUG_ENTER("mysql_stmt_execute");
+
+  if (!mysql)
+  {
+    /* Error is already set in mysql_detatch_stmt_list */
+    DBUG_RETURN(1);
+  }
+
+  if (reset_stmt_handle(stmt, RESET_STORE_RESULT | RESET_CLEAR_ERROR))
+    DBUG_RETURN(1);
+  /*
+    No need to check for stmt->state: if the statement wasn't
+    prepared we'll get 'unknown statement handler' error from server.
+  */
+  if (mysql->methods->stmt_execute(stmt))
+    DBUG_RETURN(1);
+  stmt->state= MYSQL_STMT_EXECUTE_DONE;
+  if (mysql->field_count)
+  {
+    reinit_result_set_metadata(stmt);
+    prepare_to_fetch_result(stmt);
+  }
+  DBUG_RETURN(MY_TEST(stmt->last_errno));
+}
+
+
+/*
+  Return total parameters count in the statement
+*/
+
+ulong STDCALL mysql_stmt_param_count(MYSQL_STMT * stmt)
+{
+  DBUG_ENTER("mysql_stmt_param_count");
+  DBUG_RETURN(stmt->param_count);
+}
+
+/*
+  Return total affected rows from the last statement
+*/
+
+my_ulonglong STDCALL mysql_stmt_affected_rows(MYSQL_STMT *stmt)
+{
+  return stmt->affected_rows;
+}
+
+
+/*
+  Returns the number of result columns for the most recent query
+  run on this statement.
+*/
+
+unsigned int STDCALL mysql_stmt_field_count(MYSQL_STMT *stmt)
+{
+  return stmt->field_count;
+}
+
+/*
+  Return last inserted id for auto_increment columns.
+
+  SYNOPSIS
+    mysql_stmt_insert_id()
+    stmt    statement handle
+
+  DESCRIPTION
+    Current implementation of this call has a caveat: stmt->insert_id is
+    unconditionally updated from mysql->insert_id in the end of each
+    mysql_stmt_execute(). This works OK if mysql->insert_id contains new
+    value (sent in reply to mysql_stmt_execute()), otherwise stmt->insert_id
+    value gets undefined, as it's updated from some arbitrary value saved in
+    connection structure during some other call.
+*/
+
+my_ulonglong STDCALL mysql_stmt_insert_id(MYSQL_STMT *stmt)
+{
+  return stmt->insert_id;
+}
+
+
+static my_bool int_is_null_true= 1;		/* Used for MYSQL_TYPE_NULL */
+static my_bool int_is_null_false= 0;
+
+
+/*
+  Set up input data buffers for a statement.
+
+  SYNOPSIS
+    mysql_stmt_bind_param()
+    stmt    statement handle
+            The statement must be prepared with mysql_stmt_prepare().
+    my_bind Array of mysql_stmt_param_count() bind parameters.
+            This function doesn't check that size of this argument
+            is >= mysql_stmt_field_count(): it's user's responsibility.
+
+  DESCRIPTION
+    Use this call after mysql_stmt_prepare() to bind user variables to
+    placeholders.
+    Each element of bind array stands for a placeholder. Placeholders
+    are counted from 0.  For example statement
+    'INSERT INTO t (a, b) VALUES (?, ?)'
+    contains two placeholders, and for such statement you should supply
+    bind array of two elements (MYSQL_BIND bind[2]).
+
+    By properly initializing bind array you can bind virtually any
+    C language type to statement's placeholders:
+    First, it's strongly recommended to always zero-initialize entire
+    bind structure before setting its members. This will both shorten
+    your application code and make it robust to future extensions of
+    MYSQL_BIND structure.
+    Then you need to assign typecode of your application buffer to
+    MYSQL_BIND::buffer_type. The following typecodes with their
+    correspondence to C language types are supported:
+    MYSQL_TYPE_TINY       for 8-bit integer variables. Normally it's
+                          'signed char' and 'unsigned char';
+    MYSQL_TYPE_SHORT      for 16-bit signed and unsigned variables. This
+                          is usually 'short' and 'unsigned short';
+    MYSQL_TYPE_LONG       for 32-bit signed and unsigned variables. It
+                          corresponds to 'int' and 'unsigned int' on
+                          vast majority of platforms. On IA-32 and some
+                          other 32-bit systems you can also use 'long'
+                          here;
+    MYSQL_TYPE_LONGLONG   64-bit signed or unsigned integer.  Stands for
+                          '[unsigned] long long' on most platforms;
+    MYSQL_TYPE_FLOAT      32-bit floating point type, 'float' on most
+                          systems;
+    MYSQL_TYPE_DOUBLE     64-bit floating point type, 'double' on most
+                          systems;
+    MYSQL_TYPE_TIME       broken-down time stored in MYSQL_TIME
+                          structure
+    MYSQL_TYPE_DATE       date stored in MYSQL_TIME structure
+    MYSQL_TYPE_DATETIME   datetime stored in MYSQL_TIME structure See
+                          more on how to use these types for sending
+                          dates and times below;
+    MYSQL_TYPE_STRING     character string, assumed to be in
+                          character-set-client. If character set of
+                          client is not equal to character set of
+                          column, value for this placeholder will be
+                          converted to destination character set before
+                          insert.
+    MYSQL_TYPE_BLOB       sequence of bytes. This sequence is assumed to
+                          be in binary character set (which is the same
+                          as no particular character set), and is never
+                          converted to any other character set. See also
+                          notes about supplying string/blob length
+                          below.
+    MYSQL_TYPE_NULL       special typecode for binding nulls.
+    These C/C++ types are not supported yet by the API: long double,
+    bool.
+
+    As you can see from the list above, it's responsibility of
+    application programmer to ensure that chosen typecode properly
+    corresponds to host language type. For example on all platforms
+    where we build MySQL packages (as of MySQL 4.1.4) int is a 32-bit
+    type. So for int you can always assume that proper typecode is
+    MYSQL_TYPE_LONG (however queer it sounds, the name is legacy of the
+    old MySQL API). In contrary sizeof(long) can be 4 or 8 8-bit bytes,
+    depending on platform.
+
+    TODO: provide client typedefs for each integer and floating point
+    typecode, i. e. int8, uint8, float32, etc.
+
+    Once typecode was set, it's necessary to assign MYSQL_BIND::buffer
+    to point to the buffer of given type. Finally, additional actions
+    may be taken for some types or use cases:
+
+    Binding integer types.
+      For integer types you might also need to set MYSQL_BIND::is_unsigned
+      member. Set it to TRUE when binding unsigned char, unsigned short,
+      unsigned int, unsigned long, unsigned long long.
+
+    Binding floating point types.
+      For floating point types you just need to set
+      MYSQL_BIND::buffer_type and MYSQL_BIND::buffer. The rest of the
+      members should be zero-initialized.
+
+    Binding NULLs.
+      You might have a column always NULL, never NULL, or sometimes
+      NULL.  For an always NULL column set MYSQL_BIND::buffer_type to
+      MYSQL_TYPE_NULL.  The rest of the members just need to be
+      zero-initialized.  For never NULL columns set
+      MYSQL_BIND::is_null to 0, or this has already been done if you
+      zero-initialized the entire structure.  If you set
+      MYSQL_TYPE::is_null to point to an application buffer of type
+      'my_bool', then this buffer will be checked on each execution:
+      this way you can set the buffer to TRUE, or any non-0 value for
+      NULLs, and to FALSE or 0 for not NULL data.
+
+    Binding text strings and sequences of bytes.
+      For strings, in addition to MYSQL_BIND::buffer_type and
+      MYSQL_BIND::buffer you need to set MYSQL_BIND::length or
+      MYSQL_BIND::buffer_length.  If 'length' is set, 'buffer_length'
+      is ignored. 'buffer_length' member should be used when size of
+      string doesn't change between executions. If you want to vary
+      buffer length for each value, set 'length' to point to an
+      application buffer of type 'unsigned long' and set this long to
+      length of the string before each mysql_stmt_execute().
+
+    Binding dates and times.
+      For binding dates and times prepared statements API provides
+      clients with MYSQL_TIME structure. A pointer to instance of this
+      structure should be assigned to MYSQL_BIND::buffer whenever
+      MYSQL_TYPE_TIME, MYSQL_TYPE_DATE, MYSQL_TYPE_DATETIME typecodes
+      are used.  When typecode is MYSQL_TYPE_TIME, only members
+      'hour', 'minute', 'second' and 'neg' (is time offset negative)
+      are used. These members only will be sent to the server.
+      MYSQL_TYPE_DATE implies use of 'year', 'month', 'day', 'neg'.
+      MYSQL_TYPE_DATETIME utilizes both parts of MYSQL_TIME structure.
+      You don't have to set MYSQL_TIME::time_type member: it's not
+      used when sending data to the server, typecode information is
+      enough.  'second_part' member can hold microsecond precision of
+      time value, but now it's only supported on protocol level: you
+      can't store microsecond in a column, or use in temporal
+      calculations. However, if you send a time value with microsecond
+      part for 'SELECT ?', statement, you'll get it back unchanged
+      from the server.
+
+    Data conversion.
+      If conversion from host language type to data representation,
+      corresponding to SQL type, is required it's done on the server.
+      Data truncation is possible when conversion is lossy. For
+      example, if you supply MYSQL_TYPE_DATETIME value out of valid
+      SQL type TIMESTAMP range, the same conversion will be applied as
+      if this value would have been sent as string in the old
+      protocol.  TODO: document how the server will behave in case of
+      truncation/data loss.
+
+    After variables were bound, you can repeatedly set/change their
+    values and mysql_stmt_execute() the statement.
+
+    See also: mysql_stmt_send_long_data() for sending long text/blob
+    data in pieces, examples in tests/mysql_client_test.c.
+    Next steps you might want to make:
+    - execute statement with mysql_stmt_execute(),
+    - reset statement using mysql_stmt_reset() or reprepare it with
+      another query using mysql_stmt_prepare()
+    - close statement with mysql_stmt_close().
+
+  IMPLEMENTATION
+    The function copies given bind array to internal storage of the
+    statement, and sets up typecode-specific handlers to perform
+    serialization of bound data. This means that although you don't need
+    to call this routine after each assignment to bind buffers, you
+    need to call it each time you change parameter typecodes, or other
+    members of MYSQL_BIND array.
+    This is a pure local call. Data types of client buffers are sent
+    along with buffers' data at first execution of the statement.
+
+  RETURN
+    0  success
+    1  error, can be retrieved with mysql_stmt_error.
+*/
+
+my_bool STDCALL mysql_stmt_bind_param(MYSQL_STMT *stmt, MYSQL_BIND *my_bind)
+{
+  uint count=0;
+  MYSQL_BIND *param, *end;
+  DBUG_ENTER("mysql_stmt_bind_param");
+
+  if (!stmt->param_count)
+  {
+    if ((int) stmt->state < (int) MYSQL_STMT_PREPARE_DONE)
+    {
+      set_stmt_error(stmt, CR_NO_PREPARE_STMT, unknown_sqlstate, NULL);
+      DBUG_RETURN(1);
+    }
+    DBUG_RETURN(0);
+  }
+
+  /* Allocated on prepare */
+  memcpy((char*) stmt->params, (char*) my_bind,
+	 sizeof(MYSQL_BIND) * stmt->param_count);
+
+  for (param= stmt->params, end= param+stmt->param_count;
+       param < end ;
+       param++)
+  {
+    param->param_number= count++;
+    param->long_data_used= 0;
+
+    /* If param->is_null is not set, then the value can never be NULL */
+    if (!param->is_null)
+      param->is_null= &int_is_null_false;
+
+    /* Setup data copy functions for the different supported types */
+    switch (param->buffer_type) {
+    case MYSQL_TYPE_NULL:
+      param->is_null= &int_is_null_true;
+      break;
+    case MYSQL_TYPE_TINY:
+      /* Force param->length as this is fixed for this type */
+      param->length= &param->buffer_length;
+      param->buffer_length= 1;
+      param->store_param_func= store_param_tinyint;
+      break;
+    case MYSQL_TYPE_SHORT:
+      param->length= &param->buffer_length;
+      param->buffer_length= 2;
+      param->store_param_func= store_param_short;
+      break;
+    case MYSQL_TYPE_LONG:
+      param->length= &param->buffer_length;
+      param->buffer_length= 4;
+      param->store_param_func= store_param_int32;
+      break;
+    case MYSQL_TYPE_LONGLONG:
+      param->length= &param->buffer_length;
+      param->buffer_length= 8;
+      param->store_param_func= store_param_int64;
+      break;
+    case MYSQL_TYPE_FLOAT:
+      param->length= &param->buffer_length;
+      param->buffer_length= 4;
+      param->store_param_func= store_param_float;
+      break;
+    case MYSQL_TYPE_DOUBLE:
+      param->length= &param->buffer_length;
+      param->buffer_length= 8;
+      param->store_param_func= store_param_double;
+      break;
+    case MYSQL_TYPE_TIME:
+      param->store_param_func= store_param_time;
+      param->buffer_length= MAX_TIME_REP_LENGTH;
+      break;
+    case MYSQL_TYPE_DATE:
+      param->store_param_func= store_param_date;
+      param->buffer_length= MAX_DATE_REP_LENGTH;
+      break;
+    case MYSQL_TYPE_DATETIME:
+    case MYSQL_TYPE_TIMESTAMP:
+      param->store_param_func= store_param_datetime;
+      param->buffer_length= MAX_DATETIME_REP_LENGTH;
+      break;
+    case MYSQL_TYPE_TINY_BLOB:
+    case MYSQL_TYPE_MEDIUM_BLOB:
+    case MYSQL_TYPE_LONG_BLOB:
+    case MYSQL_TYPE_BLOB:
+    case MYSQL_TYPE_VARCHAR:
+    case MYSQL_TYPE_VAR_STRING:
+    case MYSQL_TYPE_STRING:
+    case MYSQL_TYPE_DECIMAL:
+    case MYSQL_TYPE_NEWDECIMAL:
+      param->store_param_func= store_param_str;
+      /*
+        For variable length types user must set either length or
+        buffer_length.
+      */
+      break;
+    default:
+      strmov(stmt->sqlstate, unknown_sqlstate);
+      snprintf(stmt->last_error,
+        sizeof(stmt->last_error),
+	      ER(stmt->last_errno= CR_UNSUPPORTED_PARAM_TYPE),
+	      param->buffer_type, count);
+      DBUG_RETURN(1);
+    }
+    /*
+      If param->length is not given, change it to point to buffer_length.
+      This way we can always use *param->length to get the length of data
+    */
+    if (!param->length)
+      param->length= &param->buffer_length;
+  }
+  /* We have to send/resend type information to MySQL */
+  stmt->send_types_to_server= TRUE;
+  stmt->bind_param_done= TRUE;
+  DBUG_RETURN(0);
+}
+
+
+/********************************************************************
+ Long data implementation
+*********************************************************************/
+
+/*
+  Send long data in pieces to the server
+
+  SYNOPSIS
+    mysql_stmt_send_long_data()
+    stmt			Statement handler
+    param_number		Parameter number (0 - N-1)
+    data			Data to send to server
+    length			Length of data to send (may be 0)
+
+  DESCRIPTION
+    This call can be used repeatedly to send long data in pieces
+    for any string/binary placeholder. Data supplied for
+    a placeholder is saved at server side till execute, and then
+    used instead of value from MYSQL_BIND object. More precisely,
+    if long data for a parameter was supplied, MYSQL_BIND object
+    corresponding to this parameter is not sent to server. In the
+    end of execution long data states of placeholders are reset,
+    so next time values of such placeholders will be taken again
+    from MYSQL_BIND array.
+    The server does not reply to this call: if there was an error
+    in data handling (which now only can happen if server run out
+    of memory) it would be returned in reply to
+    mysql_stmt_execute().
+    You should choose type of long data carefully if you care
+    about character set conversions performed by server when the
+    statement is executed.  No conversion is performed at all for
+    MYSQL_TYPE_BLOB and other binary typecodes. For
+    MYSQL_TYPE_STRING and the rest of text placeholders data is
+    converted from client character set to character set of
+    connection. If these character sets are different, this
+    conversion may require additional memory at server, equal to
+    total size of supplied pieces.
+
+  RETURN VALUES
+    0	ok
+    1	error
+*/
+
+my_bool STDCALL
+mysql_stmt_send_long_data(MYSQL_STMT *stmt, uint param_number,
+		     const char *data, ulong length)
+{
+  MYSQL_BIND *param;
+  DBUG_ENTER("mysql_stmt_send_long_data");
+  DBUG_ASSERT(stmt != 0);
+  DBUG_PRINT("enter",("param no: %d  data: %p, length : %ld",
+		      param_number, data, length));
+
+  /*
+    We only need to check for stmt->param_count, if it's not null
+    prepare was done.
+  */
+  if (param_number >= stmt->param_count)
+  {
+    set_stmt_error(stmt, CR_INVALID_PARAMETER_NO, unknown_sqlstate, NULL);
+    DBUG_RETURN(1);
+  }
+
+  param= stmt->params+param_number;
+  if (!IS_LONGDATA(param->buffer_type))
+  {
+    /* Long data handling should be used only for string/binary types */
+    strmov(stmt->sqlstate, unknown_sqlstate);
+    snprintf(stmt->last_error,
+      sizeof(stmt->last_error),
+      ER(stmt->last_errno= CR_INVALID_BUFFER_USE),
+	    param->param_number);
+    DBUG_RETURN(1);
+  }
+
+  /*
+    Send long data packet if there is data or we're sending long data
+    for the first time.
+  */
+  if (length || param->long_data_used == 0)
+  {
+    MYSQL *mysql= stmt->mysql;
+    /* Packet header: stmt id (4 bytes), param no (2 bytes) */
+    uchar buff[MYSQL_LONG_DATA_HEADER];
+
+    int4store(buff, stmt->stmt_id);
+    int2store(buff + 4, param_number);
+    param->long_data_used= 1;
+
+    /*
+      Note that we don't get any ok packet from the server in this case
+      This is intentional to save bandwidth.
+    */
+    if ((*mysql->methods->advanced_command)(mysql, COM_STMT_SEND_LONG_DATA,
+                                            buff, sizeof(buff), (uchar*) data,
+                                            length, 1, stmt))
+    {
+      /* 
+        Don't set stmt error if stmt->mysql is NULL, as the error in this case 
+        has already been set by mysql_prune_stmt_list(). 
+      */
+      if (stmt->mysql)
+        set_stmt_errmsg(stmt, &mysql->net);
+      DBUG_RETURN(1);
+    }
+  }
+  DBUG_RETURN(0);
+}
+
+
+/********************************************************************
+ Fetch and conversion of result set rows (binary protocol).
+*********************************************************************/
+
+/*
+  Read date, (time, datetime) value from network buffer and store it
+  in MYSQL_TIME structure.
+
+  SYNOPSIS
+    read_binary_{date,time,datetime}()
+    tm    MYSQL_TIME structure to fill
+    pos   pointer to current position in network buffer.
+          These functions increase pos to point to the beginning of the
+          next column.
+
+  Auxiliary functions to read time (date, datetime) values from network
+  buffer and store in MYSQL_TIME structure. Jointly used by conversion
+  and no-conversion fetching.
+*/
+
+static void read_binary_time(MYSQL_TIME *tm, uchar **pos)
+{
+  /* net_field_length will set pos to the first byte of data */
+  ulong length= net_field_length(pos);
+
+  if (length)
+  {
+    uchar *to= *pos;
+    tm->neg=    to[0];
+
+    tm->day=    (uint) sint4korr(to+1);
+    tm->hour=   (uint) to[5];
+    tm->minute= (uint) to[6];
+    tm->second= (uint) to[7];
+    tm->second_part= (length > 8) ? (ulong) sint4korr(to+8) : 0;
+    tm->year= tm->month= 0;
+    if (tm->day)
+    {
+      /* Convert days to hours at once */
+      tm->hour+= tm->day*24;
+      tm->day= 0;
+    }
+    tm->time_type= MYSQL_TIMESTAMP_TIME;
+
+    *pos+= length;
+  }
+  else
+    set_zero_time(tm, MYSQL_TIMESTAMP_TIME);
+}
+
+static void read_binary_datetime(MYSQL_TIME *tm, uchar **pos)
+{
+  ulong length= net_field_length(pos);
+
+  if (length)
+  {
+    uchar *to= *pos;
+
+    tm->neg=    0;
+    tm->year=   (uint) sint2korr(to);
+    tm->month=  (uint) to[2];
+    tm->day=    (uint) to[3];
+
+    if (length > 4)
+    {
+      tm->hour=   (uint) to[4];
+      tm->minute= (uint) to[5];
+      tm->second= (uint) to[6];
+    }
+    else
+      tm->hour= tm->minute= tm->second= 0;
+    tm->second_part= (length > 7) ? (ulong) sint4korr(to+7) : 0;
+    tm->time_type= MYSQL_TIMESTAMP_DATETIME;
+
+    *pos+= length;
+  }
+  else
+    set_zero_time(tm, MYSQL_TIMESTAMP_DATETIME);
+}
+
+static void read_binary_date(MYSQL_TIME *tm, uchar **pos)
+{
+  ulong length= net_field_length(pos);
+
+  if (length)
+  {
+    uchar *to= *pos;
+    tm->year =  (uint) sint2korr(to);
+    tm->month=  (uint) to[2];
+    tm->day= (uint) to[3];
+
+    tm->hour= tm->minute= tm->second= 0;
+    tm->second_part= 0;
+    tm->neg= 0;
+    tm->time_type= MYSQL_TIMESTAMP_DATE;
+
+    *pos+= length;
+  }
+  else
+    set_zero_time(tm, MYSQL_TIMESTAMP_DATE);
+}
+
+
+/*
+  Convert string to supplied buffer of any type.
+
+  SYNOPSIS
+    fetch_string_with_conversion()
+    param   output buffer descriptor
+    value   column data
+    length  data length
+*/
+
+static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, size_t length)
+{
+  char *buffer= (char *)param->buffer;
+  int err= 0;
+  char *endptr= value + length;
+
+  /*
+    This function should support all target buffer types: the rest
+    of conversion functions can delegate conversion to it.
+  */
+  switch (param->buffer_type) {
+  case MYSQL_TYPE_NULL: /* do nothing */
+    break;
+  case MYSQL_TYPE_TINY:
+  {
+    longlong data= my_strtoll10(value, &endptr, &err);
+    *param->error= (IS_TRUNCATED(data, param->is_unsigned,
+                                 INT_MIN8, INT_MAX8, UINT_MAX8) || err > 0);
+    *buffer= (uchar) data;
+    break;
+  }
+  case MYSQL_TYPE_SHORT:
+  {
+    longlong data= my_strtoll10(value, &endptr, &err);
+    *param->error= (IS_TRUNCATED(data, param->is_unsigned,
+                                 INT_MIN16, INT_MAX16, UINT_MAX16) || err > 0);
+    shortstore(buffer, (short) data);
+    break;
+  }
+  case MYSQL_TYPE_LONG:
+  {
+    longlong data= my_strtoll10(value, &endptr, &err);
+    *param->error= (IS_TRUNCATED(data, param->is_unsigned,
+                                 INT_MIN32, INT_MAX32, UINT_MAX32) || err > 0);
+    longstore(buffer, (int32) data);
+    break;
+  }
+  case MYSQL_TYPE_LONGLONG:
+  {
+    longlong data= my_strtoll10(value, &endptr, &err);
+    *param->error= param->is_unsigned ? err != 0 :
+                                       (err > 0 || (err == 0 && data < 0));
+    longlongstore(buffer, data);
+    break;
+  }
+  case MYSQL_TYPE_FLOAT:
+  {
+    double data= my_ci_strntod(&my_charset_latin1, value, length, &endptr, &err);
+    float fdata= (float) data;
+    *param->error= (fdata != data) | MY_TEST(err);
+    floatstore(buffer, fdata);
+    break;
+  }
+  case MYSQL_TYPE_DOUBLE:
+  {
+    double data= my_ci_strntod(&my_charset_latin1, value, length, &endptr, &err);
+    *param->error= MY_TEST(err);
+    doublestore(buffer, data);
+    break;
+  }
+  case MYSQL_TYPE_TIME:
+  {
+    MYSQL_TIME *tm= (MYSQL_TIME *)buffer;
+    MYSQL_TIME_STATUS status;
+    str_to_datetime_or_date_or_time(value, length, tm, 0, &status,
+                                    TIME_MAX_HOUR, UINT_MAX32);
+    err= status.warnings;
+    *param->error= MY_TEST(err);
+    break;
+  }
+  case MYSQL_TYPE_DATE:
+  case MYSQL_TYPE_DATETIME:
+  case MYSQL_TYPE_TIMESTAMP:
+  {
+    MYSQL_TIME *tm= (MYSQL_TIME *)buffer;
+    MYSQL_TIME_STATUS status;
+    (void) str_to_datetime_or_date(value, length, tm, 0, &status);
+    err= status.warnings;
+    *param->error= MY_TEST(err) && (param->buffer_type == MYSQL_TYPE_DATE &&
+                                    tm->time_type != MYSQL_TIMESTAMP_DATE);
+    break;
+  }
+  case MYSQL_TYPE_TINY_BLOB:
+  case MYSQL_TYPE_MEDIUM_BLOB:
+  case MYSQL_TYPE_LONG_BLOB:
+  case MYSQL_TYPE_BLOB:
+  case MYSQL_TYPE_DECIMAL:
+  case MYSQL_TYPE_NEWDECIMAL:
+  default:
+  {
+    /*
+      Copy column data to the buffer taking into account offset,
+      data length and buffer length.
+    */
+    char *start= value + param->offset;
+    char *end= value + length;
+    ulong copy_length;
+    if (start < end)
+    {
+      copy_length= (ulong)(end - start);
+      /* We've got some data beyond offset: copy up to buffer_length bytes */
+      if (param->buffer_length)
+        memcpy(buffer, start, MY_MIN(copy_length, param->buffer_length));
+    }
+    else
+      copy_length= 0;
+    if (copy_length < param->buffer_length)
+      buffer[copy_length]= '\0';
+    *param->error= copy_length > param->buffer_length;
+    /*
+      param->length will always contain length of entire column;
+      number of copied bytes may be way different:
+    */
+    *param->length= (ulong)length;
+    break;
+  }
+  }
+}
+
+
+/*
+  Convert integer value to client buffer of any type.
+
+  SYNOPSIS
+    fetch_long_with_conversion()
+    param   output buffer descriptor
+    field   column metadata
+    value   column data
+*/
+
+static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
+                                       longlong value, my_bool is_unsigned)
+{
+  char *buffer= (char *)param->buffer;
+
+  switch (param->buffer_type) {
+  case MYSQL_TYPE_NULL: /* do nothing */
+    break;
+  case MYSQL_TYPE_TINY:
+    *param->error= IS_TRUNCATED(value, param->is_unsigned,
+                                INT_MIN8, INT_MAX8, UINT_MAX8);
+    *(uchar *)param->buffer= (uchar) value;
+    break;
+  case MYSQL_TYPE_SHORT:
+    *param->error= IS_TRUNCATED(value, param->is_unsigned,
+                                INT_MIN16, INT_MAX16, UINT_MAX16);
+    shortstore(buffer, (short) value);
+    break;
+  case MYSQL_TYPE_LONG:
+    *param->error= IS_TRUNCATED(value, param->is_unsigned,
+                                INT_MIN32, INT_MAX32, UINT_MAX32);
+    longstore(buffer, (int32) value);
+    break;
+  case MYSQL_TYPE_LONGLONG:
+    longlongstore(buffer, value);
+    *param->error= param->is_unsigned != is_unsigned && value < 0;
+    break;
+  case MYSQL_TYPE_FLOAT:
+  {
+    /*
+      We need to mark the local variable volatile to
+      workaround Intel FPU executive precision feature.
+      (See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=323 for details)
+    */
+    volatile float data;
+    if (is_unsigned)
+    {
+      data= (float) ulonglong2double(value);
+      *param->error= ((ulonglong) value) != ((ulonglong) data);
+    }
+    else
+    {
+      data= (float)value;
+      *param->error= value != ((longlong) data);
+    }
+    floatstore(buffer, data);
+    break;
+  }
+  case MYSQL_TYPE_DOUBLE:
+  {
+    volatile double data;
+    if (is_unsigned)
+    {
+      data= ulonglong2double(value);
+      *param->error= ((ulonglong) value) != ((ulonglong) data);
+    }
+    else
+    {
+      data= (double)value;
+      *param->error= value != ((longlong) data);
+    }
+    doublestore(buffer, data);
+    break;
+  }
+  case MYSQL_TYPE_TIME:
+  case MYSQL_TYPE_DATE:
+  case MYSQL_TYPE_TIMESTAMP:
+  case MYSQL_TYPE_DATETIME:
+  {
+    int error;
+    value= number_to_datetime_or_date(value, 0, (MYSQL_TIME *) buffer, 0, &error);
+    *param->error= MY_TEST(error);
+    break;
+  }
+  default:
+  {
+    uchar buff[22];                              /* Enough for longlong */
+    uchar *end= (uchar*) longlong10_to_str(value, (char*) buff,
+                                           is_unsigned ? 10: -10);
+    /* Resort to string conversion which supports all typecodes */
+    size_t length= end-buff;
+
+    if (field->flags & ZEROFILL_FLAG && length < field->length &&
+        field->length < 21)
+    {
+      bmove_upp(buff+field->length,buff+length, length);
+      bfill(buff, field->length - length,'0');
+      length= field->length;
+    }
+    fetch_string_with_conversion(param, (char*) buff, length);
+    break;
+  }
+  }
+}
+
+/*
+  Convert double/float column to supplied buffer of any type.
+
+  SYNOPSIS
+    fetch_float_with_conversion()
+    param   output buffer descriptor
+    field   column metadata
+    value   column data
+    type    either MY_GCVT_ARG_FLOAT or MY_GCVT_ARG_DOUBLE.
+            Affects the maximum number of significant digits
+            returned by my_gcvt().
+*/
+
+static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
+                                        double value, my_gcvt_arg_type type)
+{
+  char *buffer= (char *)param->buffer;
+  double val64 = (value < 0 ? -floor(-value) : floor(value));
+
+  switch (param->buffer_type) {
+  case MYSQL_TYPE_NULL: /* do nothing */
+    break;
+  case MYSQL_TYPE_TINY:
+    /*
+      We need to _store_ data in the buffer before the truncation check to
+      workaround Intel FPU executive precision feature.
+      (See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=323 for details)
+      Sic: AFAIU it does not guarantee to work.
+    */
+    if (param->is_unsigned)
+      *buffer= (uint8) value;
+    else
+      *buffer= (int8) value;
+    *param->error= val64 != (param->is_unsigned ? (double)((uint8) *buffer) :
+                                                  (double)((int8) *buffer));
+    break;
+  case MYSQL_TYPE_SHORT:
+    if (param->is_unsigned)
+    {
+      ushort data= (ushort) value;
+      shortstore(buffer, data);
+    }
+    else
+    {
+      short data= (short) value;
+      shortstore(buffer, data);
+    }
+    *param->error= val64 != (param->is_unsigned ? (double) (*(ushort*) buffer):
+                                                  (double) (*(short*) buffer));
+    break;
+  case MYSQL_TYPE_LONG:
+    if (param->is_unsigned)
+    {
+      uint32 data= (uint32) value;
+      longstore(buffer, data);
+    }
+    else
+    {
+      int32 data= (int32) value;
+      longstore(buffer, data);
+    }
+    *param->error= val64 != (param->is_unsigned ? (double) (*(uint32*) buffer):
+                                                  (double) (*(int32*) buffer));
+      break;
+  case MYSQL_TYPE_LONGLONG:
+    if (param->is_unsigned)
+    {
+      ulonglong data= (ulonglong) value;
+      longlongstore(buffer, data);
+    }
+    else
+    {
+      longlong data= (longlong) value;
+      longlongstore(buffer, data);
+    }
+    *param->error= val64 != (param->is_unsigned ?
+                             ulonglong2double(*(ulonglong*) buffer) :
+                             (double) (*(longlong*) buffer));
+    break;
+  case MYSQL_TYPE_FLOAT:
+  {
+    float data= (float) value;
+    floatstore(buffer, data);
+    *param->error= (*(float*) buffer) != value;
+    break;
+  }
+  case MYSQL_TYPE_DOUBLE:
+  {
+    doublestore(buffer, value);
+    break;
+  }
+  default:
+  {
+    /*
+      Resort to fetch_string_with_conversion: this should handle
+      floating point -> string conversion nicely, honor all typecodes
+      and param->offset possibly set in mysql_stmt_fetch_column
+    */
+    char buff[FLOATING_POINT_BUFFER];
+    size_t len;
+    if (field->decimals >= FLOATING_POINT_DECIMALS)
+      len= my_gcvt(value, type,
+                   (int) MY_MIN(sizeof(buff)-1, param->buffer_length),
+                   buff, NULL);
+    else
+      len= my_fcvt(value, (int) field->decimals, buff, NULL);
+
+    if (field->flags & ZEROFILL_FLAG && len < field->length &&
+        field->length < MAX_DOUBLE_STRING_REP_LENGTH - 1)
+    {
+      bmove_upp((uchar*) buff + field->length, (uchar*) buff + len,
+                len);
+      bfill((char*) buff, field->length - len, '0');
+      len= field->length;
+    }
+    fetch_string_with_conversion(param, buff, len);
+
+    break;
+  }
+  }
+}
+
+
+/*
+  Fetch time/date/datetime to supplied buffer of any type
+
+  SYNOPSIS
+    param   output buffer descriptor
+    time    column data
+*/
+
+static void fetch_datetime_with_conversion(MYSQL_BIND *param,
+                                           MYSQL_FIELD *field,
+                                           MYSQL_TIME *my_time)
+{
+  switch (param->buffer_type) {
+  case MYSQL_TYPE_NULL: /* do nothing */
+    break;
+  case MYSQL_TYPE_DATE:
+    *(MYSQL_TIME *)(param->buffer)= *my_time;
+    *param->error= my_time->time_type != MYSQL_TIMESTAMP_DATE;
+    break;
+  case MYSQL_TYPE_TIME:
+    *(MYSQL_TIME *)(param->buffer)= *my_time;
+    *param->error= my_time->time_type != MYSQL_TIMESTAMP_TIME;
+    break;
+  case MYSQL_TYPE_DATETIME:
+  case MYSQL_TYPE_TIMESTAMP:
+    *(MYSQL_TIME *)(param->buffer)= *my_time;
+    /* No error: time and date are compatible with datetime */
+    break;
+  case MYSQL_TYPE_YEAR:
+    shortstore(param->buffer, my_time->year);
+    *param->error= 1;
+    break;
+  case MYSQL_TYPE_FLOAT:
+  case MYSQL_TYPE_DOUBLE:
+  {
+    ulonglong value= TIME_to_ulonglong(my_time);
+    fetch_float_with_conversion(param, field,
+                                ulonglong2double(value), MY_GCVT_ARG_DOUBLE);
+    break;
+  }
+  case MYSQL_TYPE_TINY:
+  case MYSQL_TYPE_SHORT:
+  case MYSQL_TYPE_INT24:
+  case MYSQL_TYPE_LONG:
+  case MYSQL_TYPE_LONGLONG:
+  {
+    longlong value= (longlong) TIME_to_ulonglong(my_time);
+    fetch_long_with_conversion(param, field, value, TRUE);
+    break;
+  }
+  default:
+  {
+    /*
+      Convert time value  to string and delegate the rest to
+      fetch_string_with_conversion:
+    */
+    char buff[MAX_DATE_STRING_REP_LENGTH];
+    uint length= my_TIME_to_str(my_time, buff, field->decimals);
+    /* Resort to string conversion */
+    fetch_string_with_conversion(param, (char *)buff, length);
+    break;
+  }
+  }
+}
+
+
+/*
+  Fetch and convert result set column to output buffer.
+
+  SYNOPSIS
+    fetch_result_with_conversion()
+    param   output buffer descriptor
+    field   column metadata
+    row     points to a column of result set tuple in binary format
+
+  DESCRIPTION
+    This is a fallback implementation of column fetch used
+    if column and output buffer types do not match.
+    Increases tuple pointer to point at the next column within the
+    tuple.
+*/
+
+static void fetch_result_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
+                                         uchar **row)
+{
+  enum enum_field_types field_type= field->type;
+  uint field_is_unsigned= field->flags & UNSIGNED_FLAG;
+
+  switch (field_type) {
+  case MYSQL_TYPE_TINY:
+  {
+    uchar value= **row;
+    /* sic: we need to cast to 'signed char' as 'char' may be unsigned */
+    longlong data= field_is_unsigned ? (longlong) value :
+                                       (longlong) (signed char) value;
+    fetch_long_with_conversion(param, field, data, 0);
+    *row+= 1;
+    break;
+  }
+  case MYSQL_TYPE_SHORT:
+  case MYSQL_TYPE_YEAR:
+  {
+    short value= sint2korr(*row);
+    longlong data= field_is_unsigned ? (longlong) (unsigned short) value :
+                                       (longlong) value;
+    fetch_long_with_conversion(param, field, data, 0);
+    *row+= 2;
+    break;
+  }
+  case MYSQL_TYPE_INT24: /* mediumint is sent as 4 bytes int */
+  case MYSQL_TYPE_LONG:
+  {
+    int32 value= sint4korr(*row);
+    longlong data= field_is_unsigned ? (longlong) (uint32) value :
+                                       (longlong) value;
+    fetch_long_with_conversion(param, field, data, 0);
+    *row+= 4;
+    break;
+  }
+  case MYSQL_TYPE_LONGLONG:
+  {
+    longlong value= (longlong)sint8korr(*row);
+    fetch_long_with_conversion(param, field, value,
+                               field->flags & UNSIGNED_FLAG);
+    *row+= 8;
+    break;
+  }
+  case MYSQL_TYPE_FLOAT:
+  {
+    float value;
+    float4get(value,*row);
+    fetch_float_with_conversion(param, field, value, MY_GCVT_ARG_FLOAT);
+    *row+= 4;
+    break;
+  }
+  case MYSQL_TYPE_DOUBLE:
+  {
+    double value;
+    float8get(value,*row);
+    fetch_float_with_conversion(param, field, value, MY_GCVT_ARG_DOUBLE);
+    *row+= 8;
+    break;
+  }
+  case MYSQL_TYPE_DATE:
+  {
+    MYSQL_TIME tm;
+
+    read_binary_date(&tm, row);
+    fetch_datetime_with_conversion(param, field, &tm);
+    break;
+  }
+  case MYSQL_TYPE_TIME:
+  {
+    MYSQL_TIME tm;
+
+    read_binary_time(&tm, row);
+    fetch_datetime_with_conversion(param, field, &tm);
+    break;
+  }
+  case MYSQL_TYPE_DATETIME:
+  case MYSQL_TYPE_TIMESTAMP:
+  {
+    MYSQL_TIME tm;
+
+    read_binary_datetime(&tm, row);
+    fetch_datetime_with_conversion(param, field, &tm);
+    break;
+  }
+  default:
+  {
+    ulong length= net_field_length(row);
+    fetch_string_with_conversion(param, (char*) *row, length);
+    *row+= length;
+    break;
+  }
+  }
+}
+
+
+/*
+  Functions to fetch data to application buffers without conversion.
+
+  All functions have the following characteristics:
+
+  SYNOPSIS
+    fetch_result_xxx()
+    param   MySQL bind param
+    pos     Row value
+
+  DESCRIPTION
+    These are no-conversion functions, used in binary protocol to store
+    rows in application buffers. A function used only if type of binary data
+    is compatible with type of application buffer.
+
+  RETURN
+    none
+*/
+
+static void fetch_result_tinyint(MYSQL_BIND *param, MYSQL_FIELD *field,
+                                 uchar **row)
+{
+  my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
+  uchar data= **row;
+  *(uchar *)param->buffer= data;
+  *param->error= param->is_unsigned != field_is_unsigned && data > INT_MAX8;
+  (*row)++;
+}
+
+static void fetch_result_short(MYSQL_BIND *param, MYSQL_FIELD *field,
+                               uchar **row)
+{
+  my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
+  ushort data= (ushort) sint2korr(*row);
+  shortstore(param->buffer, data);
+  *param->error= param->is_unsigned != field_is_unsigned && data > INT_MAX16;
+  *row+= 2;
+}
+
+static void fetch_result_int32(MYSQL_BIND *param,
+                               MYSQL_FIELD *field __attribute__((unused)),
+                               uchar **row)
+{
+  my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
+  uint32 data= (uint32) sint4korr(*row);
+  longstore(param->buffer, data);
+  *param->error= param->is_unsigned != field_is_unsigned && data > INT_MAX32;
+  *row+= 4;
+}
+
+static void fetch_result_int64(MYSQL_BIND *param,
+                               MYSQL_FIELD *field __attribute__((unused)),
+                               uchar **row)
+{
+  my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
+  ulonglong data= (ulonglong) sint8korr(*row);
+  *param->error= param->is_unsigned != field_is_unsigned && data > LONGLONG_MAX;
+  longlongstore(param->buffer, data);
+  *row+= 8;
+}
+
+static void fetch_result_float(MYSQL_BIND *param,
+                               MYSQL_FIELD *field __attribute__((unused)),
+                               uchar **row)
+{
+  float value;
+  float4get(value,*row);
+  floatstore(param->buffer, value);
+  *row+= 4;
+}
+
+static void fetch_result_double(MYSQL_BIND *param,
+                                MYSQL_FIELD *field __attribute__((unused)),
+                                uchar **row)
+{
+  double value;
+  float8get(value,*row);
+  doublestore(param->buffer, value);
+  *row+= 8;
+}
+
+static void fetch_result_time(MYSQL_BIND *param,
+                              MYSQL_FIELD *field __attribute__((unused)),
+                              uchar **row)
+{
+  MYSQL_TIME *tm= (MYSQL_TIME *)param->buffer;
+  read_binary_time(tm, row);
+}
+
+static void fetch_result_date(MYSQL_BIND *param,
+                              MYSQL_FIELD *field __attribute__((unused)),
+                              uchar **row)
+{
+  MYSQL_TIME *tm= (MYSQL_TIME *)param->buffer;
+  read_binary_date(tm, row);
+}
+
+static void fetch_result_datetime(MYSQL_BIND *param,
+                                  MYSQL_FIELD *field __attribute__((unused)),
+                                  uchar **row)
+{
+  MYSQL_TIME *tm= (MYSQL_TIME *)param->buffer;
+  read_binary_datetime(tm, row);
+}
+
+static void fetch_result_bin(MYSQL_BIND *param,
+                             MYSQL_FIELD *field __attribute__((unused)),
+                             uchar **row)
+{
+  ulong length= net_field_length(row);
+  ulong copy_length= MY_MIN(length, param->buffer_length);
+  memcpy(param->buffer, (char *)*row, copy_length);
+  *param->length= length;
+  *param->error= copy_length < length;
+  *row+= length;
+}
+
+static void fetch_result_str(MYSQL_BIND *param,
+                             MYSQL_FIELD *field __attribute__((unused)),
+                             uchar **row)
+{
+  ulong length= net_field_length(row);
+  ulong copy_length= MY_MIN(length, param->buffer_length);
+  memcpy(param->buffer, (char *)*row, copy_length);
+  /* Add an end null if there is room in the buffer */
+  if (copy_length != param->buffer_length)
+    ((uchar *)param->buffer)[copy_length]= '\0';
+  *param->length= length;			/* return total length */
+  *param->error= copy_length < length;
+  *row+= length;
+}
+
+
+/*
+  functions to calculate max lengths for strings during
+  mysql_stmt_store_result()
+*/
+
+static void skip_result_fixed(MYSQL_BIND *param,
+			      MYSQL_FIELD *field __attribute__((unused)),
+			      uchar **row)
+
+{
+  (*row)+= param->pack_length;
+}
+
+
+static void skip_result_with_length(MYSQL_BIND *param __attribute__((unused)),
+				    MYSQL_FIELD *field __attribute__((unused)),
+				    uchar **row)
+
+{
+  ulong length= net_field_length(row);
+  (*row)+= length;
+}
+
+
+static void skip_result_string(MYSQL_BIND *param __attribute__((unused)),
+			       MYSQL_FIELD *field,
+			       uchar **row)
+
+{
+  ulong length= net_field_length(row);
+  (*row)+= length;
+  if (field->max_length < length)
+    field->max_length= length;
+}
+
+
+/*
+  Check that two field types are binary compatible i. e.
+  have equal representation in the binary protocol and
+  require client-side buffers of the same type.
+
+  SYNOPSIS
+    is_binary_compatible()
+    type1   parameter type supplied by user
+    type2   field type, obtained from result set metadata
+
+  RETURN
+    TRUE or FALSE
+*/
+
+static my_bool is_binary_compatible(enum enum_field_types type1,
+                                    enum enum_field_types type2)
+{
+  static const enum enum_field_types
+    range1[]= { MYSQL_TYPE_SHORT, MYSQL_TYPE_YEAR, MYSQL_TYPE_NULL },
+    range2[]= { MYSQL_TYPE_INT24, MYSQL_TYPE_LONG, MYSQL_TYPE_NULL },
+    range3[]= { MYSQL_TYPE_DATETIME, MYSQL_TYPE_TIMESTAMP, MYSQL_TYPE_NULL },
+    range4[]= { MYSQL_TYPE_ENUM, MYSQL_TYPE_SET, MYSQL_TYPE_TINY_BLOB,
+                MYSQL_TYPE_MEDIUM_BLOB, MYSQL_TYPE_LONG_BLOB, MYSQL_TYPE_BLOB,
+                MYSQL_TYPE_VAR_STRING, MYSQL_TYPE_STRING, MYSQL_TYPE_GEOMETRY,
+                MYSQL_TYPE_DECIMAL, MYSQL_TYPE_NULL };
+  static const enum enum_field_types
+   *range_list[]= { range1, range2, range3, range4 },
+   **range_list_end= range_list + sizeof(range_list)/sizeof(*range_list);
+   const enum enum_field_types **range, *type;
+
+  if (type1 == type2)
+    return TRUE;
+  for (range= range_list; range != range_list_end; ++range)
+  {
+    /* check that both type1 and type2 are in the same range */
+    my_bool type1_found= FALSE, type2_found= FALSE;
+    for (type= *range; *type != MYSQL_TYPE_NULL; type++)
+    {
+      if (type1 == *type)
+	type1_found= TRUE;
+      if (type2 == *type)
+	type2_found= TRUE;
+    }
+    if (type1_found || type2_found)
+      return type1_found && type2_found;
+  }
+  return FALSE;
+}
+
+
+/*
+  Setup a fetch function for one column of a result set.
+
+  SYNOPSIS
+    setup_one_fetch_function()
+    param    output buffer descriptor
+    field    column descriptor
+
+  DESCRIPTION
+    When user binds result set buffers or when result set
+    metadata is changed, we need to setup fetch (and possibly
+    conversion) functions for all columns of the result set.
+    In addition to that here we set up skip_result function, used
+    to update result set metadata in case when
+    STMT_ATTR_UPDATE_MAX_LENGTH attribute is set.
+    Notice that while fetch_result is chosen depending on both
+    field->type and param->type, skip_result depends on field->type
+    only.
+
+  RETURN
+    TRUE   fetch function for this typecode was not found (typecode
+          is not supported by the client library)
+    FALSE  success
+*/
+
+static my_bool setup_one_fetch_function(MYSQL_BIND *param, MYSQL_FIELD *field)
+{
+  my_bool field_is_unsigned;
+  DBUG_ENTER("setup_one_fetch_function");
+
+  /* Setup data copy functions for the different supported types */
+  switch (param->buffer_type) {
+  case MYSQL_TYPE_NULL: /* for dummy binds */
+    /*
+      It's not binary compatible with anything the server can return:
+      no need to setup fetch_result, as it'll be reset anyway
+    */
+    *param->length= 0;
+    break;
+  case MYSQL_TYPE_TINY:
+    param->fetch_result= fetch_result_tinyint;
+    *param->length= 1;
+    break;
+  case MYSQL_TYPE_SHORT:
+  case MYSQL_TYPE_YEAR:
+    param->fetch_result= fetch_result_short;
+    *param->length= 2;
+    break;
+  case MYSQL_TYPE_INT24:
+  case MYSQL_TYPE_LONG:
+    param->fetch_result= fetch_result_int32;
+    *param->length= 4;
+    break;
+  case MYSQL_TYPE_LONGLONG:
+    param->fetch_result= fetch_result_int64;
+    *param->length= 8;
+    break;
+  case MYSQL_TYPE_FLOAT:
+    param->fetch_result= fetch_result_float;
+    *param->length= 4;
+    break;
+  case MYSQL_TYPE_DOUBLE:
+    param->fetch_result= fetch_result_double;
+    *param->length= 8;
+    break;
+  case MYSQL_TYPE_TIME:
+    param->fetch_result= fetch_result_time;
+    *param->length= sizeof(MYSQL_TIME);
+    break;
+  case MYSQL_TYPE_DATE:
+    param->fetch_result= fetch_result_date;
+    *param->length= sizeof(MYSQL_TIME);
+    break;
+  case MYSQL_TYPE_DATETIME:
+  case MYSQL_TYPE_TIMESTAMP:
+    param->fetch_result= fetch_result_datetime;
+    *param->length= sizeof(MYSQL_TIME);
+    break;
+  case MYSQL_TYPE_TINY_BLOB:
+  case MYSQL_TYPE_MEDIUM_BLOB:
+  case MYSQL_TYPE_LONG_BLOB:
+  case MYSQL_TYPE_BLOB:
+  case MYSQL_TYPE_BIT:
+    DBUG_ASSERT(param->buffer_length != 0);
+    param->fetch_result= fetch_result_bin;
+    break;
+  case MYSQL_TYPE_VAR_STRING:
+  case MYSQL_TYPE_STRING:
+  case MYSQL_TYPE_DECIMAL:
+  case MYSQL_TYPE_NEWDECIMAL:
+  case MYSQL_TYPE_NEWDATE:
+    DBUG_ASSERT(param->buffer_length != 0);
+    param->fetch_result= fetch_result_str;
+    break;
+  default:
+    DBUG_PRINT("error", ("Unknown param->buffer_type: %u",
+                         (uint) param->buffer_type));
+    DBUG_RETURN(TRUE);
+  }
+  if (! is_binary_compatible(param->buffer_type, field->type))
+    param->fetch_result= fetch_result_with_conversion;
+
+  /* Setup skip_result functions (to calculate max_length) */
+  param->skip_result= skip_result_fixed;
+  field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
+  switch (field->type) {
+  case MYSQL_TYPE_NULL: /* for dummy binds */
+    param->pack_length= 0;
+    field->max_length= 0;
+    break;
+  case MYSQL_TYPE_TINY:
+    param->pack_length= 1;
+    field->max_length= field_is_unsigned ? 3 : 4; /* '255' and '-127' */
+    break;
+  case MYSQL_TYPE_YEAR:
+  case MYSQL_TYPE_SHORT:
+    param->pack_length= 2;
+    field->max_length= field_is_unsigned ? 5 : 6; /* 65536 and '-32767' */
+    break;
+  case MYSQL_TYPE_INT24:
+    field->max_length=  8;  /* '16777216' or in '-8388607' */
+    param->pack_length= 4;
+    break;
+  case MYSQL_TYPE_LONG:
+    field->max_length= field_is_unsigned ? 10 : 11; /* '4294967295' and '-2147483647' */
+    param->pack_length= 4;
+    break;
+  case MYSQL_TYPE_LONGLONG:
+    field->max_length= 20; /* '18446744073709551616' or -9223372036854775808 */
+    param->pack_length= 8;
+    break;
+  case MYSQL_TYPE_FLOAT:
+    param->pack_length= 4;
+    field->max_length= MAX_DOUBLE_STRING_REP_LENGTH;
+    break;
+  case MYSQL_TYPE_DOUBLE:
+    param->pack_length= 8;
+    field->max_length= MAX_DOUBLE_STRING_REP_LENGTH;
+    break;
+  case MYSQL_TYPE_TIME:
+    field->max_length= 17;                    /* -819:23:48.123456 */
+    param->skip_result= skip_result_with_length;
+    break;
+  case MYSQL_TYPE_DATE:
+    field->max_length= 10;                    /* 2003-11-11 */
+    param->skip_result= skip_result_with_length;
+    break;
+  case MYSQL_TYPE_DATETIME:
+  case MYSQL_TYPE_TIMESTAMP:
+    param->skip_result= skip_result_with_length;
+    field->max_length= MAX_DATE_STRING_REP_LENGTH;
+    break;
+  case MYSQL_TYPE_DECIMAL:
+  case MYSQL_TYPE_NEWDECIMAL:
+  case MYSQL_TYPE_ENUM:
+  case MYSQL_TYPE_SET:
+  case MYSQL_TYPE_GEOMETRY:
+  case MYSQL_TYPE_TINY_BLOB:
+  case MYSQL_TYPE_MEDIUM_BLOB:
+  case MYSQL_TYPE_LONG_BLOB:
+  case MYSQL_TYPE_BLOB:
+  case MYSQL_TYPE_VAR_STRING:
+  case MYSQL_TYPE_STRING:
+  case MYSQL_TYPE_BIT:
+  case MYSQL_TYPE_NEWDATE:
+    param->skip_result= skip_result_string;
+    break;
+  default:
+    DBUG_PRINT("error", ("Unknown field->type: %u", (uint) field->type));
+    DBUG_RETURN(TRUE);
+  }
+  DBUG_RETURN(FALSE);
+}
+
+
+/*
+  Setup the bind buffers for resultset processing
+*/
+
+my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *my_bind)
+{
+  MYSQL_BIND *param, *end;
+  MYSQL_FIELD *field;
+  ulong       bind_count= stmt->field_count;
+  uint        param_count= 0;
+  DBUG_ENTER("mysql_stmt_bind_result");
+  DBUG_PRINT("enter",("field_count: %lu", bind_count));
+
+  if (!bind_count)
+  {
+    int errorcode= (int) stmt->state < (int) MYSQL_STMT_PREPARE_DONE ?
+                   CR_NO_PREPARE_STMT : CR_NO_STMT_METADATA;
+    set_stmt_error(stmt, errorcode, unknown_sqlstate, NULL);
+    DBUG_RETURN(1);
+  }
+
+  /*
+    We only need to check that stmt->field_count - if it is not null
+    stmt->bind was initialized in mysql_stmt_prepare
+    stmt->bind overlaps with bind if mysql_stmt_bind_param
+    is called from mysql_stmt_store_result.
+  */
+
+  if (stmt->bind != my_bind)
+    memcpy((char*) stmt->bind, (char*) my_bind,
+           sizeof(MYSQL_BIND) * bind_count);
+
+  for (param= stmt->bind, end= param + bind_count, field= stmt->fields ;
+       param < end ;
+       param++, field++)
+  {
+    DBUG_PRINT("info",("buffer_type: %u  field_type: %u",
+                       (uint) param->buffer_type, (uint) field->type));
+    /*
+      Set param->is_null to point to a dummy variable if it's not set.
+      This is to make the execute code easier
+    */
+    if (!param->is_null)
+      param->is_null= &param->is_null_value;
+
+    if (!param->length)
+      param->length= &param->length_value;
+
+    if (!param->error)
+      param->error= &param->error_value;
+
+    param->param_number= param_count++;
+    param->offset= 0;
+
+    if (setup_one_fetch_function(param, field))
+    {
+      strmov(stmt->sqlstate, unknown_sqlstate);
+      snprintf(stmt->last_error,
+              sizeof(stmt->last_error),
+              ER(stmt->last_errno= CR_UNSUPPORTED_PARAM_TYPE),
+              field->type, param_count);
+      DBUG_RETURN(1);
+    }
+  }
+  stmt->bind_result_done= BIND_RESULT_DONE;
+  if (stmt->mysql->options.report_data_truncation)
+    stmt->bind_result_done|= REPORT_DATA_TRUNCATION;
+
+  DBUG_RETURN(0);
+}
+
+
+/*
+  Fetch row data to bind buffers
+*/
+
+static int stmt_fetch_row(MYSQL_STMT *stmt, uchar *row)
+{
+  MYSQL_BIND  *my_bind, *end;
+  MYSQL_FIELD *field;
+  uchar *null_ptr, bit;
+  int truncation_count= 0;
+  /*
+    Precondition: if stmt->field_count is zero or row is NULL, read_row_*
+    function must return no data.
+  */
+  DBUG_ASSERT(stmt->field_count);
+  DBUG_ASSERT(row);
+
+  if (!stmt->bind_result_done)
+  {
+    /* If output parameters were not bound we should just return success */
+    return 0;
+  }
+
+  null_ptr= row;
+  row+= (stmt->field_count+9)/8;		/* skip null bits */
+  bit= 4;					/* first 2 bits are reserved */
+
+  /* Copy complete row to application buffers */
+  for (my_bind= stmt->bind, end= my_bind + stmt->field_count,
+         field= stmt->fields ;
+       my_bind < end ;
+       my_bind++, field++)
+  {
+    *my_bind->error= 0;
+    if (*null_ptr & bit)
+    {
+      /*
+        We should set both row_ptr and is_null to be able to see
+        nulls in mysql_stmt_fetch_column. This is because is_null may point
+        to user data which can be overwritten between mysql_stmt_fetch and
+        mysql_stmt_fetch_column, and in this case nullness of column will be
+        lost. See mysql_stmt_fetch_column for details.
+      */
+      my_bind->row_ptr= NULL;
+      *my_bind->is_null= 1;
+    }
+    else
+    {
+      *my_bind->is_null= 0;
+      my_bind->row_ptr= row;
+      (*my_bind->fetch_result)(my_bind, field, &row);
+      truncation_count+= *my_bind->error;
+    }
+    if (!(bit= (uchar) (bit << 1)))
+    {
+      bit= 1;					/* To next uchar */
+      null_ptr++;
+    }
+  }
+  if (truncation_count && (stmt->bind_result_done & REPORT_DATA_TRUNCATION))
+    return MYSQL_DATA_TRUNCATED;
+  return 0;
+}
+
+
+int cli_unbuffered_fetch(MYSQL *mysql, char **row)
+{
+  if (packet_error == cli_safe_read(mysql))
+    return 1;
+
+  *row= ((mysql->net.read_pos[0] == 254) ? NULL :
+	 (char*) (mysql->net.read_pos+1));
+  return 0;
+}
+
+
+/*
+  Fetch and return row data to bound buffers, if any
+*/
+
+int STDCALL mysql_stmt_fetch(MYSQL_STMT *stmt)
+{
+  int rc;
+  uchar *row;
+  DBUG_ENTER("mysql_stmt_fetch");
+
+  if ((rc= (*stmt->read_row_func)(stmt, &row)) ||
+      ((rc= stmt_fetch_row(stmt, row)) && rc != MYSQL_DATA_TRUNCATED))
+  {
+    stmt->state= MYSQL_STMT_PREPARE_DONE;       /* XXX: this is buggy */
+    stmt->read_row_func= (rc == MYSQL_NO_DATA) ? 
+      stmt_read_row_no_data : stmt_read_row_no_result_set;
+  }
+  else
+  {
+    /* This is to know in mysql_stmt_fetch_column that data was fetched */
+    stmt->state= MYSQL_STMT_FETCH_DONE;
+  }
+  DBUG_RETURN(rc);
+}
+
+
+/*
+  Fetch data for one specified column data
+
+  SYNOPSIS
+    mysql_stmt_fetch_column()
+    stmt		Prepared statement handler
+    my_bind		Where data should be placed. Should be filled in as
+			when calling mysql_stmt_bind_result()
+    column		Column to fetch (first column is 0)
+    ulong offset	Offset in result data (to fetch blob in pieces)
+			This is normally 0
+  RETURN
+    0	ok
+    1	error
+*/
+
+int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *my_bind,
+                                    uint column, ulong offset)
+{
+  MYSQL_BIND *param= stmt->bind+column;
+  DBUG_ENTER("mysql_stmt_fetch_column");
+
+  if ((int) stmt->state < (int) MYSQL_STMT_FETCH_DONE)
+  {
+    set_stmt_error(stmt, CR_NO_DATA, unknown_sqlstate, NULL);
+    DBUG_RETURN(1);
+  }
+  if (column >= stmt->field_count)
+  {
+    set_stmt_error(stmt, CR_INVALID_PARAMETER_NO, unknown_sqlstate, NULL);
+    DBUG_RETURN(1);
+  }
+
+  if (!my_bind->error)
+    my_bind->error= &my_bind->error_value;
+  *my_bind->error= 0;
+  if (param->row_ptr)
+  {
+    MYSQL_FIELD *field= stmt->fields+column;
+    uchar *row= param->row_ptr;
+    my_bind->offset= offset;
+    if (my_bind->is_null)
+      *my_bind->is_null= 0;
+    if (my_bind->length) /* Set the length if non char/binary types */
+      *my_bind->length= *param->length;
+    else
+      my_bind->length= &param->length_value;       /* Needed for fetch_result() */
+    fetch_result_with_conversion(my_bind, field, &row);
+  }
+  else
+  {
+    if (my_bind->is_null)
+      *my_bind->is_null= 1;
+  }
+  DBUG_RETURN(0);
+}
+
+
+/*
+  Read all rows of data from server  (binary format)
+*/
+
+int cli_read_binary_rows(MYSQL_STMT *stmt)
+{
+  ulong      pkt_len;
+  uchar      *cp;
+  MYSQL      *mysql= stmt->mysql;
+  MYSQL_DATA *result= &stmt->result;
+  MYSQL_ROWS *cur, **prev_ptr= &result->data;
+  NET        *net;
+
+  DBUG_ENTER("cli_read_binary_rows");
+
+  if (!mysql)
+  {
+    set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate, NULL);
+    DBUG_RETURN(1);
+  }
+
+  net = &mysql->net;
+
+  while ((pkt_len= cli_safe_read(mysql)) != packet_error)
+  {
+    cp= net->read_pos;
+    if (cp[0] != 254 || pkt_len >= 8)
+    {
+      if (!(cur= (MYSQL_ROWS*) alloc_root(&result->alloc,
+                                          sizeof(MYSQL_ROWS) + pkt_len - 1)))
+      {
+        set_stmt_error(stmt, CR_OUT_OF_MEMORY, unknown_sqlstate, NULL);
+        goto err;
+      }
+      cur->data= (MYSQL_ROW) (cur+1);
+      *prev_ptr= cur;
+      prev_ptr= &cur->next;
+      memcpy((char *) cur->data, (char *) cp+1, pkt_len-1);
+      cur->length= pkt_len;		/* To allow us to do sanity checks */
+      result->rows++;
+    }
+    else
+    {
+      /* end of data */
+      *prev_ptr= 0;
+      mysql->warning_count= uint2korr(cp+1);
+      mysql->server_status= uint2korr(cp+3);
+      DBUG_PRINT("info",("status: %u  warning_count: %u",
+                         mysql->server_status, mysql->warning_count));
+      DBUG_RETURN(0);
+    }
+  }
+  set_stmt_errmsg(stmt, net);
+
+err:
+  DBUG_RETURN(1);
+}
+
+
+/*
+  Update meta data for statement
+
+  SYNOPSIS
+    stmt_update_metadata()
+    stmt			Statement handler
+    row				Binary data
+
+  NOTES
+    Only updates MYSQL_FIELD->max_length for strings
+*/
+
+static void stmt_update_metadata(MYSQL_STMT *stmt, MYSQL_ROWS *data)
+{
+  MYSQL_BIND  *my_bind, *end;
+  MYSQL_FIELD *field;
+  uchar *null_ptr, bit;
+  uchar *row= (uchar*) data->data;
+#ifdef DBUG_ASSERT_EXISTS
+  uchar *row_end= row + data->length;
+#endif
+
+  null_ptr= row;
+  row+= (stmt->field_count+9)/8;		/* skip null bits */
+  bit= 4;					/* first 2 bits are reserved */
+
+  /* Go through all fields and calculate metadata */
+  for (my_bind= stmt->bind, end= my_bind + stmt->field_count, field= stmt->fields ;
+       my_bind < end ;
+       my_bind++, field++)
+  {
+    if (!(*null_ptr & bit))
+      (*my_bind->skip_result)(my_bind, field, &row);
+    DBUG_ASSERT(row <= row_end);
+    if (!(bit= (uchar) (bit << 1)))
+    {
+      bit= 1;					/* To next uchar */
+      null_ptr++;
+    }
+  }
+}
+
+
+/*
+  Store or buffer the binary results to stmt
+*/
+
+int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt)
+{
+  MYSQL *mysql= stmt->mysql;
+  MYSQL_DATA *result= &stmt->result;
+  DBUG_ENTER("mysql_stmt_store_result");
+
+  if (!mysql)
+  {
+    /* mysql can be reset in mysql_close called from mysql_reconnect */
+    set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate, NULL);
+    DBUG_RETURN(1);
+  }
+
+  if (!stmt->field_count)
+    DBUG_RETURN(0);
+
+  if ((int) stmt->state < (int) MYSQL_STMT_EXECUTE_DONE)
+  {
+    set_stmt_error(stmt, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate, NULL);
+    DBUG_RETURN(1);
+  }
+
+  if (stmt->last_errno)
+  {
+    /* An attempt to use an invalid statement handle. */
+    DBUG_RETURN(1);
+  }
+
+  if (mysql->status == MYSQL_STATUS_READY && has_cursor(stmt))
+  {
+    /*
+      Server side cursor exist, tell server to start sending the rows
+    */
+    NET *net= &mysql->net;
+    uchar buff[4 /* statement id */ +
+               4 /* number of rows to fetch */];
+
+    /* Send row request to the server */
+    int4store(buff, stmt->stmt_id);
+    int4store(buff + 4, (int)~0); /* number of rows to fetch */
+    if ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH, buff, sizeof(buff),
+                             (uchar*) 0, 0, 1, stmt))
+    {
+      /* 
+        Don't set stmt error if stmt->mysql is NULL, as the error in this case 
+        has already been set by mysql_prune_stmt_list(). 
+      */
+      if (stmt->mysql)
+        set_stmt_errmsg(stmt, net);
+      DBUG_RETURN(1);
+    }
+  }
+  else if (mysql->status != MYSQL_STATUS_STATEMENT_GET_RESULT)
+  {
+    set_stmt_error(stmt, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate, NULL);
+    DBUG_RETURN(1);
+  }
+
+  if (stmt->update_max_length && !stmt->bind_result_done)
+  {
+    /*
+      We must initialize the bind structure to be able to calculate
+      max_length
+    */
+    MYSQL_BIND  *my_bind, *end;
+    MYSQL_FIELD *field;
+    bzero((char*) stmt->bind, sizeof(*stmt->bind)* stmt->field_count);
+
+    for (my_bind= stmt->bind, end= my_bind + stmt->field_count,
+           field= stmt->fields;
+	 my_bind < end ;
+	 my_bind++, field++)
+    {
+      my_bind->buffer_type= MYSQL_TYPE_NULL;
+      my_bind->buffer_length=1;
+    }
+
+    if (mysql_stmt_bind_result(stmt, stmt->bind))
+      DBUG_RETURN(1);
+    stmt->bind_result_done= 0;			/* No normal bind done */
+  }
+
+  if ((*mysql->methods->read_binary_rows)(stmt))
+  {
+    free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));
+    result->data= NULL;
+    result->rows= 0;
+    mysql->status= MYSQL_STATUS_READY;
+    DBUG_RETURN(1);
+  }
+
+  /* Assert that if there was a cursor, all rows have been fetched */
+  DBUG_ASSERT(mysql->status != MYSQL_STATUS_READY ||
+              (mysql->server_status & SERVER_STATUS_LAST_ROW_SENT));
+
+  if (stmt->update_max_length)
+  {
+    MYSQL_ROWS *cur= result->data;
+    for(; cur; cur=cur->next)
+      stmt_update_metadata(stmt, cur);
+  }
+
+  stmt->data_cursor= result->data;
+  mysql->affected_rows= stmt->affected_rows= result->rows;
+  stmt->read_row_func= stmt_read_row_buffered;
+  mysql->unbuffered_fetch_owner= 0;             /* set in stmt_execute */
+  mysql->status= MYSQL_STATUS_READY;		/* server is ready */
+  DBUG_RETURN(0); /* Data buffered, must be fetched with mysql_stmt_fetch() */
+}
+
+
+/*
+  Seek to desired row in the statement result set
+*/
+
+MYSQL_ROW_OFFSET STDCALL
+mysql_stmt_row_seek(MYSQL_STMT *stmt, MYSQL_ROW_OFFSET row)
+{
+  MYSQL_ROW_OFFSET offset= stmt->data_cursor;
+  DBUG_ENTER("mysql_stmt_row_seek");
+
+  stmt->data_cursor= row;
+  DBUG_RETURN(offset);
+}
+
+
+/*
+  Return the current statement row cursor position
+*/
+
+MYSQL_ROW_OFFSET STDCALL
+mysql_stmt_row_tell(MYSQL_STMT *stmt)
+{
+  DBUG_ENTER("mysql_stmt_row_tell");
+
+  DBUG_RETURN(stmt->data_cursor);
+}
+
+
+/*
+  Move the stmt result set data cursor to specified row
+*/
+
+void STDCALL
+mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong row)
+{
+  MYSQL_ROWS *tmp= stmt->result.data;
+  DBUG_ENTER("mysql_stmt_data_seek");
+  DBUG_PRINT("enter",("row id to seek: %ld",(long) row));
+
+  for (; tmp && row; --row, tmp= tmp->next)
+    ;
+  stmt->data_cursor= tmp;
+  if (!row && tmp)
+  {
+       /*  Rewind the counter */
+    stmt->read_row_func= stmt_read_row_buffered;
+    stmt->state= MYSQL_STMT_EXECUTE_DONE;
+  }
+  DBUG_VOID_RETURN;
+}
+
+
+/*
+  Return total rows the current statement result set
+*/
+
+my_ulonglong STDCALL mysql_stmt_num_rows(MYSQL_STMT *stmt)
+{
+  DBUG_ENTER("mysql_stmt_num_rows");
+
+  DBUG_RETURN(stmt->result.rows);
+}
+
+
+/*
+  Free the client side memory buffers, reset long data state
+  on client if necessary, and reset the server side statement if
+  this has been requested.
+*/
+
+static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags)
+{
+  /* If statement hasn't been prepared there is nothing to reset */
+  if ((int) stmt->state > (int) MYSQL_STMT_INIT_DONE)
+  {
+    MYSQL *mysql= stmt->mysql;
+    MYSQL_DATA *result= &stmt->result;
+
+    /*
+      Reset stored result set if so was requested or it's a part
+      of cursor fetch.
+    */
+    if (flags & RESET_STORE_RESULT)
+    {
+      /* Result buffered */
+      free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));
+      result->data= NULL;
+      result->rows= 0;
+      stmt->data_cursor= NULL;
+    }
+    if (flags & RESET_LONG_DATA)
+    {
+      MYSQL_BIND *param= stmt->params, *param_end= param + stmt->param_count;
+      /* Clear long_data_used flags */
+      for (; param < param_end; param++)
+        param->long_data_used= 0;
+    }
+    stmt->read_row_func= stmt_read_row_no_result_set;
+    if (mysql)
+    {
+      if ((int) stmt->state > (int) MYSQL_STMT_PREPARE_DONE)
+      {
+        if (mysql->unbuffered_fetch_owner == &stmt->unbuffered_fetch_cancelled)
+          mysql->unbuffered_fetch_owner= 0;
+        if (stmt->field_count && mysql->status != MYSQL_STATUS_READY)
+        {
+          /* There is a result set and it belongs to this statement */
+          (*mysql->methods->flush_use_result)(mysql, FALSE);
+          if (mysql->unbuffered_fetch_owner)
+            *mysql->unbuffered_fetch_owner= TRUE;
+          mysql->status= MYSQL_STATUS_READY;
+        }
+        if (flags & RESET_ALL_BUFFERS)
+        {
+          /* mysql_stmt_next_result will flush all pending
+             result sets 
+          */
+          while (mysql_more_results(mysql) &&
+                 mysql_stmt_next_result(stmt) == 0);
+        }
+      }
+      if (flags & RESET_SERVER_SIDE)
+      {
+        /*
+          Reset the server side statement and close the server side
+          cursor if it exists.
+        */
+        uchar buff[MYSQL_STMT_HEADER]; /* packet header: 4 bytes for stmt id */
+        int4store(buff, stmt->stmt_id);
+        if ((*mysql->methods->advanced_command)(mysql, COM_STMT_RESET, buff,
+                                                sizeof(buff), 0, 0, 0, stmt))
+        {
+          set_stmt_errmsg(stmt, &mysql->net);
+          stmt->state= MYSQL_STMT_INIT_DONE;
+          return 1;
+        }
+      }
+    }
+    if (flags & RESET_CLEAR_ERROR)
+      stmt_clear_error(stmt);
+    stmt->state= MYSQL_STMT_PREPARE_DONE;
+  }
+  return 0;
+}
+
+my_bool STDCALL mysql_stmt_free_result(MYSQL_STMT *stmt)
+{
+  DBUG_ENTER("mysql_stmt_free_result");
+
+  /* Free the client side and close the server side cursor if there is one */
+  DBUG_RETURN(reset_stmt_handle(stmt, RESET_LONG_DATA | RESET_STORE_RESULT |
+                                RESET_CLEAR_ERROR));
+}
+
+/********************************************************************
+ statement error handling and close
+*********************************************************************/
+
+/*
+  Close the statement handle by freeing all alloced resources
+
+  SYNOPSIS
+    mysql_stmt_close()
+    stmt	       Statement handle
+
+  RETURN VALUES
+    0	ok
+    1	error
+*/
+
+my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt)
+{
+  MYSQL *mysql= stmt->mysql;
+  int rc= 0;
+  DBUG_ENTER("mysql_stmt_close");
+
+  free_root(&stmt->result.alloc, MYF(0));
+  free_root(&stmt->mem_root, MYF(0));
+  free_root(&stmt->extension->fields_mem_root, MYF(0));
+
+  if (mysql)
+  {
+    mysql->stmts= list_delete(mysql->stmts, &stmt->list);
+    /*
+     Clear NET error state: if the following commands come through
+     successfully, connection will still be usable for other commands.
+    */
+    net_clear_error(&mysql->net);
+
+    if ((int) stmt->state > (int) MYSQL_STMT_INIT_DONE)
+    {
+      uchar buff[MYSQL_STMT_HEADER];             /* 4 bytes - stmt id */
+
+      reset_stmt_handle(stmt, RESET_ALL_BUFFERS | RESET_CLEAR_ERROR);
+
+      int4store(buff, stmt->stmt_id);
+      if ((rc= stmt_command(mysql, COM_STMT_CLOSE, buff, 4, stmt)))
+      {
+        set_stmt_errmsg(stmt, &mysql->net);
+      }
+    }
+  }
+
+  my_free(stmt->extension);
+  my_free(stmt);
+
+  DBUG_RETURN(MY_TEST(rc));
+}
+
+/*
+  Reset the statement buffers in server
+*/
+
+my_bool STDCALL mysql_stmt_reset(MYSQL_STMT *stmt)
+{
+  DBUG_ENTER("mysql_stmt_reset");
+  DBUG_ASSERT(stmt != 0);
+  if (!stmt->mysql)
+  {
+    /* mysql can be reset in mysql_close called from mysql_reconnect */
+    set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate, NULL);
+    DBUG_RETURN(1);
+  }
+  /* Reset the client and server sides of the prepared statement */
+  DBUG_RETURN(reset_stmt_handle(stmt,
+                                RESET_SERVER_SIDE | RESET_LONG_DATA |
+                                RESET_ALL_BUFFERS | RESET_CLEAR_ERROR));
+}
+
+/*
+  Return statement error code
+*/
+
+uint STDCALL mysql_stmt_errno(MYSQL_STMT * stmt)
+{
+  DBUG_ENTER("mysql_stmt_errno");
+  DBUG_RETURN(stmt->last_errno);
+}
+
+const char *STDCALL mysql_stmt_sqlstate(MYSQL_STMT * stmt)
+{
+  DBUG_ENTER("mysql_stmt_sqlstate");
+  DBUG_RETURN(stmt->sqlstate);
+}
+
+/*
+  Return statement error message
+*/
+
+const char *STDCALL mysql_stmt_error(MYSQL_STMT * stmt)
+{
+  DBUG_ENTER("mysql_stmt_error");
+  DBUG_RETURN(stmt->last_error);
+}
+
+
+/********************************************************************
+ Transactional APIs
+*********************************************************************/
+
+/*
+  Commit the current transaction
+*/
+
+my_bool STDCALL mysql_commit(MYSQL * mysql)
+{
+  DBUG_ENTER("mysql_commit");
+  DBUG_RETURN((my_bool) mysql_real_query(mysql, "commit", 6));
+}
+
+/*
+  Rollback the current transaction
+*/
+
+my_bool STDCALL mysql_rollback(MYSQL * mysql)
+{
+  DBUG_ENTER("mysql_rollback");
+  DBUG_RETURN((my_bool) mysql_real_query(mysql, "rollback", 8));
+}
+
+
+/*
+  Set autocommit to either true or false
+*/
+
+my_bool STDCALL mysql_autocommit(MYSQL * mysql, my_bool auto_mode)
+{
+  DBUG_ENTER("mysql_autocommit");
+  DBUG_PRINT("enter", ("mode : %d", auto_mode));
+
+  DBUG_RETURN((my_bool) mysql_real_query(mysql, auto_mode ?
+                                         "set autocommit=1":"set autocommit=0",
+                                         16));
+}
+
+
+/********************************************************************
+ Multi query execution + SPs APIs
+*********************************************************************/
+
+/*
+  Returns true/false to indicate whether any more query results exist
+  to be read using mysql_next_result()
+*/
+
+my_bool STDCALL mysql_more_results(MYSQL *mysql)
+{
+  my_bool res;
+  DBUG_ENTER("mysql_more_results");
+
+  res= ((mysql->server_status & SERVER_MORE_RESULTS_EXISTS) ? 1: 0);
+  DBUG_PRINT("exit",("More results exists ? %d", res));
+  DBUG_RETURN(res);
+}
+
+
+/*
+  Reads and returns the next query results
+*/
+int STDCALL mysql_next_result(MYSQL *mysql)
+{
+  DBUG_ENTER("mysql_next_result");
+
+  if (mysql->status != MYSQL_STATUS_READY)
+  {
+    set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
+    DBUG_RETURN(1);
+  }
+
+  net_clear_error(&mysql->net);
+  mysql->affected_rows= ~(my_ulonglong) 0;
+
+  if (mysql->server_status & SERVER_MORE_RESULTS_EXISTS)
+    DBUG_RETURN((*mysql->methods->next_result)(mysql));
+
+  DBUG_RETURN(-1);				/* No more results */
+}
+
+int STDCALL mysql_stmt_next_result(MYSQL_STMT *stmt)
+{
+  MYSQL *mysql= stmt->mysql;
+  int rc;
+  DBUG_ENTER("mysql_stmt_next_result");
+
+  if (!mysql)
+    DBUG_RETURN(1);
+
+  if (stmt->last_errno)
+    DBUG_RETURN(stmt->last_errno);
+
+  if (mysql->server_status & SERVER_MORE_RESULTS_EXISTS)
+  {
+    if (reset_stmt_handle(stmt, RESET_STORE_RESULT))
+      DBUG_RETURN(1);
+  }
+
+  rc= mysql_next_result(mysql);
+
+  if (rc)
+  {
+    set_stmt_errmsg(stmt, &mysql->net);
+    DBUG_RETURN(rc);
+  }
+
+  if (mysql->status == MYSQL_STATUS_GET_RESULT)
+    mysql->status= MYSQL_STATUS_STATEMENT_GET_RESULT;
+
+  stmt->state= MYSQL_STMT_EXECUTE_DONE;
+  stmt->bind_result_done= FALSE;
+  stmt->field_count= mysql->field_count;
+
+  if (mysql->field_count)
+  {
+    alloc_stmt_fields(stmt);
+    prepare_to_fetch_result(stmt);
+  }
+  else
+  {
+    stmt->affected_rows= stmt->mysql->affected_rows;
+    stmt->server_status= stmt->mysql->server_status;
+    stmt->insert_id= stmt->mysql->insert_id;
+  }
+
+  DBUG_RETURN(0);
+}
+
+
+MYSQL_RES * STDCALL mysql_use_result(MYSQL *mysql)
+{
+  return (*mysql->methods->use_result)(mysql);
+}
+
+my_bool STDCALL mysql_read_query_result(MYSQL *mysql)
+{
+  return (*mysql->methods->read_query_result)(mysql);
+}
+
+/********************************************************************
+  mysql_net_ functions - low-level API to MySQL protocol
+*********************************************************************/
+ulong STDCALL mysql_net_read_packet(MYSQL *mysql)
+{
+  return cli_safe_read(mysql);
+}
+
+ulong STDCALL mysql_net_field_length(uchar **packet)
+{
+  return net_field_length(packet);
+}
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
new file mode 100644
index 00000000..14cca6e0
--- /dev/null
+++ b/libmysqld/libmysqld.c
@@ -0,0 +1,225 @@
+/* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+#include <my_global.h>
+#include <mysql.h>
+#include <mysqld_error.h>
+#include <my_pthread.h>
+#include <my_sys.h>
+#include <mysys_err.h>
+#include <m_string.h>
+#include <m_ctype.h>
+#include "errmsg.h"
+#include <violite.h>
+#include <sys/stat.h>
+#include <signal.h>
+#include <time.h>
+#include <sql_common.h>
+#include "embedded_priv.h"
+#include "client_settings.h"
+#ifdef	 HAVE_PWD_H
+#include <pwd.h>
+#endif
+#if !defined(_WIN32)
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#ifdef HAVE_SELECT_H
+#  include <select.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#endif
+#ifdef HAVE_SYS_UN_H
+#  include <sys/un.h>
+#endif
+#ifndef INADDR_NONE
+#define INADDR_NONE	-1
+#endif
+
+extern ulong net_buffer_length;
+extern ulong max_allowed_packet;
+
+#if defined(_WIN32)
+#define ERRNO WSAGetLastError()
+#define perror(A)
+#else
+#include <errno.h>
+#define ERRNO errno
+#define SOCKET_ERROR -1
+#define closesocket(A) close(A)
+#endif
+
+#ifdef HAVE_GETPWUID
+struct passwd *getpwuid(uid_t);
+char* getlogin(void);
+#endif
+
+
+int mysql_init_character_set(MYSQL *mysql);
+
+MYSQL * STDCALL
+mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
+		   const char *passwd, const char *db,
+		   uint port, const char *unix_socket,ulong client_flag)
+{
+  char name_buff[USERNAME_LENGTH];
+
+  DBUG_ENTER("mysql_real_connect");
+  DBUG_PRINT("enter",("host: %s  db: %s  user: %s (libmysqld)",
+		      host ? host : "(Null)",
+		      db ? db : "(Null)",
+		      user ? user : "(Null)"));
+
+  /* Test whether we're already connected */
+  if (mysql->server_version)
+  {
+    set_mysql_error(mysql, CR_ALREADY_CONNECTED, unknown_sqlstate);
+    DBUG_RETURN(0);
+  }
+
+  if (!host || !host[0])
+    host= mysql->options.host;
+
+  if (mysql->options.methods_to_use == MYSQL_OPT_USE_REMOTE_CONNECTION ||
+      (mysql->options.methods_to_use == MYSQL_OPT_GUESS_CONNECTION &&
+       host && *host && strcmp(host,LOCAL_HOST)))
+    DBUG_RETURN(cli_mysql_real_connect(mysql, host, user, 
+				       passwd, db, port, 
+				       unix_socket, client_flag));
+
+  mysql->methods= &embedded_methods;
+
+  /* use default options */
+  if (mysql->options.my_cnf_file || mysql->options.my_cnf_group)
+  {
+    mysql_read_default_options(&mysql->options,
+			       (mysql->options.my_cnf_file ?
+				mysql->options.my_cnf_file : "my"),
+			       mysql->options.my_cnf_group);
+    my_free(mysql->options.my_cnf_file);
+    my_free(mysql->options.my_cnf_group);
+    mysql->options.my_cnf_file=mysql->options.my_cnf_group=0;
+
+    if (mysql->options.protocol == UINT_MAX32)
+      goto error;
+  }
+
+  if (!db || !db[0])
+    db=mysql->options.db;
+
+  if (!user || !user[0])
+    user=mysql->options.user;
+
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
+  if (!passwd)
+  {
+    passwd=mysql->options.password;
+#if !defined(DONT_USE_MYSQL_PWD)
+    if (!passwd)
+      passwd=getenv("MYSQL_PWD");		/* get it from environment */
+#endif
+  }
+  mysql->passwd= passwd ? my_strdup(passwd,MYF(0)) : NULL;
+#endif /*!NO_EMBEDDED_ACCESS_CHECKS*/
+  if (!user || !user[0])
+  {
+    read_user_name(name_buff);
+    if (name_buff[0])
+      user= name_buff;
+  }
+
+  if (!user)
+    user= "";
+   /* 
+      We need to alloc some space for mysql->info but don't want to
+      put extra 'my_free's in mysql_close.
+      So we alloc it with the 'user' string to be freed at once
+   */
+  mysql->user= my_strdup(PSI_NOT_INSTRUMENTED, user, MYF(0));
+
+  port=0;
+  unix_socket=0;
+
+  client_flag|=mysql->options.client_flag;
+  /* Send client information for access check */
+  client_flag|=CLIENT_CAPABILITIES;
+  if (client_flag & CLIENT_MULTI_STATEMENTS)
+    client_flag|= CLIENT_MULTI_RESULTS;
+  /*
+    no compression in embedded as we don't send any data,
+    and no pluggable auth, as we cannot do a client-server dialog
+  */
+  client_flag&= ~(CLIENT_COMPRESS | CLIENT_PLUGIN_AUTH);
+  if (db)
+    client_flag|=CLIENT_CONNECT_WITH_DB;
+
+  mysql->info_buffer= my_malloc(PSI_NOT_INSTRUMENTED, MYSQL_ERRMSG_SIZE, MYF(0));
+  mysql->thd= create_embedded_thd(client_flag);
+
+  init_embedded_mysql(mysql, client_flag);
+
+  if (mysql_init_character_set(mysql))
+    goto error;
+
+  if (check_embedded_connection(mysql, db))
+    goto error;
+
+  mysql->server_status= SERVER_STATUS_AUTOCOMMIT;
+
+  if (mysql->options.init_commands)
+  {
+    DYNAMIC_ARRAY *init_commands= mysql->options.init_commands;
+    char **ptr= (char**)init_commands->buffer;
+    char **end= ptr + init_commands->elements;
+
+    for (; ptr<end; ptr++)
+    {
+      MYSQL_RES *res;
+      if (mysql_query(mysql,*ptr))
+	goto error;
+      if (mysql->fields)
+      {
+	if (!(res= (*mysql->methods->use_result)(mysql)))
+	  goto error;
+	mysql_free_result(res);
+      }
+    }
+  }
+
+  DBUG_PRINT("exit",("Mysql handler: %p", mysql));
+  DBUG_RETURN(mysql);
+
+error:
+  DBUG_PRINT("error",("message: %u (%s)",
+                      mysql->net.last_errno,
+                      mysql->net.last_error));
+  {
+    /* Free alloced memory */
+    my_bool free_me=mysql->free_me;
+    free_old_query(mysql); 
+    mysql->free_me=0;
+    mysql_close(mysql);
+    mysql->free_me=free_me;
+  }
+  DBUG_RETURN(0);
+}
+
+char *get_tty_password(const char *opt_message)
+{
+  return my_get_tty_password(opt_message);
+}
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
new file mode 100644
index 00000000..ebabfef2
--- /dev/null
+++ b/libmysqld/libmysqld.def
@@ -0,0 +1,106 @@
+LIBRARY		LIBMYSQLD
+VERSION		5.1
+EXPORTS
+	mysql_thread_end
+	mysql_thread_init
+	myodbc_remove_escape
+	mysql_affected_rows
+	mysql_autocommit
+	mysql_change_user
+	mysql_character_set_name
+	mysql_close
+	mysql_commit
+	mysql_data_seek
+	mysql_debug
+	mysql_dump_debug_info
+	mysql_eof
+	mysql_errno
+	mysql_error
+	mysql_escape_string
+	mysql_hex_string
+	mysql_fetch_field
+	mysql_fetch_field_direct
+	mysql_fetch_fields
+	mysql_fetch_lengths
+	mysql_fetch_row
+	mysql_field_count
+	mysql_field_seek
+	mysql_field_tell
+	mysql_free_result
+	mysql_get_character_set_info
+	mysql_get_client_info
+	mysql_get_host_info
+	mysql_get_proto_info
+	mysql_get_server_info
+	mysql_get_client_version
+	mysql_get_ssl_cipher
+	mysql_info
+	mysql_init
+	mysql_insert_id
+	mysql_kill
+	mysql_set_server_option
+	mysql_list_dbs
+	mysql_list_fields
+	mysql_list_processes
+	mysql_list_tables
+	mysql_more_results
+	mysql_next_result
+	mysql_num_fields
+	mysql_num_rows
+	mysql_options
+	mysql_ping
+	mysql_query
+	mysql_read_query_result
+	mysql_real_connect
+	mysql_real_escape_string
+	mysql_real_query
+	mysql_refresh
+	mysql_rollback
+	mysql_row_seek
+	mysql_row_tell
+	mysql_select_db
+	mysql_send_query
+	mysql_shutdown
+	mysql_ssl_set
+	mysql_stat
+	mysql_store_result
+	mysql_sqlstate
+	mysql_thread_id
+	mysql_thread_safe
+	mysql_use_result
+	mysql_warning_count
+	mysql_server_end
+	mysql_server_init
+	get_tty_password
+	mysql_get_server_version
+	mysql_set_character_set
+	mysql_sqlstate
+	mysql_get_parameters
+	mysql_stmt_bind_param
+	mysql_stmt_bind_result
+	mysql_stmt_execute
+	mysql_stmt_fetch
+	mysql_stmt_fetch_column
+	mysql_stmt_param_count
+	mysql_stmt_param_metadata
+	mysql_stmt_result_metadata
+	mysql_stmt_send_long_data
+	mysql_stmt_affected_rows
+	mysql_stmt_close
+	mysql_stmt_reset
+	mysql_stmt_data_seek
+	mysql_stmt_errno
+	mysql_stmt_error
+	mysql_stmt_free_result
+	mysql_stmt_num_rows
+	mysql_stmt_row_seek
+	mysql_stmt_row_tell
+	mysql_stmt_store_result
+	mysql_stmt_sqlstate
+	mysql_stmt_prepare
+	mysql_stmt_init
+	mysql_stmt_insert_id
+	mysql_stmt_attr_get
+	mysql_stmt_attr_set
+	mysql_stmt_field_count
+	mysql_get_server_name
diff --git a/libmysqld/libmysqld.rc b/libmysqld/libmysqld.rc
new file mode 100644
index 00000000..5b6142fa
--- /dev/null
+++ b/libmysqld/libmysqld.rc
@@ -0,0 +1,125 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 4,0,20,0
+ PRODUCTVERSION 4,0,20,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x9L
+#else
+ FILEFLAGS 0x8L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+#ifdef _DEBUG
+            VALUE "Comments", "Embedded Server\0"
+            VALUE "CompanyName", "MySQL AB\0"
+            VALUE "FileDescription", "Embedded Server\0"
+            VALUE "FileVersion", "4.0.20\0"
+            VALUE "InternalName", "Embedded Server\0"
+            VALUE "LegalCopyright", "Copyright © 2004\0"
+            VALUE "LegalTrademarks", "MySQL and MySQL AB\0"
+            VALUE "OriginalFilename", "libmysqld.dll debug\0"
+            VALUE "PrivateBuild", "libmysqld.dll debug \0"
+            VALUE "ProductName", "libmysqld.dll debug\0"
+            VALUE "ProductVersion", "4.0.20\0"
+            VALUE "SpecialBuild", "\0"
+#else
+            VALUE "Comments", "Embedded Server\0"
+            VALUE "CompanyName", "MySQL AB\0"
+            VALUE "FileDescription", "Embedded Server\0"
+            VALUE "FileVersion", "4.0.20\0"
+            VALUE "InternalName", "Embedded Server\0"
+            VALUE "LegalCopyright", "Copyright © 2004\0"
+            VALUE "LegalTrademarks", "MySQL and MySQL AB\0"
+            VALUE "OriginalFilename", "libmysqld.dll release\0"
+            VALUE "PrivateBuild", "libmysqld.dll release \0"
+            VALUE "ProductName", "libmysqld.dll release\0"
+            VALUE "ProductVersion", "4.0.20\0"
+            VALUE "SpecialBuild", "\0"
+#endif
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/libmysqld/resource.h b/libmysqld/resource.h
new file mode 100644
index 00000000..f770fe49
--- /dev/null
+++ b/libmysqld/resource.h
@@ -0,0 +1,15 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by libmysqld.rc
+//
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif