mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-29 04:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't truncate the .options file when a database is started without the optional options parameter.

Browse Source
This commit is contained in:
Frank M. Kromann 2005-04-11 19:22:01 +00:00
parent 2a83dbdf1c
commit 81837f718b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ext/fbsql/php_fbsql.c
View File

@ -1555,7 +1555,7 @@ PHP_FUNCTION(fbsql_create_db)
zval **fbsql_link_index = NULL, **database_name, **database_options = NULL; zval **fbsql_link_index = NULL, **database_name, **database_options = NULL;
int id; int id;
int i, status; int i, status;
char *databaseName, *databaseOptions; char *databaseName, *databaseOptions = NULL;
switch (ZEND_NUM_ARGS()) { switch (ZEND_NUM_ARGS()) {
case 1: case 1:
@ -1762,7 +1762,16 @@ PHP_FUNCTION(fbsql_start_db)
if (status == FBStopped) if (status == FBStopped)
{ {
if (!fbcehStartDatabaseNamedWithOptions(phpLink->execHandler, databaseName, databaseOptions)) int dbstarted;
if (databaseOptions != NULL)
{
dbstarted = fbcehStartDatabaseNamedWithOptions(phpLink->execHandler, databaseName, databaseOptions);
}
else
{
dbstarted = fbcehStartDatabaseNamed(phpLink->execHandler, databaseName);
}
if (!dbstarted)
{ {
char* error = fbechErrorMessage(phpLink->execHandler); char* error = fbechErrorMessage(phpLink->execHandler);
if (FB_SQL_G(generateWarnings)) if (FB_SQL_G(generateWarnings))