summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2022-01-30 13:56:22 +0100
committerSergei Golubchik <serg@mariadb.org>2022-01-30 13:56:22 +0100
commit9667ec1f53df5a7a439926d9e45819ab769326b6 (patch)
tree4ca0d7a7b424e2f507cdc8c66b9d3771466b80a3 /libmysqld
parent646e2f423ba26c43c2a49bf1b7b8b3a4ed82aa99 (diff)
downloadmariadb-git-9667ec1f53df5a7a439926d9e45819ab769326b6.tar.gz
fix query cache in embedded
this fixes main.partition_cache and main.cache_innodb in --embed followup for 430d60d1fc0 MDEV-24487
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/embedded_priv.h4
-rw-r--r--libmysqld/lib_sql.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h
index af80f5bc6a9..2262706217e 100644
--- a/libmysqld/embedded_priv.h
+++ b/libmysqld/embedded_priv.h
@@ -19,8 +19,8 @@
C_MODE_START
void lib_connection_phase(NET *net, int phase);
-void init_embedded_mysql(MYSQL *mysql, int client_flag);
-void *create_embedded_thd(int client_flag);
+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;
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index c6493773db0..d92265508b4 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -660,7 +660,7 @@ void end_embedded_server()
}
-void init_embedded_mysql(MYSQL *mysql, int client_flag)
+void init_embedded_mysql(MYSQL *mysql, ulong client_flag)
{
THD *thd = (THD *)mysql->thd;
thd->mysql= mysql;
@@ -680,7 +680,7 @@ void init_embedded_mysql(MYSQL *mysql, int client_flag)
create_new_thread(), and prepare_new_connection_state(). This should
be refactored to avoid code duplication.
*/
-void *create_embedded_thd(int client_flag)
+void *create_embedded_thd(ulong client_flag)
{
THD * thd= new THD(next_thread_id());