mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Don't close connection to mysql before 'safe_exit', that is done in 'safe_exit' if it decides to exit.
This commit is contained in:
@ -959,7 +959,6 @@ static int dbConnect(char *host, char *user,char *passwd)
|
|||||||
compatible_mode_normal_str);
|
compatible_mode_normal_str);
|
||||||
if (mysql_query_with_error_report(mysql, 0, buff))
|
if (mysql_query_with_error_report(mysql, 0, buff))
|
||||||
{
|
{
|
||||||
mysql_close(mysql);
|
|
||||||
safe_exit(EX_MYSQLERR);
|
safe_exit(EX_MYSQLERR);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -972,7 +971,6 @@ static int dbConnect(char *host, char *user,char *passwd)
|
|||||||
my_snprintf(buff, sizeof(buff), "/*!40103 SET TIME_ZONE='+00:00' */");
|
my_snprintf(buff, sizeof(buff), "/*!40103 SET TIME_ZONE='+00:00' */");
|
||||||
if (mysql_query_with_error_report(mysql, 0, buff))
|
if (mysql_query_with_error_report(mysql, 0, buff))
|
||||||
{
|
{
|
||||||
mysql_close(mysql);
|
|
||||||
safe_exit(EX_MYSQLERR);
|
safe_exit(EX_MYSQLERR);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user