diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-02-01 16:11:55 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-02-01 16:11:55 +0400 |
| commit | 3d8ef8bf2f9bf2aef5e80136cb2e63ec72f1e341 (patch) | |
| tree | 2b7fe2dfa8bcf00149c768f4a2c4b238ebd9ff39 | |
| parent | d10116292ba572fef5b44ce045b68851ff39337c (diff) | |
| download | mariadb-git-3d8ef8bf2f9bf2aef5e80136cb2e63ec72f1e341.tar.gz | |
ftime does not exist on FreeBSD.
Hiding calls for ftime() as a temporary fix.
This code should be modified to use my_time_microseconds() instead.
| -rw-r--r-- | storage/connect/ha_connect.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index 2831598bb25..86142240c64 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -2462,7 +2462,9 @@ int ha_connect::rnd_init(bool scan) } // endif g
xp->nrd= xp->fnd= xp->nfd= 0;
+#ifndef __FreeBSD__
ftime(&xp->tb1);
+#endif
DBUG_RETURN(0);
} // end of rnd_init
@@ -2543,7 +2545,9 @@ int ha_connect::rnd_next(uchar *buf) #ifndef DBUG_OFF
if (rc || !(xp->nrd++ % 16384)) {
+#ifndef __FreeBSD__
ftime(&xp->tb2);
+#endif
double elapsed= (double) (xp->tb2.time - xp->tb1.time)
+ ((double) (xp->tb2.millitm - xp->tb1.millitm) / 1000.0);
DBUG_PRINT("rnd_next", ("rc=%d nrd=%u fnd=%u nfd=%u sec=%.3lf\n",
|