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

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
This commit is contained in:
msvensson@neptunus.(none)
2005-09-05 17:01:15 +02:00
parent 6f8e870ca6 72228ea825
commit 7f848c1784
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/mysqltest.c
View File

@ -2169,8 +2169,10 @@ int read_line(char *buf, int size)
if (feof(cur_file->file))
{
found_eof:
if (cur_file->file != stdin)
if (cur_file->file != stdin){
my_fclose(cur_file->file, MYF(0));
cur_file->file= 0;
}
my_free((gptr)cur_file->file_name, MYF(MY_ALLOW_ZERO_PTR));
cur_file->file_name= 0;
lineno--;
@ -2556,10 +2558,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
argument= buff;
}
fn_format(buff, argument, "", "", 4);
DBUG_ASSERT(cur_file->file == 0);
DBUG_ASSERT(cur_file == file_stack && cur_file->file == 0);
if (!(cur_file->file=
my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(MY_WME))))
die("Could not open %s: errno = %d", argument, errno);
die("Could not open %s: errno = %d", buff, errno);
cur_file->file_name= my_strdup(buff, MYF(MY_FAE));
break;
}
case 'm':
@ -3746,9 +3749,8 @@ int main(int argc, char **argv)
embedded_server_args,
(char**) embedded_server_groups))
die("Can't initialize MySQL server");
if (cur_file == file_stack)
if (cur_file == file_stack && cur_file->file == 0)
{
DBUG_ASSERT(cur_file->file == 0);
cur_file->file= stdin;
cur_file->file_name= my_strdup("<stdin>", MYF(MY_WME));
}