summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2005-01-31 12:17:34 -0800
committerunknown <brian@zim.(none)>2005-01-31 12:17:34 -0800
commit0e2e3df2b4bbbcc6c7625a9d2c998fa3c2733417 (patch)
treec5d47403763e2d67af430d8f9f6a6e6d9cad5817
parent665a3efe892736ed1f011a47275ab73f5c7158a3 (diff)
downloadmariadb-git-0e2e3df2b4bbbcc6c7625a9d2c998fa3c2733417.tar.gz
Removed duplicate close call and added archive to the debug build and test.
BUILD/compile-ia64-debug-max: Added archive for this build. sql/examples/ha_archive.cc: Removed duplicate close call.
-rwxr-xr-xBUILD/compile-ia64-debug-max2
-rw-r--r--sql/examples/ha_archive.cc1
2 files changed, 1 insertions, 2 deletions
diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max
index 9cd54de428d..56c36059ea9 100755
--- a/BUILD/compile-ia64-debug-max
+++ b/BUILD/compile-ia64-debug-max
@@ -9,5 +9,5 @@ then
(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
fi
-CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static --with-debug --with-innodb --with-embedded-server
+CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static --with-debug --with-innodb --with-embedded-server --with-archive-storage-engine
gmake
diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc
index 6bf3d485575..491056d0e59 100644
--- a/sql/examples/ha_archive.cc
+++ b/sql/examples/ha_archive.cc
@@ -405,7 +405,6 @@ int ha_archive::free_share(ARCHIVE_SHARE *share)
rc= 1;
if (my_close(share->meta_file, MYF(0)))
rc= 1;
- my_close(share->meta_file,MYF(0));
my_free((gptr) share, MYF(0));
}
pthread_mutex_unlock(&archive_mutex);