diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2007-06-12 16:34:54 +0300 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2007-06-12 16:34:54 +0300 |
| commit | fbefe9d5524bf5dca6b4c5b88cc11f5b5f7c0868 (patch) | |
| tree | 49f65594ef7867ace676423b3635cec9297e4936 /sql/item_strfunc.cc | |
| parent | 9e8299f69e004a6b8ede650aa578e1bef2f53c91 (diff) | |
| parent | 2a6ac40e11addd29a010f21c1203ddd091454e5c (diff) | |
| download | mariadb-git-fbefe9d5524bf5dca6b4c5b88cc11f5b5f7c0868.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index f9ca53a8355..3dc352338a4 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -3364,7 +3364,7 @@ String *Item_func_uuid::val_str(String *str) *--s=_dig_vec_lower[mac[i] >> 4]; } randominit(&uuid_rand, tmp + (ulong) server_start_time, - tmp + thd->status_var.bytes_sent); + tmp + (ulong) thd->status_var.bytes_sent); set_clock_seq_str(); } |