cvs: php4 /ext/mysql php_mysql.c php_mysql.h

sniper Fri Nov 2 01:42:12 2001 EDT Modified files: /php4/ext/mysql php_mysql.c php_mysql.h Log: Make the extension work with MySQL 4.0 Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.103 php4/ext/mysql/php_mysql.c:1.104 --- php4/ext/mysql/php_mysql.c:1.103 Thu Oct 11 19:33:18 2001 +++ php4/ext/mysql/php_mysql.c Fri Nov 2 01:42:12 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.103 2001/10/11 23:33:18 ssb Exp $ */ +/* $Id: php_mysql.c,v 1.104 2001/11/02 06:42:12 sniper Exp $ */ /* TODO: @@ -60,7 +60,7 @@ # else # include <mysql.h> # endif -#ifdef HAVE_MYSQL_REAL_CONNECT + #ifdef HAVE_ERRMSG_H #include <errmsg.h> #endif @@ -117,8 +117,10 @@ PHP_FE(mysql_pconnect, NULL) PHP_FE(mysql_close, NULL) PHP_FE(mysql_select_db, NULL) +#if MYSQL_VERSION_ID < 40000 PHP_FE(mysql_create_db, NULL) PHP_FE(mysql_drop_db, NULL) +#endif PHP_FE(mysql_query, NULL) PHP_FE(mysql_unbuffered_query, NULL) PHP_FE(mysql_db_query, NULL) @@ -164,8 +166,10 @@ PHP_FALIAS(mysql_fieldtype, mysql_field_type, NULL) PHP_FALIAS(mysql_fieldflags, mysql_field_flags, NULL) PHP_FALIAS(mysql_selectdb, mysql_select_db, NULL) +#if MYSQL_VERSION_ID < 40000 PHP_FALIAS(mysql_createdb, mysql_create_db, NULL) PHP_FALIAS(mysql_dropdb, mysql_drop_db, NULL) +#endif PHP_FALIAS(mysql_freeresult, mysql_free_result, NULL) PHP_FALIAS(mysql_numfields, mysql_num_fields, NULL) PHP_FALIAS(mysql_numrows, mysql_num_rows, NULL) @@ -332,6 +336,12 @@ REGISTER_LONG_CONSTANT("MYSQL_USE_RESULT", MYSQL_USE_RESULT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQL_STORE_RESULT", MYSQL_STORE_RESULT, CONST_CS | CONST_PERSISTENT); +#ifdef ZTS +# if MYSQL_VERSION_ID >= 40000 + mysql_thread_init(); +# endif +#endif + return SUCCESS; } /* }}} */ @@ -340,6 +350,12 @@ */ PHP_MSHUTDOWN_FUNCTION(mysql) { +#ifdef ZTS +# if MYSQL_VERSION_ID >= 40000 + mysql_thread_end(); +# endif +#endif + UNREGISTER_INI_ENTRIES(); return SUCCESS; } @@ -874,6 +890,7 @@ #endif +#if MYSQL_VERSION_ID < 40000 /* {{{ proto int mysql_create_db(string database_name [, int link_identifier]) Create a MySQL database */ PHP_FUNCTION(mysql_create_db) @@ -950,6 +967,7 @@ } } /* }}} */ +#endif /* {{{ php_mysql_do_query_general */ @@ -2034,7 +2052,6 @@ RETURN_TRUE; } /* }}} */ -#endif /* Index: php4/ext/mysql/php_mysql.h diff -u php4/ext/mysql/php_mysql.h:1.23 php4/ext/mysql/php_mysql.h:1.24 --- php4/ext/mysql/php_mysql.h:1.23 Sun Jul 29 21:56:30 2001 +++ php4/ext/mysql/php_mysql.h Fri Nov 2 01:42:12 2001 @@ -17,7 +17,7 @@ */ -/* $Id: php_mysql.h,v 1.23 2001/07/30 01:56:30 zeev Exp $ */ +/* $Id: php_mysql.h,v 1.24 2001/11/02 06:42:12 sniper Exp $ */ #ifndef PHP_MYSQL_H #define PHP_MYSQL_H @@ -48,8 +48,10 @@ PHP_FUNCTION(mysql_pconnect); PHP_FUNCTION(mysql_close); PHP_FUNCTION(mysql_select_db); +#if MYSQL_VERSION_ID < 40000 PHP_FUNCTION(mysql_create_db); PHP_FUNCTION(mysql_drop_db); +#endif PHP_FUNCTION(mysql_query); PHP_FUNCTION(mysql_unbuffered_query); PHP_FUNCTION(mysql_db_query);