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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
ad73b5ac · unknown · 4db4cb66 · 9dc59e9a · ad73b5ac
Commit ad73b5ac authored Mar 14, 2004 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

sql/item_strfunc.cc sql/item_strfunc.cc +8 -1

No files found.
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2754,7 +2754,14 @@ String *Item_func_uuid::val_str(String *str)
    tv++;
  }
  else
-    nanoseq=0;
+  {
+    if (nanoseq)
+    {
+      tv-=nanoseq;
+      nanoseq=0;
+    }
+    DBUG_ASSERT(tv > uuid_time);
+  }
  uuid_time=tv;
  pthread_mutex_unlock(&LOCK_uuid_generator);