diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-10-04 23:33:55 +0300 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-10-04 23:33:55 +0300 |
| commit | 2011f790295f05ef8fde08b37dc00aa11d7a305c (patch) | |
| tree | 7225ad3217657fb9d0f7fb08e76438910a7c2b69 /BUILD | |
| parent | 4eb383e06c021e89244cbf7d24abecb7b3bde01b (diff) | |
| parent | 24db7ed7e13c603488c0a5e05ad9c87754b2ffaf (diff) | |
| download | mariadb-git-2011f790295f05ef8fde08b37dc00aa11d7a305c.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-maria.prod
BUILD/SETUP.sh:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_create.c:
Auto merged
storage/maria/ma_delete.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_update.c:
Auto merged
storage/maria/ma_write.c:
Auto merged
storage/maria/maria_chk.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
storage/maria/ma_pagecache.c:
Manual merge with maria tree.
storage/myisam/sort.c:
Manual merge with maria tree.
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 1 | ||||
| -rwxr-xr-x | BUILD/compile-amd64-gprof-no-ndb | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index e093f43a252..34bdfecf995 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -145,6 +145,7 @@ base_configs="--prefix=$prefix --enable-assembler " base_configs="$base_configs --with-extra-charsets=complex " base_configs="$base_configs --enable-thread-safe-client " base_configs="$base_configs --with-big-tables" +base_configs="$base_configs --with-plugin-maria" if test -d "$path/../cmd-line-utils/readline" then diff --git a/BUILD/compile-amd64-gprof-no-ndb b/BUILD/compile-amd64-gprof-no-ndb new file mode 100755 index 00000000000..9fd4c67155c --- /dev/null +++ b/BUILD/compile-amd64-gprof-no-ndb @@ -0,0 +1,7 @@ +#! /bin/sh +path=`dirname $0` +. "$path/SETUP.sh" +extra_flags="$amd64_cflags -pg -g" +extra_configs="$amd64_configs $max_no_ndb_configs --disable-shared $static_link" + +. "$path/FINISH.sh" |