Skip to content

MDEV-30610 Update RocksDB to the latest upstream version #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: 3.3
Choose a base branch
from
Open

MDEV-30610 Update RocksDB to the latest upstream version #221

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ea1e95
Add host name to session attributes
May 10, 2018
db5b9f2
Use _server_host per discussion.
twocode May 11, 2018
8c9118c
Merge branch '10.3-server' of https://github.com/MariaDB/mariadb-conn…
vaintroub Jun 28, 2018
279e6a5
Use FindGSSAPI.cmake from libgit2, rather than the one from KDE
vaintroub Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion libmariadb/mariadb_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,7 @@ ma_set_connect_attrs(MYSQL *mysql)
rc= mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_client_name") +
mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_client_version") +
mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_os") +
mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_host_name") +
#ifdef _WIN32
mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_DELETE, "_thread") +
#endif
Expand All @@ -1104,7 +1105,8 @@ ma_set_connect_attrs(MYSQL *mysql)

rc+= mysql_optionsv(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_client_name", "libmariadb")
+ mysql_optionsv(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_client_version", MARIADB_PACKAGE_VERSION)
+ mysql_optionsv(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_os", MARIADB_SYSTEM_TYPE);
+ mysql_optionsv(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_os", MARIADB_SYSTEM_TYPE)
+ mysql_optionsv(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_host_name", mysql->host);
Copy link
Collaborator

@9EOR9 9EOR9 Jun 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Connection attributes are client attributes. Why do you need to send the server name to the server (mysql->host) ?


#ifdef _WIN32
snprintf(buffer, 255, "%lu", (ulong) GetCurrentThreadId());
Expand Down