diff options
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 4f7548afc92..377f4f08f63 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -811,8 +811,8 @@ static int read_lines(bool execute_commands) /* Remove the '\n' */ { char *p = strrchr(line, '\n'); - if (p != NULL) - *p = '\0'; + if (p != NULL) + *p = '\0'; } #else linebuffer[0]= (char) sizeof(linebuffer); @@ -1597,9 +1597,6 @@ print_table_data(MYSQL_RES *result) MYSQL_ROW cur; MYSQL_FIELD *field; bool *num_flag; -#ifdef __NETWARE__ - uint lines= 0; -#endif num_flag=(bool*) my_alloca(sizeof(bool)*mysql_num_fields(result)); if (info_flag) @@ -1655,10 +1652,6 @@ print_table_data(MYSQL_RES *result) length, str); } (void) tee_fputs("\n", PAGER); -#ifdef __NETWARE__ - // on a long result the screen could hog the cpu - if ((lines++ & 1023) == 0) pthread_yield(); -#endif } tee_puts(separator.c_ptr(), PAGER); my_afree((gptr) num_flag); @@ -1670,9 +1663,6 @@ print_table_data_html(MYSQL_RES *result) { MYSQL_ROW cur; MYSQL_FIELD *field; -#ifdef __NETWARE__ - uint lines= 0; -#endif mysql_field_seek(result,0); (void) tee_fputs("<TABLE BORDER=1><TR>", PAGER); @@ -1697,10 +1687,6 @@ print_table_data_html(MYSQL_RES *result) (void) tee_fputs("</TD>", PAGER); } (void) tee_fputs("</TR>", PAGER); -#ifdef __NETWARE__ - // on a long result the screen could hog the cpu - if ((lines++ & 1023) == 0) pthread_yield(); -#endif } (void) tee_fputs("</TABLE>", PAGER); } @@ -1711,9 +1697,6 @@ print_table_data_xml(MYSQL_RES *result) { MYSQL_ROW cur; MYSQL_FIELD *fields; -#ifdef __NETWARE__ - uint lines= 0; -#endif mysql_field_seek(result,0); @@ -1737,10 +1720,6 @@ print_table_data_xml(MYSQL_RES *result) " ") : "NULL")); } (void) tee_fputs(" </row>\n", PAGER); -#ifdef __NETWARE__ - // on a long result the screen could hog the cpu - if ((lines++ & 1023) == 0) pthread_yield(); -#endif } (void) tee_fputs("</resultset>\n", PAGER); } @@ -1773,10 +1752,6 @@ print_table_data_vertically(MYSQL_RES *result) tee_fprintf(PAGER, "%*s: ",(int) max_length,field->name); tee_fprintf(PAGER, "%s\n",cur[off] ? (char*) cur[off] : "NULL"); } -#ifdef __NETWARE__ - // on a long result the screen could hog the cpu - if ((row_count & 1023) == 0) pthread_yield(); -#endif } } |