diff options
| author | unknown <greg@mysql.com> | 2003-03-28 14:24:32 -0500 |
|---|---|---|
| committer | unknown <greg@mysql.com> | 2003-03-28 14:24:32 -0500 |
| commit | 9c3d7df569998425c55312bfc6a890346762d26e (patch) | |
| tree | e7d6d77bba01f8deac042852298bd68bae0527ad /client/mysqldump.c | |
| parent | 9dc2425066d69f8d0084e115a67846929972cf3f (diff) | |
| download | mariadb-git-9c3d7df569998425c55312bfc6a890346762d26e.tar.gz | |
Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches
client/mysql.cc:
NetWare only: Remove pthread_yield on large screen results
client/mysqldump.c:
NetWare only: Remove pthread_yield on large screen results
include/my_pthread.h:
NetWare only: pthread_cond_timedwait now present in LibC
mysys/default.c:
Add conditional for NetWare
mysys/my_init.c:
Changes to netware_init
mysys/my_pthread.c:
NetWare only: special my_pthread_cond_timedwait no longer needed
mysys/thr_mutex.c:
NetWare: no need for pthread_mutex_lock calls
netware/BUILD/mwenv:
Add zlib to environment variables
netware/Makefile.am:
Add isam/isamchk.def to netware_build_files
scripts/make_binary_distribution.sh:
Made bin directory files more flexible for alternate platforms, without unnecessary repetition
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 72d9200a6f6..49d984d4eb0 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -30,7 +30,7 @@ ** master/autocommit code by Brian Aker <brian@tangent.org> ** SSL by ** Andrei Errapart <andreie@no.spam.ee> -** Tõnu Samuel <tonu@please.do.not.remove.this.spam.ee> +** Tõnu Samuel <tonu@please.do.not.remove.this.spam.ee> ** XML by Gary Huntress <ghuntress@mediaone.net> 10/10/01, cleaned up ** and adapted to mysqldump 05/11/01 by Jani Tolonen ** Added --single-transaction option 06/06/2002 by Peter Zaitsev @@ -986,9 +986,6 @@ static void dumpTable(uint numFields, char *table) MYSQL_FIELD *field; MYSQL_ROW row; ulong rownr, row_break, total_length, init_length; -#if defined(__NETWARE__) && defined(THREAD) - uint lines= 0; -#endif if (verbose) fprintf(stderr, "-- Sending SELECT query...\n"); @@ -1218,11 +1215,6 @@ static void dumpTable(uint numFields, char *table) } else if (!opt_xml) fputs(");\n", md_result_file); -#if defined(__NETWARE__) && defined(THREAD) - /* on a long result the screen could hog the cpu */ - if ((lines++ & 1023) == 0) - pthread_yield(); -#endif } /* XML - close table tag and supress regular output */ |