database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

fix query cache in embedded

Browse Source 
this fixes main.partition_cache and main.cache_innodb in --embed

followup for 430d60d1fc MDEV-24487
This commit is contained in:
Sergei Golubchik
2022-01-30 13:56:22 +01:00
parent 646e2f423b
commit 9667ec1f53
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmysqld/embedded_priv.h
View File

@@ -19,8 +19,8 @@
C_MODE_START C_MODE_START
void lib_connection_phase(NET *net, int phase); void lib_connection_phase(NET *net, int phase);
void init_embedded_mysql(MYSQL *mysql, int client_flag); void init_embedded_mysql(MYSQL *mysql, ulong client_flag);
void *create_embedded_thd(int client_flag); void *create_embedded_thd(ulong client_flag);
int check_embedded_connection(MYSQL *mysql, const char *db); int check_embedded_connection(MYSQL *mysql, const char *db);
void free_old_query(MYSQL *mysql); void free_old_query(MYSQL *mysql);
extern MYSQL_METHODS embedded_methods; extern MYSQL_METHODS embedded_methods;

4
libmysqld/lib_sql.cc
View File

@@ -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 *thd = (THD *)mysql->thd;
thd->mysql= mysql; 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 create_new_thread(), and prepare_new_connection_state(). This should
be refactored to avoid code duplication. 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()); THD * thd= new THD(next_thread_id());