diff options
| author | unknown <serg@serg.mylan> | 2004-03-14 11:51:09 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-03-14 11:51:09 +0100 |
| commit | ad73b5ac5b5b71fc5370d19a971c260fc0bd42c1 (patch) | |
| tree | 4249aad9b631c3246bc5f614c4f2d46431078937 | |
| parent | 4db4cb6665a0ab88f531da1ad6b4727ba0c95377 (diff) | |
| parent | 9dc59e9ac83122b202330f07f057ca5d40d8e1b0 (diff) | |
| download | mariadb-git-ad73b5ac5b5b71fc5370d19a971c260fc0bd42c1.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| -rw-r--r-- | sql/item_strfunc.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 518b9ca624b..bcf534c9e84 100644 --- 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); |