-
Notifications
You must be signed in to change notification settings - Fork 251
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
remove a redundant duplicate of plugin_auth.h
- Loading branch information
Showing
3 changed files
with
1 addition
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
5c9eab5
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vuvova I tried building Maria 10.6.18 on FreeBSD (Ports) and received the following error:
Missing: include/mysql/mysql/plugin_auth_common.h
The file is currently in the pkg-plist: https://cgit.freebsd.org/ports/tree/databases/mariadb106-client/pkg-plist#n67
Then i found this commit, where the file has been removed.
plugin_auth_common.h
still exists here: https://github.com/MariaDB/server/blob/10.6/include/mysql/plugin_auth_common.h (same content). Could you maybe clear me up, how these files relate to eachother? Is it correct, that the 2nd file still exists?5c9eab5
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it's correct. Authentication plugins were added back in 2011 (?), there was no MariaDB Connector/C yet, there was libmysqlclient, all headers were in
include/
. Definitions for server authentication plugins were ininclude/mysql/plugin_auth.h
, definitions for client plugins were ininclude/mysql/client_plugin.h
. Definitions common to both server and client authentication plugins were ininclude/mysql/plugin_auth_common.h
Then MariaDB Connector/C was created. Now all client code is in C/C, client plugins are all there. When moving declarations in apparently
plugin_auth_common.h
was copied as is andplugin_auth.h
was modified to include client definitions. This madeplugin_auth_common.h
redundant, indeed, it is "common" with what? I've deleted it when I noticed that. But it is not redundant in the server repo.5c9eab5
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your Feedback @vuvova
Just that i get it correct: plugin_auth_common.h was removed from MariaDB Connector/C because it's already in plugin_auth.h. For the server part, plugin_auth_common.h is still required and is still in the repo here.
For the FreeBSD-Client-Port this would mean: We can remove
include/mysql/mysql/plugin_auth_common.h
(Line 67) from the pkg-plist asinclude/mysql/mysql/plugin_auth.h
(Line 66) is already present and the file isn't needed anymore.For the FreeBSD-Server-Port this would mean: We can keep
include/mysql/server/mysql/plugin_auth_common.h
(Line 106) from the server pkg-plist as it is, as its still the right path and still needed.Right? :-)
5c9eab5
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, this is correct. thanks for doing it!