summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-03-02 22:21:12 +0100
committerunknown <serg@serg.mylan>2004-03-02 22:21:12 +0100
commitbbb3d27a5d8528eec7100210457a254b72818743 (patch)
tree04021c7bb53d438f34c122e5717a463568477d11 /sql
parent48b6cc2b2e5e336efec65d8daf1c3e649a77adb5 (diff)
downloadmariadb-git-bbb3d27a5d8528eec7100210457a254b72818743.tar.gz
my_getsystime()
Diffstat (limited to 'sql')
-rw-r--r--sql/item_strfunc.cc10
1 files changed, 1 insertions, 9 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 216df5c17d6..fdf65a1f834 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2654,14 +2654,6 @@ static const char hex[] = "0123456789abcdef";
#define UUID_VERSION 0x1000
#define UUID_VARIANT 0x8000
-static ulonglong get_uuid_time()
-{
- struct timeval tv;
- gettimeofday(&tv,NULL);
- return (ulonglong)tv.tv_sec*10000000 +
- (ulonglong)tv.tv_usec*10 + UUID_TIME_OFFSET + nanoseq;
-}
-
static void tohex(char *to, uint from, uint len)
{
to+= len;
@@ -2710,7 +2702,7 @@ String *Item_func_uuid::val_str(String *str)
set_clock_seq_str();
}
- ulonglong tv=get_uuid_time();
+ ulonglong tv=my_getsystime() + UUID_TIME_OFFSET + nanoseq;
if (unlikely(tv < uuid_time))
set_clock_seq_str();
else