diff options
| author | monty@nosik.monty.fi <> | 2007-08-02 07:55:33 +0300 |
|---|---|---|
| committer | monty@nosik.monty.fi <> | 2007-08-02 07:55:33 +0300 |
| commit | 93f0771fca8b2b6eb4ebfec81702fcee69ddaa3d (patch) | |
| tree | 5c544cc45c47bbd06c8b4d216aab02fe9307f8de /sql-common | |
| parent | 2459558060cbc959ffa4b487a1db323bf4f384cd (diff) | |
| parent | 4f33d95fa3be042234a2cc8e351bdf52cea3376d (diff) | |
| download | mariadb-git-93f0771fca8b2b6eb4ebfec81702fcee69ddaa3d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index cdf9eed8574..ce891a37b21 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -232,7 +232,7 @@ static int wait_for_data(my_socket fd, uint timeout) implementations of select that don't adjust tv upon failure to reflect the time remaining */ - start_time = time(NULL); + start_time= my_time(0); for (;;) { tv.tv_sec = (long) timeout; @@ -246,7 +246,7 @@ static int wait_for_data(my_socket fd, uint timeout) #endif if (res == 0) /* timeout */ return -1; - now_time=time(NULL); + now_time= my_time(0); timeout-= (uint) (now_time - start_time); if (errno != EINTR || (int) timeout <= 0) return -1; |