diff options
| -rw-r--r-- | client/mysqldump.c | 12 | ||||
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 023e35cf7c9..e7d2b8bebe1 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 */ diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 49c5b0f51b7..3ccf5301503 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -272,6 +272,7 @@ echo "Starting $MYSQLD daemon with databases from $DATADIR" echo "`date +'%y%m%d %H:%M:%S mysqld started'`" >> $err_log while true do + rm -f $MYSQL_UNIX_PORT $pid_file # Some extra safety if test -z "$args" then $NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR $USER_OPTION --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1 @@ -310,7 +311,6 @@ do I=`expr $I + 1` done fi - rm -f $MYSQL_UNIX_PORT $pid_file # Some extra safety echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log done |