Attachment #22294 for bug #45407

View | Details | Raw Unified | Return to bug 45407
Collapse All | Expand All




 *  keys, each followed by an equal sign and a value. Such key/value pairs can
 *  be delimited by space, CR, LF, tab, semicolon, vertical bar or comma.
 *  @remarks MySQL: the params can have "host", "port", "user", "pass",
 *  "dbname", "sock", "flags" "fldsz", "group" and "reconnect" keys, each
 *  followed by an equal sign and a value. Such key/value pairs can be
 *  delimited by space, CR, LF, tab, semicolon, vertical bar or comma. For
 *  now, "flags" can only recognise CLIENT_FOUND_ROWS (check MySQL manual for
 *  details). The value associated with "fldsz" determines maximum amount of
 *  memory (in bytes) for each of the fields in the result set of prepared
 *  statements. By default, this value is 1 MB. The value associated with
 *  "group" determines which group from configuration file to use (see
 *  MYSQL_READ_DEFAULT_GROUP option of mysql_options() in MySQL manual).
 *  Reconnect is set to 1 by default (i.e. true).
 *  @remarks FreeTDS: the params can have "username", "password", "appname",
 *  "dbname", "host", "charset", "lang" and "server" keys, each followed by an
 *  equal sign and a value.

Lines 1104-1109 Link Here

(-)dbd/apr_dbd_mysql.c (+6 lines)
1104	{"flags", NULL},	1104	{"flags", NULL},
1105	{"fldsz", NULL},	1105	{"fldsz", NULL},
1106	{"group", NULL},	1106	{"group", NULL},
		1107	{"reconnect", NULL},
1107	{NULL, NULL}	1108	{NULL, NULL}
1108	};	1109	};
1109	unsigned int port = 0;	1110	unsigned int port = 0;
Lines 1155-1160 Link Here
1155	if (fields[8].value != NULL) {	1156	if (fields[8].value != NULL) {
1156	mysql_options(sql->conn, MYSQL_READ_DEFAULT_GROUP, fields[8].value);	1157	mysql_options(sql->conn, MYSQL_READ_DEFAULT_GROUP, fields[8].value);
1157	}	1158	}
		1159	#if MYSQL_VERSION_ID >= 50013
		1160	if (fields[9].value != NULL) {
		1161	do_reconnect = atoi(fields[9].value) ? 1 : 0;
		1162	}
		1163	#endif
1158		1164
1159	#if MYSQL_VERSION_ID >= 50013	1165	#if MYSQL_VERSION_ID >= 50013
1160	/* the MySQL manual says this should be BEFORE mysql_real_connect */	1166	/* the MySQL manual says this should be BEFORE mysql_real_connect */

Return to bug 45407

Lines 126-140 Link Here

(-)include/apr_dbd.h (-9 / +10 lines)
126	* keys, each followed by an equal sign and a value. Such key/value pairs can	126	* keys, each followed by an equal sign and a value. Such key/value pairs can
127	* be delimited by space, CR, LF, tab, semicolon, vertical bar or comma.	127	* be delimited by space, CR, LF, tab, semicolon, vertical bar or comma.
128	* @remarks MySQL: the params can have "host", "port", "user", "pass",	128	* @remarks MySQL: the params can have "host", "port", "user", "pass",
129	* "dbname", "sock", "flags" "fldsz" and "group" keys, each followed by an	129	* "dbname", "sock", "flags" "fldsz", "group" and "reconnect" keys, each
130	* equal sign and a value. Such key/value pairs can be delimited by space,	130	* followed by an equal sign and a value. Such key/value pairs can be
131	* CR, LF, tab, semicolon, vertical bar or comma. For now, "flags" can only	131	* delimited by space, CR, LF, tab, semicolon, vertical bar or comma. For
132	* recognise CLIENT_FOUND_ROWS (check MySQL manual for details). The value	132	* now, "flags" can only recognise CLIENT_FOUND_ROWS (check MySQL manual for
133	* associated with "fldsz" determines maximum amount of memory (in bytes) for	133	* details). The value associated with "fldsz" determines maximum amount of
134	* each of the fields in the result set of prepared statements. By default,	134	* memory (in bytes) for each of the fields in the result set of prepared
135	* this value is 1 MB. The value associated with "group" determines which	135	* statements. By default, this value is 1 MB. The value associated with
136	* group from configuration file to use (see MYSQL_READ_DEFAULT_GROUP option	136	* "group" determines which group from configuration file to use (see
137	* of mysql_options() in MySQL manual).	137	* MYSQL_READ_DEFAULT_GROUP option of mysql_options() in MySQL manual).
		138	* Reconnect is set to 1 by default (i.e. true).
138	* @remarks FreeTDS: the params can have "username", "password", "appname",	139	* @remarks FreeTDS: the params can have "username", "password", "appname",
139	* "dbname", "host", "charset", "lang" and "server" keys, each followed by an	140	* "dbname", "host", "charset", "lang" and "server" keys, each followed by an
140	* equal sign and a value.	141	* equal sign and a value.