From b30b040b733ff2045ffcd7bdd44f608c7f4912b5 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 21 Sep 2022 11:10:05 +1000 Subject: MDEV-29582 deprecate mysql* names Eventually mysql symlinks will go away, as MariaDB and MySQL keep diverging and we do not want to make it impossible to install MariaDB and MySQL side-by-side when users want it. It also useful if people start using MariaDB tools with MariaDB. If the exe doesn't begine with "mariadb" or is a symlink, print a warning to use the resolved name. In my_readlink, add check on my_thread_var as its used by comp_err and other build utils that also use my_init. --- mysys/my_init.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'mysys/my_init.c') diff --git a/mysys/my_init.c b/mysys/my_init.c index 44488e5848a..9ca68e80c1d 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -170,7 +170,17 @@ my_bool my_init(void) my_progname_short= "unknown"; if (my_progname) + { + char link_name[FN_REFLEN]; my_progname_short= my_progname + dirname_length(my_progname); + /* + If its a link a different program that doesn't begin with mariadb + like mariadb-repair might link to mariadb-check. + */ + if (strncmp(my_progname_short, "mariadb", 7) + && my_readlink(link_name, my_progname, MYF(0)) == 0) + my_error(EE_NAME_DEPRECATED, MYF(MY_WME), my_progname, link_name); + } /* Initialize our mutex handling */ my_mutex_init(); -- cgit v1.2.1