diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-03 17:01:31 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-03 17:01:31 +0100 |
| commit | f5c5f8e41ecd4d407022d3772ac43075c16824a5 (patch) | |
| tree | 8a46fbd9dfd51352800ea606ae52a53ceb239501 /libmysqld | |
| parent | 8d742fe4acb91652fcbeb36506d20ead4ff19e83 (diff) | |
| parent | cf63eecef44f189ce2d221612dee9dfc1885ba4e (diff) | |
| download | mariadb-git-f5c5f8e41ecd4d407022d3772ac43075c16824a5.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/embedded_priv.h | 4 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 8 |
2 files changed, 6 insertions, 6 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 a8f554326cd..b563d8ea2f4 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -663,7 +663,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; @@ -683,7 +683,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()); @@ -699,7 +699,7 @@ void *create_embedded_thd(int client_flag) thd->set_command(COM_SLEEP); thd->set_time(); thd->init_for_queries(); - thd->client_capabilities= client_flag; + thd->client_capabilities= client_flag | MARIADB_CLIENT_EXTENDED_METADATA; thd->real_id= pthread_self(); thd->db= null_clex_str; @@ -830,7 +830,7 @@ int check_embedded_connection(MYSQL *mysql, const char *db) /* acl_authenticate() takes the data from thd->net->read_pos */ thd->net.read_pos= (uchar*)buf; - if (acl_authenticate(thd, 0, end - buf)) + if (acl_authenticate(thd, (uint) (end - buf))) { my_free(thd->security_ctx->user); goto err; |