summaryrefslogtreecommitdiff
path: root/storage/maria/lockman.c
diff options
context:
space:
mode:
authorunknown <guilhem@gbichot2.(none)>2006-11-30 15:43:15 +0100
committerunknown <guilhem@gbichot2.(none)>2006-11-30 15:43:15 +0100
commit3cf258fbac8b9ae7912b3d49b615a02e78545531 (patch)
tree28b044b773c8cee5a6a6d713ad838fec709f2dae /storage/maria/lockman.c
parenta517e8280b4e04378bf63c573a5e35eb9ddc9f9c (diff)
downloadmariadb-git-3cf258fbac8b9ae7912b3d49b615a02e78545531.tar.gz
Maria - fixes for gcc -ansi (no //)
storage/maria/lockman.c: no // storage/maria/trnman.c: no //
Diffstat (limited to 'storage/maria/lockman.c')
-rw-r--r--storage/maria/lockman.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/storage/maria/lockman.c b/storage/maria/lockman.c
index 7a6b97b3d51..54ea95c6b61 100644
--- a/storage/maria/lockman.c
+++ b/storage/maria/lockman.c
@@ -1,6 +1,6 @@
-// TODO - allocate everything from dynarrays !!! (benchmark)
-// TODO instant duration locks
-// automatically place S instead of LS if possible
+#warning TODO - allocate everything from dynarrays !!! (benchmark)
+#warning TODO instant duration locks
+#warning automatically place S instead of LS if possible
/* Copyright (C) 2006 MySQL AB
This program is free software; you can redistribute it and/or modify
@@ -217,7 +217,8 @@ typedef struct lockman_lock {
uint64 resource;
struct lockman_lock *lonext;
intptr volatile link;
- uint32 hashnr; // TODO - remove hashnr from LOCK
+ uint32 hashnr;
+#warning TODO - remove hashnr from LOCK
uint16 loid;
uchar lock; /* sizeof(uchar) <= sizeof(enum) */
uchar flags;
@@ -429,7 +430,7 @@ static int lockinsert(LOCK * volatile *head, LOCK *node, LF_PINS *pins,
cursor.upgrade_from->flags|= IGNORE_ME;
#warning is this OK ? if a reader has already read upgrade_from, \
it may find it conflicting with node :(
-//#error another bug - see the last test from test_lockman_simple()
+#warning another bug - see the last test from test_lockman_simple()
}
} while (res == REPEAT_ONCE_MORE);