Commit 59601768 authored by unknown's avatar unknown

remove unneeded bugfix when read_line function in mysqltest has been fixed


client/mysqltest.c:
  Remove the hack "q_send_flag" which seems to be a bug fix for a buggy 'read_line' function
parent 1385320b
...@@ -5588,7 +5588,7 @@ static void mark_progress(struct st_query* q __attribute__((unused)), int line) ...@@ -5588,7 +5588,7 @@ static void mark_progress(struct st_query* q __attribute__((unused)), int line)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct st_query *q; struct st_query *q;
my_bool require_file=0, q_send_flag=0, abort_flag= 0, my_bool require_file=0, abort_flag= 0,
query_executed= 0; query_executed= 0;
char save_file[FN_REFLEN]; char save_file[FN_REFLEN];
MY_STAT res_info; MY_STAT res_info;
...@@ -5796,11 +5796,7 @@ int main(int argc, char **argv) ...@@ -5796,11 +5796,7 @@ int main(int argc, char **argv)
int flags = QUERY_REAP; int flags = QUERY_REAP;
if (q->type != Q_REAP) /* for a full query, enable the send stage */ if (q->type != Q_REAP) /* for a full query, enable the send stage */
flags |= QUERY_SEND; flags |= QUERY_SEND;
if (q_send_flag)
{
flags= QUERY_SEND;
q_send_flag=0;
}
if (save_file[0]) if (save_file[0])
{ {
strmov(q->record_file,save_file); strmov(q->record_file,save_file);
...@@ -5813,12 +5809,6 @@ int main(int argc, char **argv) ...@@ -5813,12 +5809,6 @@ int main(int argc, char **argv)
break; break;
} }
case Q_SEND: case Q_SEND:
if (!q->query[q->first_word_len])
{
/* This happens when we use 'send' on its own line */
q_send_flag=1;
break;
}
/* fix up query pointer if this is first iteration for this line */ /* fix up query pointer if this is first iteration for this line */
if (q->query == q->query_buf) if (q->query == q->query_buf)
q->query+= q->first_word_len; q->query+= q->first_word_len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment