Commit 250b4d40 authored by unknown's avatar unknown

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1


client/mysqltest.c:
  Auto merged
parents 6c8a2828 1910f4dd
......@@ -2608,11 +2608,7 @@ int main(int argc, char **argv)
/* fix up query pointer if this is * first iteration for this line */
if (q->query == q->query_buf)
q->query += q->first_word_len + 1;
switch(q->type)
{
case Q_QUERY_VERTICAL: display_result_vertically= TRUE; break;
case Q_QUERY_HORIZONTAL: display_result_vertically= FALSE; break;
}
display_result_vertically= (q->type==Q_QUERY_VERTICAL);
error |= run_query(&cur_con->mysql, q, QUERY_REAP|QUERY_SEND);
display_result_vertically= old_display_result_vertically;
break;
......
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