diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
| commit | 068c61978e3a81836d52b8caf11e044290159ad1 (patch) | |
| tree | 2cbca861ab2cebe3bd99379ca9668bb483ca0d2a /mysys/my_uuid.c | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'mysys/my_uuid.c')
| -rw-r--r-- | mysys/my_uuid.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_uuid.c b/mysys/my_uuid.c index ab1b259ae0f..569616d09eb 100644 --- a/mysys/my_uuid.c +++ b/mysys/my_uuid.c @@ -40,6 +40,7 @@ */ #include "mysys_priv.h" +#include <my_rnd.h> #include <m_string.h> #include <myisampack.h> /* mi_int2store, mi_int4store */ @@ -151,7 +152,7 @@ void my_uuid(uchar *to) /* -1 so we won't make tv= uuid_time for nanoseq >= (tv - uuid_time) */ - delta= min(nanoseq, (ulong)(tv - uuid_time -1)); + delta= MY_MIN(nanoseq, (ulong)(tv - uuid_time -1)); tv-= delta; nanoseq-= delta; } |