Merge branch '1.0'

2017-11-14 11:39:30 +03:00
parent 3aa143f80c 0169d42681
commit d258e49784
1 changed files with 2 additions and 1 deletions
--- a/src/drivers/pgsql/drv_pgsql.c
+++ b/src/drivers/pgsql/drv_pgsql.c
@ -531,7 +531,8 @@ static db_error_t pgsql_check_status(db_conn_t *con, PGresult *pgres,
    con->sql_errmsg = strdup(PQresultErrorField(pgres, PG_DIAG_MESSAGE_PRIMARY));

    if (!strcmp(con->sql_state, "40P01") /* deadlock_detected */ ||
-        !strcmp(con->sql_state, "23505") /* unique violation */)
+        !strcmp(con->sql_state, "23505") /* unique violation */ ||
+        !strcmp(con->sql_state, "40001"))/* serialization_failure */
    {
      PGresult *tmp;
      tmp = PQexec(pgcon, "ROLLBACK");