diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /mysys/my_uuid.c | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'mysys/my_uuid.c')
| -rw-r--r-- | mysys/my_uuid.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysys/my_uuid.c b/mysys/my_uuid.c index f115806b4e9..b82ce860c63 100644 --- a/mysys/my_uuid.c +++ b/mysys/my_uuid.c @@ -49,9 +49,7 @@ static uint nanoseq; static ulonglong uuid_time= 0; static uchar uuid_suffix[2+6]; /* clock_seq and node */ -#ifdef THREAD pthread_mutex_t LOCK_uuid_generator; -#endif /* Number of 100-nanosecond intervals between |