mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
707f42a6b9
A user could not override system-wide settings in their ~/.my.cnf,
because the DEFAULT_SYSCONFDIR was being searched last. Also, in
some configurations (especially when the --sysconfdir compile-time
option is set to /etc or /etc/mysql), the system-wide my.cnf file
was read multiple times, causing confusion and potential problems.
Rearrange default directories to conform to the manual and logic.
Move --sysconfdir=<path> (DEFAULT_SYSCONFDIR) from the last default
directory to the middle of the list. $HOME/.my.cnf should be last,
so the user is able to override the system-wide settings.
Change init_default_directories() to remove duplicates from the
list.
include/my_sys.h:
Add array_append_string_unique(), from mf_arr_appstr.c
libmysql/Makefile.shared:
Add new mf_arr_appstr.lo object
mysys/CMakeLists.txt:
Add new mf_arr_appstr.c source.
mysys/Makefile.am:
Add new mf_arr_appstr.c source.
mysys/default.c:
Change order in which defaults files are added to default_directories,
in order to conform to the manual (and to common sense). This fixes
a particularly bad problem on Unix, where ~/.my.cnf was read before
/usr/local/etc/my.cnf.
Also, don't add duplicate entries; move the existing entry to the
end of the list instead.
Here is a comparison of the order of defaults files, BEFORE and AFTER
this patch.
On Windows:
BEFORE: C:\, GetWindowsDirectory(), GetSystemWindowsDirectory(),
$MYSQL_HOME, defaults-extra-file, INSTALLDIR
AFTER: GetSystemWindowsDirectory(), GetWindowsDirectory(), C:\,
INSTALLDIR, $MYSQL_HOME, defaults-extra-file
GetSystemWindowsDirectory() is moved before GetWindowsDirectory() because
the former is shared by all Terminal Services users, while the latter is
private for each user.
On Netware (no change):
BEFORE: sys:/etc/, $MYSQL_HOME, defaults-extra-file
AFTER: sys:/etc, $MYSQL_HOME, defaults-extra-file
On OS/2:
BEFORE: $ETC, /etc, $MYSQL_HOME, defaults-extra-file
AFTER: /etc, $ETC, $MYSQL_HOME, defaults-extra-file
On everything else (general Unix):
BEFORE: /etc, $MYSQL_HOME, defaults-extra-file, ~/, --sysconfdir
AFTER: /etc/, --sysconfdir, $MYSQL_HOME, defaults-extra-file, ~/
The BEFORE code added --sysconfdir on all systems, but only the
Unix build system actually defined a value for it.
mysys/mf_arr_appstr.c:
BitKeeper file /home/tsmith/m/bk/build/50-b20748/mysys/mf_arr_appstr.c
127 lines
5 KiB
Makefile
127 lines
5 KiB
Makefile
# Copyright (C) 2000-2006 MySQL AB
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; version 2 of the License.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
MYSQLDATAdir = $(localstatedir)
|
|
MYSQLSHAREdir = $(pkgdatadir)
|
|
MYSQLBASEdir= $(prefix)
|
|
INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
|
|
-I$(top_srcdir)/include -I$(srcdir)
|
|
pkglib_LIBRARIES = libmysys.a
|
|
LDADD = libmysys.a ../dbug/libdbug.a \
|
|
../strings/libmystrings.a
|
|
noinst_HEADERS = mysys_priv.h my_static.h \
|
|
my_os2cond.c my_os2dirsrch.c my_os2dirsrch.h \
|
|
my_os2dlfcn.c my_os2file64.c my_os2mutex.c \
|
|
my_os2thread.c my_os2tls.c
|
|
libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
|
|
mf_path.c mf_loadpath.c my_file.c \
|
|
my_open.c my_create.c my_dup.c my_seek.c my_read.c \
|
|
my_pread.c my_write.c my_getpagesize.c \
|
|
mf_keycache.c mf_keycaches.c my_crc32.c \
|
|
mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \
|
|
mf_tempdir.c my_lock.c mf_brkhant.c my_alarm.c \
|
|
my_malloc.c my_realloc.c my_once.c mulalloc.c \
|
|
my_alloc.c safemalloc.c my_new.cc \
|
|
my_fopen.c my_fstream.c my_getsystime.c \
|
|
my_error.c errors.c my_div.c my_messnc.c \
|
|
mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c \
|
|
my_symlink.c my_symlink2.c \
|
|
mf_pack.c mf_unixpath.c mf_strip.c mf_arr_appstr.c \
|
|
mf_wcomp.c mf_wfile.c my_gethwaddr.c \
|
|
mf_qsort.c mf_qsort2.c mf_sort.c \
|
|
ptr_cmp.c mf_radix.c queues.c \
|
|
tree.c list.c hash.c array.c string.c typelib.c \
|
|
my_copy.c my_append.c my_lib.c \
|
|
my_delete.c my_rename.c my_redel.c \
|
|
my_chsize.c my_lread.c my_lwrite.c my_clock.c \
|
|
my_quick.c my_lockmem.c my_static.c \
|
|
my_sync.c my_getopt.c my_mkdir.c \
|
|
default_modify.c default.c \
|
|
my_compress.c checksum.c raid.cc \
|
|
my_net.c my_port.c my_sleep.c \
|
|
charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
|
|
my_gethostbyname.c rijndael.c my_aes.c sha1.c \
|
|
my_handler.c my_netware.c my_largepage.c \
|
|
my_memmem.c \
|
|
my_windac.c my_access.c base64.c my_libwrap.c
|
|
EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
|
|
thr_mutex.c thr_rwlock.c mf_soundex.c my_conio.c \
|
|
my_wincond.c my_winthread.c CMakeLists.txt
|
|
libmysys_a_LIBADD = @THREAD_LOBJECTS@
|
|
# test_dir_DEPENDENCIES= $(LIBRARIES)
|
|
# testhash_DEPENDENCIES= $(LIBRARIES)
|
|
# test_charset_DEPENDENCIES= $(LIBRARIES)
|
|
# charset2html_DEPENDENCIES= $(LIBRARIES)
|
|
EXTRA_PROGRAMS =
|
|
DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
|
|
-DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
|
|
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
|
|
-DDEFAULT_HOME_ENV=MYSQL_HOME \
|
|
-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
|
|
-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
|
|
@DEFS@
|
|
|
|
libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
|
|
|
|
# I hope this always does the right thing. Otherwise this is only test programs
|
|
FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
|
|
|
|
#
|
|
# The CP .. RM stuff is to avoid problems with some compilers (like alpha ccc)
|
|
# which automaticly removes the object files you use to compile a final program
|
|
#
|
|
|
|
test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS)
|
|
$(RM) -f ./test_thr_alarm.c
|
|
|
|
test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/thr_lock.c test_thr_lock.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS)
|
|
$(RM) -f ./test_thr_lock.c
|
|
|
|
test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
|
|
$(RM) -f test_vsnprintf.c
|
|
|
|
test_io_cache$(EXEEXT): mf_iocache.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/mf_iocache.c test_io_cache.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS)
|
|
$(RM) -f test_io_cache.c
|
|
|
|
test_dir$(EXEEXT): test_dir.c $(LIBRARIES)
|
|
$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
|
|
|
|
test_charset$(EXEEXT): test_charset.c $(LIBRARIES)
|
|
$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
|
|
|
|
testhash$(EXEEXT): testhash.c $(LIBRARIES)
|
|
$(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)
|
|
|
|
test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/my_gethwaddr.c ./test_gethwaddr.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_gethwaddr.c $(LDADD) $(LIBS)
|
|
$(RM) -f ./test_gethwaddr.c
|
|
|
|
test_base64$(EXEEXT): base64.c $(LIBRARIES)
|
|
$(CP) $(srcdir)/base64.c ./test_base64.c
|
|
$(LINK) $(FLAGS) -DMAIN ./test_base64.c $(LDADD) $(LIBS)
|
|
$(RM) -f ./test_base64.c
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|