cvs: php4 /ext/mysql php_mysql.c

sniper Fri Jul 12 19:25:30 2002 EDT Modified files: /php4/ext/mysql php_mysql.c Log: Partially reverted the netware related commit. Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.141 php4/ext/mysql/php_mysql.c:1.142 --- php4/ext/mysql/php_mysql.c:1.141 Fri Jul 12 18:59:35 2002 +++ php4/ext/mysql/php_mysql.c Fri Jul 12 19:25:30 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.141 2002/07/12 22:59:35 sniper Exp $ */ +/* $Id: php_mysql.c,v 1.142 2002/07/12 23:25:30 sniper Exp $ */ /* TODO: * @@ -299,7 +299,7 @@ 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 @@ RETURN_STRING((char *)mysql_character_set_name(&mysql->conn), 1); } /* }}} */ - - #endif #if MYSQL_VERSION_ID < 40000 @@ -1109,16 +1107,12 @@ 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 @@ 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