summaryrefslogtreecommitdiffstats
path: root/libmysqld/lib_sql.cc
diff options
context:
space:
mode:
Diffstat (limited to 'libmysqld/lib_sql.cc')
-rw-r--r--libmysqld/lib_sql.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index d4edd242..0be844fb 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -459,6 +459,7 @@ static int emb_read_change_user_result(MYSQL *mysql)
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);
@@ -470,6 +471,7 @@ static void emb_on_close_free(MYSQL *mysql)
}
}
+
MYSQL_METHODS embedded_methods=
{
emb_read_query_result,
@@ -632,8 +634,6 @@ int init_embedded_server(int argc, char **argv, char **groups)
udf_init();
#endif
- (void) thr_setconcurrency(concurrency); // 10 by default
-
if (flush_time && flush_time != ~(ulong) 0L)
start_handle_manager();
@@ -705,8 +705,7 @@ void *create_embedded_thd(ulong client_flag)
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->mark_connection_idle();
thd->set_time();
thd->init_for_queries();
thd->client_capabilities= client_flag | MARIADB_CLIENT_EXTENDED_METADATA;
@@ -1446,4 +1445,3 @@ int vprint_msg_to_log(enum loglevel level __attribute__((unused)),
}
return 0;
}
-