summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-06-20 23:29:22 +0300
committerunknown <monty@hundin.mysql.fi>2002-06-20 23:29:22 +0300
commitd471ad0c236d2d2ff23e75dc02e3095e5edb7f17 (patch)
treed12be6b8b92e0f5a11f3c2bb59da349a50187188 /client/mysql.cc
parent73a63df0f55c277d1c4dc110b13de1b8a8ff72b8 (diff)
parentc5f5706c247eecad14f91080e92f38ee831b11eb (diff)
downloadmariadb-git-d471ad0c236d2d2ff23e75dc02e3095e5edb7f17.tar.gz
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 47fdf840d3e..d6eabc1a567 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1491,7 +1491,7 @@ com_go(String *buffer,char *line __attribute__((unused)))
static void init_pager()
{
-#if !defined( __WIN__) && !defined( OS2)
+#if !defined( __WIN__) && !defined( OS2) && (!defined(HAVE_mit_thread) && defined(THREAD))
if (!opt_nopager)
{
if (!(PAGER= popen(pager, "w")))
@@ -1507,7 +1507,7 @@ static void init_pager()
static void end_pager()
{
-#if !defined( __WIN__) && !defined( OS2)
+#if !defined( __WIN__) && !defined( OS2) && (!defined(HAVE_mit_thread) && defined(THREAD))
if (!opt_nopager)
pclose(PAGER);
#endif
@@ -2498,9 +2498,11 @@ void tee_putc(int c, FILE *file)
#include <time.h>
#else
#include <sys/times.h>
+#ifdef _SC_CLK_TCK // For mit-pthreads
#undef CLOCKS_PER_SEC
#define CLOCKS_PER_SEC (sysconf(_SC_CLK_TCK))
#endif
+#endif
static ulong start_timer(void)
{