cvs: /php4 ChangeLog /php4/ext/mysql mysql.c

zeev Tue Aug 17 18:06:55 1999 EDT Modified files: /php4 ChangeLog /php4/ext/mysql mysql.c Log: Fix #2090 Index: php4/ChangeLog diff -u php4/ChangeLog:1.59 php4/ChangeLog:1.60 --- php4/ChangeLog:1.59 Tue Aug 17 18:01:10 1999 +++ php4/ChangeLog Tue Aug 17 18:06:54 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ?? 1999, Version 4.0 Beta 3 +- Fixed mysql_errno() to work with recent versions of MySQL (Zeev) - Fixed a problem with define() and boolean values (Zeev) - Fixed inclusion of gd/freetype functions (Sascha) - Fixed persistency of MHASH_* constants (Sascha) Index: php4/ext/mysql/mysql.c diff -u php4/ext/mysql/mysql.c:1.19 php4/ext/mysql/mysql.c:1.20 --- php4/ext/mysql/mysql.c:1.19 Sat Aug 14 06:04:04 1999 +++ php4/ext/mysql/mysql.c Tue Aug 17 18:06:55 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysql.c,v 1.19 1999/08/14 10:04:04 zeev Exp $ */ +/* $Id: mysql.c,v 1.20 1999/08/17 22:06:55 zeev Exp $ */ /* TODO: @@ -69,8 +69,12 @@ #if MYSQL_VERSION_ID > 32199 #define mysql_row_length_type unsigned long +#define HAVE_MYSQL_ERRNO #else #define mysql_row_length_type unsigned int +# ifdef mysql_errno +# define HAVE_MYSQL_ERRNO +# endif #endif #define MYSQL_ASSOC 1<<0 @@ -90,7 +94,7 @@ PHP_FE(mysql_list_tables, NULL) PHP_FE(mysql_list_fields, NULL) PHP_FE(mysql_error, NULL) -#ifdef mysql_errno +#ifdef HAVE_MYSQL_ERRNO PHP_FE(mysql_errno, NULL) #endif PHP_FE(mysql_affected_rows, NULL) @@ -492,7 +496,7 @@ #if APACHE handler=signal(SIGPIPE,SIG_IGN); #endif -#if defined(mysql_errno) && defined(CR_SERVER_GONE_ERROR) +#if defined(HAVE_MYSQL_ERRNO) && defined(CR_SERVER_GONE_ERROR) mysql_stat(le->ptr); if (mysql_errno((MYSQL *)le->ptr) == CR_SERVER_GONE_ERROR) { #else @@ -1108,7 +1112,7 @@ /* {{{ proto int mysql_errno([int link_identifier]) Returns the number of the error message from previous MySQL operation */ -#ifdef mysql_errno +#ifdef HAVE_MYSQL_ERRNO PHP_FUNCTION(mysql_errno) { pval *mysql_link;