mirror of
https://github.com/MariaDB/server.git
synced 2025-02-16 18:35:34 +01:00
![unknown](/assets/img/avatar_default.png)
-new option WITH_MARIA_STORAGE_ENGINE for config.js -correct build errors -build test executables -downport changes for atomic functions from 5.2 -remove LOCK_uuid_generator from C++ files to avoid linker errors -new function my_uuid2str() BitKeeper/deleted/.del-x86-msvc.h: Delete: include/atomic/x86-msvc.h CMakeLists.txt: Windows fixes: -New option WITH_MARIA_STORAGE_ENGINE -Add unit tests include/Makefile.am: replace x86-msvc.h with generic-msvc.h include/config-win.h: my_chmod() support include/my_atomic.h: Downport my_atomic from 5.2 tree include/my_bit.h: Correct unresolved symbol errors on Windows include/my_pthread.h: pthread_mutex_unlock now returns 0 (was void previously) defined PTHREAD_STACK_MIN include/my_sys.h: New function my_uuid2str() define MY_UUID_STRING_LENGTH include/atomic/nolock.h: Downport my_atomic from 5.2 tree libmysqld/CMakeLists.txt: New option WITH_MARIA_STORAGE_ENGINE mysys/CMakeLists.txt: Add missing files mysys/lf_dynarray.c: Fix compiler errors on Windows mysys/my_getncpus.c: Windows port mysys/my_uuid.c: Windows fixes: there is no random() on Windows, use ANSI rand() New function my_uuid2str() mysys/my_winthread.c: Downport from 5.2 tree -Call my_thread_end() before pthread_exit() -Avoid crash if pthread_create is called with NULL attributes sql/CMakeLists.txt: Link mysqld with Maria storage engine sql/item_func.cc: Remove LOCK_uuid_generator from C++ to avoid linker errors. Use dedicated mutex for short uuids sql/item_strfunc.cc: Use my_uuid() and my_uuid2str() functions from mysys. sql/item_strfunc.h: Define MY_UUID_STRING_LENGTH in my_sys.h sql/mysql_priv.h: LOCK_uuid_generator must be declared as extern "C" sql/mysqld.cc: Init and destroy LOCK_uuid_short mutex storage/maria/CMakeLists.txt: -Use the same source files as in Makefile.am -Build test binaries storage/maria/ha_maria.cc: snprintf->my_snprintf storage/maria/lockman.c: Fix compiler error on Windows storage/maria/ma_check.c: Fix compiler error on Windows storage/maria/ma_loghandler.c: Fix compile errors my_open()/my_sync() do not work for directories on Windows storage/maria/ma_recovery.c: Fix compile error on Windows storage/maria/ma_test2.c: Rename variable to avoid naming conflict with Microsoft C runtime function storage/maria/ma_test3.c: Fix build errors on Windows storage/maria/tablockman.c: Fix build errors on Windows storage/maria/unittest/Makefile.am: Add CMakeLists.txt storage/maria/unittest/ma_pagecache_consist.c: Fix build errors on Windows remove loop from get_len() storage/maria/unittest/ma_pagecache_single.c: Fix build errors on Windows storage/maria/unittest/ma_test_loghandler-t.c: Windows fixes -Avoid division by 0 in expressions like x/(RAND_MAX/y), where y is larger than RAND_MAX(==0x7fff on Windows) storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Windows fixes -Avoid division by 0 in expressions like x/(RAND_MAX/y), where y is larger than RAND_MAX(==0x7fff on Windows) -remove loop in get_len() storage/maria/unittest/ma_test_loghandler_multithread-t.c: Windows fixes -Avoid division by 0 in expressions like x/(RAND_MAX/y), where y is larger than RAND_MAX(==0x7fff on Windows) -remove loop in get_len() storage/maria/unittest/ma_test_loghandler_noflush-t.c: Fix build errors on Windows storage/maria/unittest/test_file.c: Correct the code to get file size on Windows. stat() information can be outdated and thus cannot be trusted. On Vista,stat() returns file size=0 until the file is closed at the first time. storage/myisam/CMakeLists.txt: Fix compiler errors on Windows Build test executables storage/myisam/mi_test2.c: Rename variable to avoid naming conflict with Microsoft C runtime function storage/myisam/mi_test3.c: Fix build errors on Windows strings/CMakeLists.txt: Add missing file unittest/unit.pl: Windows: downport unittest changes from 5.2 bk tree unittest/mysys/Makefile.am: Windows: downport unittest changes from 5.2 bk tree unittest/mysys/my_atomic-t.c: Windows: downport unittest changes from 5.2 bk tree unittest/mytap/Makefile.am: Windows: downport unittest changes from 5.2 bk tree unittest/mytap/tap.c: Windows: downport unittest changes from 5.2 bk tree win/configure.js: Add WITH_MARIA_STORAGE_ENGINE configure option unittest/mytap/CMakeLists.txt: Add missing file unittest/mysys/CMakeLists.txt: Add missing file storage/maria/unittest/CMakeLists.txt: Add missing file BitKeeper/etc/ignore: Added comments maria-win.patch to the ignore list include/atomic/generic-msvc.h: Implement atomic operations with MSVC intrinsics
80 lines
2.9 KiB
Makefile
80 lines
2.9 KiB
Makefile
# Copyright (C) 2000-2006 MySQL AB
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Library General Public
|
|
# License as published by the Free Software Foundation; version 2
|
|
# of the License.
|
|
#
|
|
# This library 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
|
|
# Library General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Library General Public
|
|
# License along with this library; if not, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
# MA 02111-1307, USA
|
|
|
|
BUILT_SOURCES = $(HEADERS_GEN) link_sources
|
|
HEADERS_GEN = mysql_version.h my_config.h
|
|
HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
|
|
my_list.h my_alloc.h typelib.h mysql/plugin.h
|
|
pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
|
|
my_xml.h mysql_embed.h \
|
|
my_pthread.h my_no_pthread.h \
|
|
decimal.h errmsg.h my_global.h my_net.h \
|
|
my_getopt.h sslopt-longopts.h my_dir.h \
|
|
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
|
|
m_ctype.h my_attribute.h $(HEADERS_GEN)
|
|
noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.h \
|
|
heap.h maria.h myisamchk.h my_bitmap.h my_uctype.h \
|
|
myisam.h myisampack.h myisammrg.h ft_global.h\
|
|
mysys_err.h my_base.h help_start.h help_end.h \
|
|
my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
|
|
my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
|
|
thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
|
|
mysql_version.h.in my_handler.h my_time.h \
|
|
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
|
|
atomic/rwlock.h atomic/x86-gcc.h atomic/generic-msvc.h \
|
|
my_libwrap.h wqueue.h
|
|
|
|
# Remove built files and the symlinked directories
|
|
CLEANFILES = $(BUILT_SOURCES) readline openssl
|
|
|
|
EXTRA_DIST = mysql_h.ic
|
|
|
|
# Some include files that may be moved and patched by configure
|
|
DISTCLEANFILES = sched.h $(CLEANFILES)
|
|
|
|
link_sources:
|
|
-$(RM) -f readline openssl
|
|
@readline_h_ln_cmd@
|
|
@yassl_h_ln_cmd@
|
|
echo timestamp > link_sources
|
|
|
|
# We want both "my_config.h" and "config.h" that are identical, as
|
|
# MySQL sources assumes the name "my_config.h", and 3rd party sources
|
|
# assumes the name "config.h".
|
|
my_config.h: config.h
|
|
$(CP) config.h my_config.h
|
|
|
|
# These files should not be included in distributions since they are
|
|
# generated by configure from the .h.in files
|
|
dist-hook:
|
|
$(RM) -f $(distdir)/mysql_version.h $(distdir)/my_config.h
|
|
|
|
#
|
|
# Rules for checking that ABI has not changed
|
|
#
|
|
|
|
# Create a icheck file and compare it to the reference
|
|
abi_check: $(HEADERS_ABI) mysql_version.h mysql_h.ic
|
|
@set -ex; \
|
|
if [ @ICHECK@ != no ] ; then \
|
|
@ICHECK@ --canonify --skip-from-re /usr/ -o $@ $(HEADERS_ABI); \
|
|
@ICHECK@ --compare mysql_h.ic $@; \
|
|
fi; \
|
|
touch abi_check;
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|