File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -83,7 +83,7 @@ mysql_check_config() {
8383# Fetch value from server config
8484# We use mysqld --verbose --help instead of my_print_defaults because the
8585# latter only show values present in config files, and not server defaults
86- docker_get_config () {
86+ mysql_get_config () {
8787 local conf=" $1 " ; shift
8888 " $@ " --verbose --help --log-bin-index=" $( mktemp -u) " 2> /dev/null \
8989 | awk ' $1 == "' " $conf " ' " && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }'
@@ -150,8 +150,8 @@ docker_init_database_dir() {
150150# Loads various settings that are used elsewhere in the script
151151docker_init_env () {
152152 # Get config
153- DATADIR=" $( docker_get_config ' datadir' " $@ " ) "
154- SOCKET=" $( docker_get_config ' socket' " $@ " ) "
153+ DATADIR=" $( mysql_get_config ' datadir' " $@ " ) "
154+ SOCKET=" $( mysql_get_config ' socket' " $@ " ) "
155155
156156 # We create a file to store the root password in so we don''t use it on the command line
157157 TMPDIR=" $( mktemp -d) "
You can’t perform that action at this time.
0 commit comments