Commit ba15ea11 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

Merge branch '11.6' into 11.6

parents a4effbf9 523ef2a1
...@@ -816,8 +816,6 @@ static MYSQL *db_connect(char *host, char *database, ...@@ -816,8 +816,6 @@ static MYSQL *db_connect(char *host, char *database,
db_error(mysql); db_error(mysql);
if (mysql_query(mysql, "set @save_tz=@@session.time_zone")) if (mysql_query(mysql, "set @save_tz=@@session.time_zone"))
db_error(mysql); db_error(mysql);
if (mysql_query(mysql, "set unique_checks= 0"))
db_error(mysql);
if (mysql_query(mysql, "/*M!100200 set check_constraint_checks=0*/")) if (mysql_query(mysql, "/*M!100200 set check_constraint_checks=0*/"))
db_error(mysql); db_error(mysql);
return mysql; return mysql;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment