Commit 42c19ada authored by serg@serg.mylan's avatar serg@serg.mylan

Merge bk-internal:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 283d4557 ae279eae
...@@ -2754,7 +2754,14 @@ String *Item_func_uuid::val_str(String *str) ...@@ -2754,7 +2754,14 @@ String *Item_func_uuid::val_str(String *str)
tv++; tv++;
} }
else else
{
if (nanoseq)
{
tv-=nanoseq;
nanoseq=0; nanoseq=0;
}
DBUG_ASSERT(tv > uuid_time);
}
uuid_time=tv; uuid_time=tv;
pthread_mutex_unlock(&LOCK_uuid_generator); pthread_mutex_unlock(&LOCK_uuid_generator);
......
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