diff options
| author | foobar <sniper@php.net> | 2002-07-12 23:25:30 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-07-12 23:25:30 +0000 |
| commit | 5d001a9ab62f733ca6006fce01242f55a256e833 (patch) | |
| tree | 91f566040b3ba335f9b81fe41b2ac162ead0c77d /ext/mysql/php_mysql.c | |
| parent | 20a735db2cf14ce1969de0d15204a611e270c4d0 (diff) | |
| download | php-git-5d001a9ab62f733ca6006fce01242f55a256e833.tar.gz | |
Partially reverted the netware related commit.
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 8f5ce4aaac..49564c27dc 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -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 |