Commit c86be630 authored by unknown's avatar unknown

Maria - fixes for gcc -ansi (no //)


storage/maria/lockman.c:
  no //
storage/maria/trnman.c:
  no //
parent 9fcc34b4
// TODO - allocate everything from dynarrays !!! (benchmark) #warning TODO - allocate everything from dynarrays !!! (benchmark)
// TODO instant duration locks #warning TODO instant duration locks
// automatically place S instead of LS if possible #warning automatically place S instead of LS if possible
/* Copyright (C) 2006 MySQL AB /* Copyright (C) 2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -217,7 +217,8 @@ typedef struct lockman_lock { ...@@ -217,7 +217,8 @@ typedef struct lockman_lock {
uint64 resource; uint64 resource;
struct lockman_lock *lonext; struct lockman_lock *lonext;
intptr volatile link; intptr volatile link;
uint32 hashnr; // TODO - remove hashnr from LOCK uint32 hashnr;
#warning TODO - remove hashnr from LOCK
uint16 loid; uint16 loid;
uchar lock; /* sizeof(uchar) <= sizeof(enum) */ uchar lock; /* sizeof(uchar) <= sizeof(enum) */
uchar flags; uchar flags;
...@@ -429,7 +430,7 @@ static int lockinsert(LOCK * volatile *head, LOCK *node, LF_PINS *pins, ...@@ -429,7 +430,7 @@ static int lockinsert(LOCK * volatile *head, LOCK *node, LF_PINS *pins,
cursor.upgrade_from->flags|= IGNORE_ME; cursor.upgrade_from->flags|= IGNORE_ME;
#warning is this OK ? if a reader has already read upgrade_from, \ #warning is this OK ? if a reader has already read upgrade_from, \
it may find it conflicting with node :( 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); } while (res == REPEAT_ONCE_MORE);
......
...@@ -338,7 +338,8 @@ void trnman_end_trn(TRN *trn, my_bool commit) ...@@ -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 those lists, and thus nobody may want to free them. Now we don't
need a mutex to access free_me list 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; TRN *t= free_me;
free_me= free_me->next; free_me= free_me->next;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment