mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
Merge latest MariaDB 5.5 into MWL#192: Non-blocking client library.
This commit is contained in:
commit
9305f2b52f
281 changed files with 7981 additions and 3760 deletions
|
|
@ -1884,6 +1884,8 @@ static void DBUGOpenFile(CODE_STATE *cs,
|
|||
name=cs->stack->name;
|
||||
if (strcmp(name, "-") == 0)
|
||||
{
|
||||
if (!is_shared(cs->stack, out_file))
|
||||
DBUGCloseFile(cs, cs->stack->out_file);
|
||||
cs->stack->out_file= stdout;
|
||||
cs->stack->flags |= FLUSH_ON_WRITE;
|
||||
cs->stack->name[0]=0;
|
||||
|
|
@ -1906,6 +1908,8 @@ static void DBUGOpenFile(CODE_STATE *cs,
|
|||
}
|
||||
else
|
||||
{
|
||||
if (!is_shared(cs->stack, out_file))
|
||||
DBUGCloseFile(cs, cs->stack->out_file);
|
||||
cs->stack->out_file= fp;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue