Blame libnss-mysql-mariadb10.2.patch
|
Jan ONDREJ (SAL) |
3c797a0 |
diff -Naur libnss-mysql-1.5-ORIG/src/mysql.c libnss-mysql-1.5/src/mysql.c
|
|
Jan ONDREJ (SAL) |
3c797a0 |
--- libnss-mysql-1.5-ORIG/src/mysql.c 2017-07-12 13:54:26.301373472 +0200
|
|
Jan ONDREJ (SAL) |
3c797a0 |
+++ libnss-mysql-1.5/src/mysql.c 2017-07-12 14:06:10.666251792 +0200
|
|
Jan ONDREJ (SAL) |
3c797a0 |
@@ -196,6 +196,7 @@
|
|
Jan ONDREJ (SAL) |
3c797a0 |
int retval;
|
|
Jan ONDREJ (SAL) |
3c797a0 |
sql_server_t *server = &conf.sql.server;
|
|
Jan ONDREJ (SAL) |
3c797a0 |
unsigned int port;
|
|
Jan ONDREJ (SAL) |
3c797a0 |
+ my_bool reconnect = 1;
|
|
Jan ONDREJ (SAL) |
3c797a0 |
|
|
Jan ONDREJ (SAL) |
3c797a0 |
DENTER
|
|
Jan ONDREJ (SAL) |
3c797a0 |
|
|
Jan ONDREJ (SAL) |
3c797a0 |
@@ -238,8 +239,9 @@
|
|
Jan ONDREJ (SAL) |
3c797a0 |
DSRETURN (NSS_UNAVAIL)
|
|
Jan ONDREJ (SAL) |
3c797a0 |
}
|
|
Jan ONDREJ (SAL) |
3c797a0 |
ci.valid = ntrue;
|
|
Jan ONDREJ (SAL) |
3c797a0 |
- ci.link.reconnect = 0; /* Safety: We can't let MySQL assume socket is
|
|
Jan ONDREJ (SAL) |
3c797a0 |
- still valid; see _nss_mysql_validate_socket */
|
|
Jan ONDREJ (SAL) |
3c797a0 |
+ /* Safety: We can't let MySQL assume socket is still valid;
|
|
Jan ONDREJ (SAL) |
3c797a0 |
+ see _nss_mysql_validate_socket */
|
|
Jan ONDREJ (SAL) |
3c797a0 |
+ mysql_options(&ci.link, MYSQL_OPT_RECONNECT, &reconnect);
|
|
Jan ONDREJ (SAL) |
3c797a0 |
DSRETURN (NSS_SUCCESS)
|
|
Jan ONDREJ (SAL) |
3c797a0 |
}
|
|
Jan ONDREJ (SAL) |
3c797a0 |
_nss_mysql_log (LOG_ALERT, "Connection to server '%s' failed: %s",
|