diff options
| author | serg@serg.mysql.com <> | 2003-02-18 20:35:57 +0100 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2003-02-18 20:35:57 +0100 |
| commit | cc2dda24b679d2e24c9994f8ec7ccdffe8fb17a9 (patch) | |
| tree | 62728ce3ab41acfa23776241868b49b258d7a259 /client | |
| parent | 98e85fdc43143cc82150b6b372430da16e0e4f97 (diff) | |
| parent | ed6a85b4229d918fc5857434eccf0fa462976241 (diff) | |
| download | mariadb-git-cc2dda24b679d2e24c9994f8ec7ccdffe8fb17a9.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 3 | ||||
| -rw-r--r-- | client/mysqldump.c | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 5f84261bd82..da52fb54e7d 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1702,6 +1702,9 @@ print_table_data_xml(MYSQL_RES *result) { MYSQL_ROW cur; MYSQL_FIELD *fields; +#ifdef __NETWARE__ + uint lines= 0; +#endif mysql_field_seek(result,0); diff --git a/client/mysqldump.c b/client/mysqldump.c index da02c49dd69..f242b55159d 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -894,9 +894,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"); @@ -1123,6 +1126,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 */ |