clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Partially reverted the netware related commit.

Browse Source
This commit is contained in:
foobar 2002-07-12 23:25:30 +00:00
parent 20a735db2c
commit 5d001a9ab6
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/mysql/php_mysql.c
View File

@ -299,7 +299,7 @@ static void _close_mysql_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC)
static PHP_INI_MH(OnMySQLPort)
{
if (new_value==NULL) { /* default port */
#if !defined (PHP_WIN32) && ! defined (NETWARE)
#if !defined(PHP_WIN32) && !defined(NETWARE)
struct servent *serv_ptr;
char *env;
@ -1074,8 +1074,6 @@ PHP_FUNCTION(mysql_character_set_name)
RETURN_STRING((char *)mysql_character_set_name(&mysql->conn), 1);
}
/* }}} */
#endif
#if MYSQL_VERSION_ID < 40000
@ -1109,16 +1107,12 @@ PHP_FUNCTION(mysql_create_db)
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink);
convert_to_string_ex(db);
#ifndef NETWARE
if (mysql_create_db(&mysql->conn, Z_STRVAL_PP(db))==0) {
RETURN_TRUE;
} else {
RETURN_FALSE;
}
#else
php_error(E_WARNING, "mysql_create_db is not supported on NetWare");
RETURN_FALSE;
#endif
}
/* }}} */
@ -1153,16 +1147,12 @@ PHP_FUNCTION(mysql_drop_db)
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink);
convert_to_string_ex(db);
#ifndef NETWARE
if (mysql_drop_db(&mysql->conn, Z_STRVAL_PP(db))==0) {
RETURN_TRUE;
} else {
RETURN_FALSE;
}
#else
php_error(E_WARNING, "mysql_drop_db is not supported on NetWare");
RETURN_FALSE;
#endif
}
/* }}} */
#endif