Hi, Rucha! Looks almost perfect! a couple of comments about mysqld_multi.sh below
On Apr 01, Rucha Deodhar wrote: > revision-id: b530cc73ddb (mariadb-10.5.2-386-gb530cc73ddb) > parent(s): de407e7cb4d > author: Rucha Deodhar <[email protected]> > committer: Rucha Deodhar <[email protected]> > timestamp: 2021-03-23 01:42:03 +0530 > message: > > MDEV-22010: use executables MariaDB named in scripts > > As a part of this MDEV following changes were made: > 1) Mariadb named executables used instead of mysql named executables in > scripts > 2) renamed mysql-test-run and mysql-stress-test to mariadb-test-run and > mariadb-stress-test and created a symlink. > > diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh > index 0b33f61710e..191caf22454 100644 > --- a/scripts/mysqld_multi.sh > +++ b/scripts/mysqld_multi.sh > @@ -353,7 +353,7 @@ sub start_mysqlds() > $tmp.= " $options[$j]"; > } > } > - if ($opt_verbose && $com =~ m/\/(safe_mysqld|mysqld_safe)$/ && > !$info_sent) > + if ($opt_verbose && $com =~ m/\/(mariadb_safe|mariadbd-safe)$/ && > !$info_sent) this doesn't make much sense. there was never a mariadb_safe tool, was it? if there was not, then you don't need to search for it, just write m/\/mariadbd-safe$/ although I'd rather written m[/mariadbd-safe$] - if / is not used as a delimiter, there's no need to escape it in a regex. > { > print "WARNING: $1 is being used to start mysqld. In this case you "; here it should, probably, say "to start mariadbd" ? > print "may need to pass\n\"ledir=...\" under groups [mysqldN] to "; > @@ -667,14 +667,14 @@ sub example > # > # 2.PID-FILE > # > -# If you are using mysqld_safe to start mysqld, make sure that every > -# MariaDB server has a separate pid-file. In order to use mysqld_safe > +# If you are using mariadbd-safe to start mariadbd, make sure that every > +# MariaDB server has a separate pid-file. In order to use mariadbd-safe > # via $my_progname, you need to use two options: > # > -# mysqld=/path/to/mysqld_safe > +# mysqld=/path/to/mariadbd-safe > # ledir=/path/to/mysqld-binary/ and here /path/to/mariadbd-binary/ ? > # > -# ledir (library executable directory), is an option that only mysqld_safe > +# ledir (library executable directory), is an option that only > mariadbd-safe > # accepts, so you will get an error if you try to pass it to mysqld > directly. > # For this reason you might want to use the above options within [mysqld#] > # group directly. > @@ -741,9 +741,9 @@ language = @datadir@/mysql/english > user = unix_user1 > > [mysqld3] > -mysqld = /path/to/mysqld_safe > +mysqld = /path/to/mariadbd-safe > ledir = /path/to/mysqld-binary/ and here > -mysqladmin = /path/to/mysqladmin > +mysqladmin = /path/to/mariadb-admin > socket = /tmp/mysql.sock3 > port = 3308 > pid-file = @localstatedir@3/hostname.pid3 Regards, Sergei VP of MariaDB Server Engineering and [email protected] _______________________________________________ Mailing list: https://launchpad.net/~maria-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
