Skip to content

Commit 442870f

Browse files
committed
merged mysql-trunk->mysql-trunk-security
2 parents 4fab73f + 04527f2 commit 442870f

File tree

1,035 files changed

+100698
-13094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,035 files changed

+100698
-13094
lines changed

BUILD/README

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
This directory used to contain lots of build scripts for building
2+
MySQL on various platforms. They are mostly gone, use cmake instead.
3+
4+
Some scripts have been kept for backward compatibility (other scripts
5+
depend on them). Others have been kept to illustrate how to enable
6+
gcov or gprof, or explicitly selecting 64bit architecture. If you
7+
want to use these scripts for building, you may want to speed things
8+
up a bit by setting environment variable MAKEFLAGS="-j8"
9+
(or some other number/flag depending on your environment)
10+
11+
The recommended way to build MySQL for developers:
12+
13+
cd <some build directory>
14+
cmake <path to source directory>
15+
make
16+
17+
This will give you a release build, with compiler options taken from
18+
../cmake/build_configurations/compiler_options.cmake
19+
and "feature set" taken from
20+
../cmake/build_configurations/feature_set.cmake
21+
22+
Adding -DWITH_DEBUG=1 to the cmake command line gives you a debug build.
23+
24+
25+
Building on Windows is slightly different:
26+
cd <some build directory>
27+
cmake <path to source directonry>
28+
29+
devenv MySQL.sln /build Debug
30+
or
31+
devenv MySQL.sln /build RelWithDebInfo
32+
33+
34+
If you have special needs, you can disable the defaults by setting
35+
these cmake variables off:
36+
37+
WITH_DEFAULT_COMPILER_OPTIONS
38+
WITH_DEFAULT_FEATURE_SET

BUILD/compile-pentium

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717

1818
path=`dirname $0`
1919
cmake $path/.. -DWITH_DEBUG=0
20-
gmake -j 4
20+
make

BUILD/compile-pentium-debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717

1818
path=`dirname $0`
1919
cmake $path/.. -DWITH_DEBUG=1
20-
gmake -j 4
20+
make

BUILD/compile-pentium-debug-max

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717

1818
path=`dirname $0`
1919
cmake $path/.. -DWITH_DEBUG=1
20-
gmake -j 4
20+
make

BUILD/compile-pentium-debug-max-no-ndb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717

1818
path=`dirname $0`
1919
cmake $path/.. -DWITH_DEBUG=1 -DWITH_NDBCLUSTER=0
20-
make -j 4
20+
make

BUILD/compile-pentium-gcov

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717

1818
path=`dirname $0`
1919
cmake $path/.. -DWITH_DEBUG=1 -DENABLE_GCOV=ON
20-
gmake -j 4
20+
make

BUILD/compile-pentium-gprof

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717

1818
path=`dirname $0`
1919
cmake $path/.. -DWITH_DEBUG=0 -DENABLE_GPROF=ON
20-
gmake -j 4
20+
make

BUILD/compile-pentium-valgrind-max

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
# -DHAVE_purify : activates misc. ifdefs in the source code
2020

2121
path=`dirname $0`
22-
cmake $path/.. -DWITH_DEBUG=1 -DWITH_VALGRIND=1 -DCMAKE_CXX_FLAGS=-DHAVE_purify
23-
gmake -j 4
22+
cmake $path/.. -DWITH_DEBUG=1 -DWITH_VALGRIND=1 \
23+
-DCMAKE_C_FLAGS=-DHAVE_purify -DCMAKE_CXX_FLAGS=-DHAVE_purify
24+
make

BUILD/compile-pentium-valgrind-max-no-ndb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# MA 02111-1307, USA
1919

2020
path=`dirname $0`
21-
cmake $path/.. -DWITH_DEBUG=1 \
22-
-DWITH_VALGRIND=1 -DCMAKE_CXX_FLAGS=-DHAVE_purify \
23-
-DWITH_NDBCLUSTER=0
24-
gmake -j 4
21+
cmake $path/.. -DWITH_DEBUG=1 -DWITH_VALGRIND=1 \
22+
-DCMAKE_C_FLAGS=-DHAVE_purify -DCMAKE_CXX_FLAGS=-DHAVE_purify \
23+
-DWITH_NDBCLUSTER=0
24+
make

BUILD/compile-pentium64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

2020
path=`dirname $0`
2121
cmake $path/.. -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_C_FLAGS=-m64
22-
gmake -j 4
22+
make

0 commit comments

Comments
 (0)