summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@mysql.com>2008-08-26 14:31:17 +0500
committerAlexey Botchkov <holyfoot@mysql.com>2008-08-26 14:31:17 +0500
commit27ca994dffe238a4e4489dba1ec72918dfcaf729 (patch)
treee486b05bb9f3e200ea0cc7531c47d3e5f845a356 /storage
parentd30db4c9e9fe2f8d5d1e92afb060a88d54434ea2 (diff)
parent8d3eb141e08103c5119854948dd793ec55d3cc00 (diff)
downloadmariadb-git-27ca994dffe238a4e4489dba1ec72918dfcaf729.tar.gz
merging fixes
Diffstat (limited to 'storage')
-rw-r--r--storage/myisam/mi_static.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_static.c b/storage/myisam/mi_static.c
index d84a9c5ac05..a3ba785a94f 100644
--- a/storage/myisam/mi_static.c
+++ b/storage/myisam/mi_static.c
@@ -42,7 +42,7 @@ ulong myisam_bulk_insert_tree_size=8192*1024;
ulong myisam_data_pointer_size=4;
-static int always_valid(const char *filename)
+static int always_valid(const char *filename __attribute__((unused)))
{
return 0;
}