Merge branch 'PHP-5.4'

felipensp · felipensp · commit 5cf6334e847c · 2012-10-12T19:43:00.000-03:00
* PHP-5.4:
  - Fixed bug #63214 (Large PDO Firebird Queries)
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
@@ -401,7 +401,7 @@ static int firebird_alloc_prepare_stmt(pdo_dbh_t *dbh, const char *sql, long sql
 	long l, pindex = -1;
 		
 	/* Firebird allows SQL statements up to 64k, so bail if it doesn't fit */
-	if (sql_len > SHORT_MAX) {
+	if (sql_len > 65536) {
 		strcpy(dbh->error_code, "01004");
 		return 0;
 	}

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ static int firebird_alloc_prepare_stmt(pdo_dbh_t dbh, const char sql, long sql`
`401`	`401`	`long l, pindex = -1;`
`402`	`402`
`403`	`403`	`/* Firebird allows SQL statements up to 64k, so bail if it doesn't fit */`
`404`		`- if (sql_len > SHORT_MAX) {`
	`404`	`+ if (sql_len > 65536) {`
`405`	`405`	`strcpy(dbh->error_code, "01004");`
`406`	`406`	`return 0;`
`407`	`407`	`}`