mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
This commit is contained in:
commit
701033e7eb
1 changed files with 10 additions and 0 deletions
|
@ -5130,6 +5130,14 @@ end:
|
||||||
dynstr_free(&ds_execute_warnings);
|
dynstr_free(&ds_execute_warnings);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Close the statement if - no reconnect, need new prepare */
|
||||||
|
if (mysql->reconnect)
|
||||||
|
{
|
||||||
|
mysql_stmt_close(stmt);
|
||||||
|
cur_con->stmt= NULL;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
We save the return code (mysql_stmt_errno(stmt)) from the last call sent
|
We save the return code (mysql_stmt_errno(stmt)) from the last call sent
|
||||||
to the server into the mysqltest builtin variable $mysql_errno. This
|
to the server into the mysqltest builtin variable $mysql_errno. This
|
||||||
|
@ -5935,6 +5943,8 @@ int main(int argc, char **argv)
|
||||||
break;
|
break;
|
||||||
case Q_ENABLE_RECONNECT:
|
case Q_ENABLE_RECONNECT:
|
||||||
set_reconnect(&cur_con->mysql, 1);
|
set_reconnect(&cur_con->mysql, 1);
|
||||||
|
/* Close any open statements - no reconnect, need new prepare */
|
||||||
|
close_statements();
|
||||||
break;
|
break;
|
||||||
case Q_DISABLE_PARSING:
|
case Q_DISABLE_PARSING:
|
||||||
if (parsing_disabled == 0)
|
if (parsing_disabled == 0)
|
||||||
|
|
Loading…
Add table
Reference in a new issue