summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2006-05-24 16:44:26 +0300
committerunknown <bell@sanja.is.com.ua>2006-05-24 16:44:26 +0300
commitc262b880a5f74bc938d8925f4dda8ada57bc272b (patch)
tree36dc9df2768b99d4762acb2b0c4ffd64b90fc0d2 /BUILD
parent19be345d0cecceddd4acca9b198bcc0b3971a0eb (diff)
downloadmariadb-git-c262b880a5f74bc938d8925f4dda8ada57bc272b.tar.gz
postmerge fix
BUILD/SETUP.sh: postmerge changes configure.in: postmerge changes mysql-test/r/ps_maria.result: changed result according last MyISAM test changes
Diffstat (limited to 'BUILD')
-rwxr-xr-xBUILD/SETUP.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 5efa42e4619..754883bb20b 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -141,7 +141,6 @@ base_configs="--prefix=$prefix --enable-assembler "
base_configs="$base_configs --with-extra-charsets=complex "
base_configs="$base_configs --enable-thread-safe-client --with-readline "
base_configs="$base_configs --with-big-tables"
-base_configs="$base_configs --with-maria-storage-engine"
# we need local-infile in all binaries for rpl000001
# if you need to disable local-infile in the client, write a build script