diff options
| author | unknown <andrey@lmy004.> | 2006-01-10 21:02:19 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-01-10 21:02:19 +0100 |
| commit | bb0b7f5dda0933e60cd9520d172fd27a9724cdb6 (patch) | |
| tree | ed7905772f33cdc3e24dd8fbfa8894d09ed4ec0a /BUILD/SETUP.sh | |
| parent | 12c8b61aad80d04c99d77ef2a92fc26393b4f68d (diff) | |
| parent | 1ef97f1f3b3dc53a5945fb4fc7db6a3fea926379 (diff) | |
| download | mariadb-git-bb0b7f5dda0933e60cd9520d172fd27a9724cdb6.tar.gz | |
WL #1034 (Internal CRON)
merge before push
BUILD/SETUP.sh:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp.h:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/tztime.cc:
Auto merged
libmysqld/Makefile.am:
manual merge
mysql-test/r/information_schema.result:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sp_head.cc:
manual merge
sql/sql_lex.h:
manual merge
sql/sql_yacc.yy:
manual merge
Diffstat (limited to 'BUILD/SETUP.sh')
| -rwxr-xr-x | BUILD/SETUP.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index ae5c8332bcd..8bcad5af746 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -79,7 +79,7 @@ fast_cflags="-O3 -fno-omit-frame-pointer" reckless_cflags="-O3 -fomit-frame-pointer " debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX" -debug_extra_cflags="-O1 -Wuninitialized" +debug_extra_cflags="-O0" base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti" amd64_cxxflags="" # If dropping '--with-big-tables', add here "-DBIG_TABLES" |