diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-17 05:43:37 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-17 05:43:37 +0200 |
| commit | e793dfe95e70c60af4a517ba7a5255ad15d48d95 (patch) | |
| tree | a3fbfddbae0d5a6e600e68942bb243fadb5269aa /client/mysqldump.c | |
| parent | 77f5c5a7cf4e99fa3d760f1541bafec3b182def3 (diff) | |
| parent | 300b3fb64280ae3d982745b683029a2722b3daef (diff) | |
| download | mariadb-git-e793dfe95e70c60af4a517ba7a5255ad15d48d95.tar.gz | |
Merge with 4.0.11 tree to get latest bug fixes
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/rpl000004.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/structs.h:
Auto merged
Makefile.am:
Merge with 4.0.11
mysql-test/mysql-test-run.sh:
Merge with 4.0.11
mysql-test/r/rpl_log.result:
Use local version (needs to be updated)
mysql-test/t/type_blob.test:
Merge with 4.0.11
sql/mysqld.cc:
Merge with 4.0.11
sql/protocol.cc:
Use local version
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 908bdc5b51e..1e0f68eb94e 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -984,9 +984,12 @@ static void dumpTable(uint numFields, char *table) { char query[QUERY_LENGTH], *end, buff[256],table_buff[NAME_LEN+3]; MYSQL_RES *res; - MYSQL_FIELD *field; - MYSQL_ROW row; + 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"); @@ -1216,6 +1219,11 @@ 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 */ |