summaryrefslogtreecommitdiff
path: root/myisam/myisamchk.c
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-10-22 18:21:56 +0200
committerunknown <serg@serg.mylan>2004-10-22 18:21:56 +0200
commit85d04ccebd3ee921a0522e65a90d9e85ec670c28 (patch)
tree9279a72eb4487cf886bc0647adb1901a0de490f5 /myisam/myisamchk.c
parent855e4dafb3dfccdb34a3a8d3fbd9f682d5d4face (diff)
parent1cd249e0edb9aeeb46686ef548a4901c5a5340b2 (diff)
downloadmariadb-git-85d04ccebd3ee921a0522e65a90d9e85ec670c28.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1 myisam/myisamchk.c: Auto merged
Diffstat (limited to 'myisam/myisamchk.c')
-rw-r--r--myisam/myisamchk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index 9a2fde8fb89..648e29e1e9e 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -1695,7 +1695,7 @@ err:
static my_bool not_killed= 0;
-volatile my_bool *killed_ptr(MI_CHECK *param)
+volatile my_bool *killed_ptr(MI_CHECK *param __attribute__((unused)))
{
return &not_killed; /* always NULL */
}