summaryrefslogtreecommitdiff
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
commitc86be6303bbc9d85c564876c1f9507ab634b442b (patch)
tree28b044b773c8cee5a6a6d713ad838fec709f2dae
parent9fcc34b4ae1bdcf8aeb4dad0295b7d3534491a17 (diff)
downloadmariadb-git-c86be6303bbc9d85c564876c1f9507ab634b442b.tar.gz
Maria - fixes for gcc -ansi (no //)
storage/maria/lockman.c: no // storage/maria/trnman.c: no //
-rw-r--r--storage/maria/lockman.c11
-rw-r--r--storage/maria/trnman.c3
2 files changed, 8 insertions, 6 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);
diff --git a/storage/maria/trnman.c b/storage/maria/trnman.c
index 1df4c67b4aa..4399f0e1208 100644
--- a/storage/maria/trnman.c
+++ b/storage/maria/trnman.c
@@ -338,7 +338,8 @@ void trnman_end_trn(TRN *trn, my_bool commit)
those lists, and thus nobody may want to free them. Now we don't
need a mutex to access free_me list
*/
- while (free_me) // XXX send them to the purge thread
+ while (free_me)
+#warning XXX send them to the purge thread
{
TRN *t= free_me;
free_me= free_me->next;