Skip to content

Commit a5ee727

Browse files
author
Tor Didriksen
committed
WL#5825 Using C++ Standard Library with MySQL code
The goal of this worklog is to allow the use of the C++ Standard Library inside the code and to enable exceptions and RTTI for the MyQL code base. The goal is *not* to start using the the standard C++ library throughout the code base, just to ensure that it is possible.
1 parent 8c9d908 commit a5ee727

79 files changed

Lines changed: 1398 additions & 1376 deletions

Some content is hidden

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

‎.bzr-mysql/default.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[MYSQL]
22
post_commit_to = "[email protected]"
33
post_push_to = "[email protected]"
4-
tree_name = "mysql-trunk"
4+
tree_name = "mysql-trunk-wl5825-stl"

‎BUILD/SETUP.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ debug_cflags="$debug_cflags -DSAFE_MUTEX"
151151
error_inject="--with-error-inject "
152152
#
153153
# Base C++ flags for all builds
154-
base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
154+
base_cxxflags="-felide-constructors"
155155
#
156156
# Flags for optimizing builds.
157157
# Be as fast as we can be without losing our ability to backtrace.

‎BUILD/build_mccge.sh‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ extended_usage()
431431
432432
In all cases it is possible to override the definition of CC and CXX
433433
by calling the script as follows:
434-
CC="/usr/local/bin/gcc" CXX="/usr/local/bin/gcc" BUILD/build_mccge.sh
434+
CC="/usr/local/bin/gcc" CXX="/usr/local/bin/g++" BUILD/build_mccge.sh
435435
436436
Feedback profiler on gcc
437437
------------------------
@@ -1368,10 +1368,10 @@ set_icc_special_options()
13681368
set_cc_and_cxx_for_gcc()
13691369
{
13701370
if test "x$CC" = "x" ; then
1371-
CC="gcc -static-libgcc -fno-exceptions"
1371+
CC="gcc -static-libgcc"
13721372
fi
13731373
if test "x$CXX" = "x" ; then
1374-
CXX="gcc -static-libgcc -fno-exceptions"
1374+
CXX="g++ -static-libgcc"
13751375
fi
13761376
}
13771377

@@ -1388,10 +1388,10 @@ set_cc_and_cxx_for_icc()
13881388
set_cc_and_cxx_for_open64()
13891389
{
13901390
if test "x$CC" = "x" ; then
1391-
CC="opencc -static-libgcc -fno-exceptions"
1391+
CC="opencc -static-libgcc"
13921392
fi
13931393
if test "x$CXX" = "x" ; then
1394-
CXX="openCC -static-libgcc -fno-exceptions"
1394+
CXX="openCC -static-libgcc"
13951395
fi
13961396
}
13971397

@@ -1689,7 +1689,6 @@ set_solaris_configs()
16891689
fi
16901690
if test "x$cpu_base_type" = "xx86" ; then
16911691
compiler_flags="$compiler_flags -nofstore"
1692-
base_cxx_flags="$base_cxx_flags -features=no%except"
16931692
if test "x$fast_flag" = "xyes" ; then
16941693
compiler_flags="$compiler_flags -xregs=frameptr"
16951694
compiler_flags="$compiler_flags -xO4"
@@ -1705,7 +1704,6 @@ set_solaris_configs()
17051704
#Using SPARC cpu with SunStudio (Forte) compiler
17061705
ASFLAGS="$ASFLAGS -xarch=sparc"
17071706
LDFLAGS="$LDFLAGS -xarch=sparc"
1708-
base_cxxflags="$base_cxxflags -noex"
17091707
base_cflags="$base_cflags -xstrconst"
17101708
compiler_flags="$compiler_flags -xarch=sparc"
17111709
if test "x$fast_flag" = "xyes" ; then

‎BUILD/compile-alpha-debug‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎BUILD/compile-darwin-mwcc‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎BUILD/compile-dist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ fi
4444
# Default to gcc for CC and CXX
4545
if test -z "$CXX" ; then
4646
export CXX
47-
CXX=gcc
47+
CXX=g++
4848
# Set some required compile options
4949
if test -z "$CXXFLAGS" ; then
5050
export CXXFLAGS
51-
CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"
51+
CXXFLAGS="-felide-constructors"
5252
fi
5353
fi
5454

‎BUILD/compile-irix-mips64-mipspro‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎BUILD/compile-pentium-icc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ extra_flags="$fast_cflags -unroll2 -ip -mp -restrict"
3333
# IPO link: can not find "-lstdc++_shared"
3434
# icpc: error: problem during multi-file optimization compilation (code 1)
3535
extra_flags="$extra_flags -no-ipo"
36-
base_cxxflags="-fno-exceptions -fno-rtti"
3736
extra_configs="$pentium_configs $static_link"
3837

3938
. "$path/FINISH.sh"

‎BUILD/compile-pentium-icc-valgrind-max‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ extra_flags="$pentium_cflags $debug_cflags $valgrind_flags"
4343

4444
c_warnings="-Wall -Wcheck -wd161,444,279,810,981,1292,1469,1572"
4545
cxx_warnings="$c_warnings -wd869,874"
46-
base_cxxflags="-fno-exceptions -fno-rtti"
4746
extra_configs="$pentium_configs $debug_configs $valgrind_configs"
4847

4948
. "$path/FINISH.sh"

‎BUILD/compile-pentium-icc-yassl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ extra_flags="$fast_cflags -unroll2 -ip -mp -restrict"
3333
# IPO link: can not find "-lstdc++_shared"
3434
# icpc: error: problem during multi-file optimization compilation (code 1)
3535
extra_flags="$extra_flags -no-ipo"
36-
base_cxxflags="-fno-exceptions -fno-rtti"
3736
extra_configs="$pentium_configs $static_link --with-yassl"
3837

3938
. "$path/FINISH.sh"

0 commit comments

Comments
 (0)