summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <guilhem@gbichot3.local>2006-09-20 10:42:15 +0200
committerunknown <guilhem@gbichot3.local>2006-09-20 10:42:15 +0200
commitb860539e37bb585794e144d5785906af13e0e1b9 (patch)
tree0650cff69d36a0f2d48cdea20c90d82757996140
parent09a7f30973304620e00b934597b72f7dd7eeb966 (diff)
downloadmariadb-git-b860539e37bb585794e144d5785906af13e0e1b9.tar.gz
Maria, very minor changes.
mysys/Makefile.am: test_pagecache* programs need to link with dbug (I used BUILD/compile-pentium64-valgrind-max) mysys/mf_pagecache.c: unused constant
-rw-r--r--mysys/Makefile.am3
-rwxr-xr-xmysys/mf_pagecache.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index 6317d6c9285..edafd128eb0 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -20,7 +20,8 @@ MYSQLBASEdir= $(prefix)
INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
-I$(top_srcdir)/include -I$(srcdir)
pkglib_LIBRARIES = libmysys.a
-LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a
+LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a \
+ $(top_builddir)/dbug/libdbug.a
noinst_HEADERS = mysys_priv.h my_static.h
libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
mf_path.c mf_loadpath.c my_file.c \
diff --git a/mysys/mf_pagecache.c b/mysys/mf_pagecache.c
index 3a054077809..9c6f586be8a 100755
--- a/mysys/mf_pagecache.c
+++ b/mysys/mf_pagecache.c
@@ -154,7 +154,6 @@ struct st_pagecache_hash_link
#define BLOCK_IN_FLUSH 16 /* block is in flush operation */
#define BLOCK_CHANGED 32 /* block buffer contains a dirty page */
#define BLOCK_WRLOCK 64 /* write locked block */
-#define BLOCK_CPYWRT 128 /* block buffer is in copy&write (see also cpyrd) */
/* page status, returned by find_key_block */
#define PAGE_READ 0