database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

BUG#10267 mysqltest, wrong number of loops when a script is sourced within a loop

Browse Source
This commit is contained in:
msvensson@neptunus.(none)
2005-08-16 17:10:52 +02:00
parent 447a119407
commit 9ed35f83fa
3 changed files with 105 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/mysqltest.c
View File

@ -962,7 +962,13 @@ int do_source(struct st_query* q)
*p++= 0;
check_eol_junk(p);
}
/* If this file has already been sourced, dont source it again.
It's already available in the q_lines cache */
if (parser.current_line < (parser.read_lines - 1))
return 0;
return open_file(name);
}
@ -2378,7 +2384,7 @@ int read_query(struct st_query** q_ptr)
DBUG_PRINT("warning",("too long query"));
DBUG_RETURN(1);
}
DBUG_PRINT("info", ("query: %s", read_query_buf));
DBUG_PRINT("info", ("query: %s", read_query_buf));
if (*p == '#')
{
q->type = Q_COMMENT;