mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
192884 commits 2773 branches 343 tags 1.6 GiB
Commit graph

815 commits

Author SHA1 Message Date
Vladislav Vaintroub
c3341f8440 Merge branch '10.4' into 10.5 
# Conflicts:
#	appveyor.yml
 2021-09-11 16:40:08 +02:00
Vladislav Vaintroub
c7a721ee33 Merge branch '10.3' into 10.4 2021-09-11 16:22:55 +02:00
Vladislav Vaintroub
8988e471b5 Merge branch '10.2' into 10.3 
# Conflicts:
#	cmake/os/Windows.cmake
#	sql/sql_yacc.yy
 2021-09-11 16:21:36 +02:00
Vladislav Vaintroub
879e21b68c Define minbuild target for 10.2 2021-09-11 15:19:42 +02:00
Vicențiu Ciorbaru
7c33ecb665 Merge remote-tracking branch 'upstream/10.4' into 10.5 2021-09-10 17:16:18 +03:00
Vicențiu Ciorbaru
de7e027d5e Merge remote-tracking branch 'upstream/10.3' into 10.4 2021-09-09 09:23:35 +03:00
Vicențiu Ciorbaru
b85b8348e7 Merge branch '10.2' into 10.3 2021-09-07 16:32:35 +03:00
Sergei Golubchik
f17537579a disable cmake feature summary after the first run 
because the summary is incorrect after the first run anyway
 2021-09-06 09:49:53 +02:00
Oleksandr Byelkin
ae6bdc6769 Merge branch '10.4' into 10.5 2021-07-31 23:19:51 +02:00
Oleksandr Byelkin
7841a7eb09 Merge branch '10.3' into 10.4 2021-07-31 22:59:58 +02:00
Marko Mäkelä
b50ea90063 Merge 10.2 into 10.3 2021-07-22 18:57:54 +03:00
Heinz Wiesinger
751ebe44fd Add feature summary at the end of cmake. 
This gives a short overview over found/missing dependencies as well
as enabled/disabled features.

Initial author Heinz Wiesinger <heinz@m2mobi.com>
Additions by Vicențiu Ciorbaru <vicentiu@mariadb.org>
* Report all plugins enabled via MYSQL_ADD_PLUGIN
* Simplify code. Eliminate duplication by making use of WITH_xxx
  variable values to set feature "ON" / "OFF" state.

Reviewed by: wlad@mariadb.com (code details) serg@mariadb.com (the idea)
 2021-07-21 10:22:56 +03:00
Marko Mäkelä
365cd08345 Merge 10.4 into 10.5 2021-05-26 09:47:28 +03:00
Marko Mäkelä
1dea7f7977 Merge 10.3 into 10.4 2021-05-25 15:38:57 +03:00
Marko Mäkelä
1864a8ea93 Merge 10.2 into 10.3 2021-05-24 09:38:49 +03:00
Sergei Golubchik
f70b11c8c9 cmake: fewer Build-Depends in SRPM 
don't require tar/gtar, git, getconf, groff/nroff, and ruby.
 2021-05-22 21:56:51 +02:00
Marko Mäkelä
0e1437e147 Merge 10.4 into 10.5 2021-05-10 10:01:15 +03:00
Marko Mäkelä
8c73fab7f7 Merge 10.3 into 10.4 2021-05-10 09:52:01 +03:00
Marko Mäkelä
98e6159892 Merge 10.2 into 10.3 2021-05-10 09:09:50 +03:00
Vladislav Vaintroub
d0785f7731 MDEV-25232 Ninja MSVC build sets default CMAKE_BUILD_TYPE to Debug 
This is incosistent with other single config generators, where
the default type has always been RelWithDebInfo.

Fixed by moving setting of CMAKE_BUILD_TYPE right before PROJECT.
 2021-05-09 10:32:49 +02:00
Nikita Malyavin
3f55c56951 Merge branch bb-10.4-release into bb-10.5-release 2021-05-05 23:57:11 +03:00
Nikita Malyavin
509e4990af Merge branch bb-10.3-release into bb-10.4-release 2021-05-05 23:03:01 +03:00
Nikita Malyavin
a8a925dd22 Merge branch bb-10.2-release into bb-10.3-release 2021-05-04 14:49:31 +03:00
Vladislav Vaintroub
b07a6f45fe MDEV-25232 - CMake deprecation warning about CMAKE_MINIMUM_REQUIRED < 2.8.12 2021-04-28 08:53:36 +02:00
Marko Mäkelä
4725792bf3 Merge 10.4 into 10.5 2021-04-25 12:04:45 +03:00
Marko Mäkelä
e4394cc547 Merge 10.3 into 10.4 2021-04-25 10:20:57 +03:00
Marko Mäkelä
c425d93b92 Merge 10.2 into 10.3 
except commit 1288dfffe7
 2021-04-24 10:37:21 +03:00
Sergei Golubchik
018d7440fd remove EXCEPTIONS-CLIENT 
It's Oracle libmysqlclient license exception, we no longer include,
build or ship libmysqlclient
 2021-04-23 10:38:10 +02:00
Justin Jagieniak
1715fef107 Fix cross-compile to consider CMAKE_CROSSCOMPILING_EMULATOR 
When CMAKE_CROSSCOMPILING_EMULATOR is defined, a cross-compile
can be made, however with native (emulated) execution possible.

This commit takes those points in the build system that
execute built targets natively and allow these to be executed
in a crosscompile if CMAKE_CROSSCOMPILING_EMULATOR is defined.

Closes #1805
 2021-04-15 10:07:50 +10:00
Marko Mäkelä
6c3e860cbf Merge 10.4 into 10.5 2021-04-14 11:35:39 +03:00
Marko Mäkelä
5008171b05 Merge 10.3 into 10.4 2021-04-14 10:33:59 +03:00
Marko Mäkelä
ef26a30486 Merge 10.2 into 10.3 2021-04-14 07:54:43 +03:00
Sergei Golubchik
55a7682a30 -DMYSQL_MAINTAINER_MODE=NO 
also add =WARN as an alias for =OFF
and clarify the help text
 2021-04-13 17:13:44 +02:00
Marko Mäkelä
80459bcbd4 Merge 10.4 into 10.5 2021-03-27 17:37:42 +02:00
Marko Mäkelä
7ae37ff74f Merge 10.3 into 10.4 2021-03-27 17:12:28 +02:00
Marko Mäkelä
3157fa182a Merge 10.2 into 10.3 2021-03-27 16:11:26 +02:00
Eugene Kosov
36a05268e7 cmake cleanup: drop support for ancient clang in WITH_ASAN option 2021-03-26 16:29:58 +03:00
Eugene Kosov
dfae51de36 MDEV-25238 add support for -fsanitize-address-use-after-scope 
Use like this: cmake -DWITH_ASAN=ON -DWITH_ASAN_SCOPE=ON
 2021-03-26 16:29:58 +03:00
Vladislav Vaintroub
ac9c6f53a5 MDEV-24034 Policy CMP0075 is not set during compile 
The policy is not set for 10.2
If it is set, CMake would complain about bundled zlib for which the policy
is not set.

Fix:
- Set policy for 10.2 for the top level project.
For 10.3+ it was already set

- Cleanup zlib to remove unneeded stuff. It is an internal static library,
it needs none of PROJECT, library versioning, RC file on Windows.
The name of the library on Unix does not make any difference, since it is
static and compiled in.
 2020-12-15 12:27:13 +01:00
Monty
76a9227001 Added support of WITH_GPROF to cmake 2020-08-20 19:34:11 +03:00
Marko Mäkelä
4d4865de6f Merge 10.4 into 10.5 2020-07-20 15:55:59 +03:00
Marko Mäkelä
4b959bd8df Merge 10.3 into 10.4 2020-07-20 15:34:59 +03:00
Marko Mäkelä
acc58fd835 Merge 10.2 into 10.3 2020-07-20 15:11:59 +03:00
Marko Mäkelä
ca9276e37e Merge 10.1 into 10.2 2020-07-20 14:53:24 +03:00
Daniel Black
7473e1841c check_linker_flag: use for linker flags 
-Wl,-z,relro,-z,now are linker flags and should
be checked as such.

TODO: perform module, exe shared checks separately
rather than a pure linker check.
 2020-07-15 09:23:53 +03:00
Sergei Golubchik
263f8aff65 always use python3 
because columnstore uses python3, so rocksdb can be picky too.
python3 is present in all supported distros.
and python2 is obsolete anyway.
 2020-07-01 08:48:34 +02:00
Vladislav Vaintroub
e54723fa34 When compiling with RelWithDebInfo, always use -fno-omit-frame-pointer 
(if this option is present). perf, and other tools that do stack walking
works much better with it.
 2020-06-18 00:55:11 +02:00
Marko Mäkelä
701efbb25b Merge 10.4 into 10.5 2020-06-03 09:45:39 +03:00
Marko Mäkelä
8059148154 Merge 10.3 into 10.4 2020-06-03 07:32:09 +03:00
Marko Mäkelä
8300f639a1 Merge 10.2 into 10.3 2020-06-02 10:25:11 +03:00