georg Wed Jul 7 04:02:27 2004 EDT
Modified files:
/php-src/ext/mysqli config.m4 mysqli.c mysqli_api.c mysqli_fe.c
mysqli_prop.c mysqli_report.c php_mysqli.h
Log:
added check in config.m4 for deprecated library
added support for new 4.1.3-beta functions
mysqli_stmt_field_count
mysqli_stmt_attr_set
mysqli_stmt_attr_get
removed support for deprecated/old api functions
fixed bug in constructor_get
http://cvs.php.net/diff.php/php-src/ext/mysqli/config.m4?r1=1.16&r2=1.17&ty=u
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.16 php-src/ext/mysqli/config.m4:1.17
--- php-src/ext/mysqli/config.m4:1.16 Wed Mar 31 16:11:23 2004
+++ php-src/ext/mysqli/config.m4 Wed Jul 7 04:02:27 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.16 2004/03/31 21:11:23 derick Exp $
+dnl $Id: config.m4,v 1.17 2004/07/07 08:02:27 georg Exp $
dnl config.m4 for extension mysqli
PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -44,10 +44,10 @@
PHP_EVAL_INCLINE($MYSQLI_INCLINE)
PHP_EVAL_LIBLINE($MYSQLI_LIBLINE, MYSQLI_SHARED_LIBADD)
AC_DEFINE(HAVE_MYSQLILIB,1,[ ])
- PHP_CHECK_LIBRARY(mysqlclient, mysql_bind_param,
- [
- AC_DEFINE(HAVE_MYSQLI_OLDAPI,1,[ ])
- ],[],[])
+ PHP_CHECK_LIBRARY(mysqlclient, mysql_stmt_field_count,
+ [ ],[
+ AC_MSG_ERROR([MySQLI doesn't support versions < 4.1.3 anymore. Please
update your libraries.])
+ ],[])
],[
AC_MSG_ERROR([wrong mysql library version or lib not found. Check config.log for
more information.])
],[
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.42&r2=1.43&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.42 php-src/ext/mysqli/mysqli.c:1.43
--- php-src/ext/mysqli/mysqli.c:1.42 Mon Jul 5 15:36:10 2004
+++ php-src/ext/mysqli/mysqli.c Wed Jul 7 04:02:27 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.42 2004/07/05 19:36:10 helly Exp $
+ $Id: mysqli.c,v 1.43 2004/07/07 08:02:27 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -273,7 +273,7 @@
{
mysqli_object *obj = (mysqli_object *)zend_objects_get_address(object
TSRMLS_CC);
- if (obj->zo.ce != mysqli_link_class_entry) {
+ if (obj->zo.ce != mysqli_link_class_entry && obj->zo.ce->constructor) {
return obj->zo.ce->constructor;
} else {
static zend_internal_function f;
@@ -441,6 +441,8 @@
REGISTER_LONG_CONSTANT("MYSQLI_NUM", MYSQLI_NUM, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_BOTH", MYSQLI_BOTH, CONST_CS |
CONST_PERSISTENT);
+ /* for mysqli_stmt_set_attr */
+ REGISTER_LONG_CONSTANT("MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH",
STMT_ATTR_UPDATE_MAX_LENGTH, CONST_CS | CONST_PERSISTENT);
/* column information */
REGISTER_LONG_CONSTANT("MYSQLI_NOT_NULL_FLAG", NOT_NULL_FLAG, CONST_CS |
CONST_PERSISTENT);
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.84&r2=1.85&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.84 php-src/ext/mysqli/mysqli_api.c:1.85
--- php-src/ext/mysqli/mysqli_api.c:1.84 Tue Jun 8 02:20:58 2004
+++ php-src/ext/mysqli/mysqli_api.c Wed Jul 7 04:02:27 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.84 2004/06/08 06:20:58 georg Exp $
+ $Id: mysqli_api.c,v 1.85 2004/07/07 08:02:27 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -240,7 +240,7 @@
var_cnt = argc - start;
- if (var_cnt != stmt->stmt->field_count) {
+ if (var_cnt != mysql_stmt_field_count(stmt->stmt)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Number of bind variables
doesn't match number of fields in prepared statmement.");
efree(args);
RETURN_FALSE;
@@ -321,11 +321,7 @@
}
}
-#ifndef HAVE_MYSQLI_OLDAPI
rc = mysql_stmt_bind_result(stmt->stmt, bind);
-#else
- rc = mysql_bind_result(stmt->stmt, bind);
-#endif
MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
if (rc) {
@@ -565,11 +561,7 @@
}
}
}
-#ifndef HAVE_MYSQLI_OLDAPI
if (mysql_stmt_execute(stmt->stmt)) {
-#else
- if (mysql_execute(stmt->stmt)) {
-#endif
MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
RETURN_FALSE;
}
@@ -607,11 +599,7 @@
memset(stmt->result.buf[i].val, 0, stmt->result.buf[i].buflen);
}
}
-#ifndef HAVE_MYSQLI_OLDAPI
if (!(ret = mysql_stmt_fetch(stmt->stmt))) {
-#else
- if (!(ret = mysql_fetch(stmt->stmt))) {
-#endif
for (i = 0; i < stmt->result.var_cnt; i++) {
if (stmt->result.vars[i]->type == IS_STRING &&
stmt->result.vars[i]->value.str.len) {
efree(stmt->result.vars[i]->value.str.val);
@@ -1213,25 +1201,6 @@
}
/* }}} */
-/* {{{ proto int mysqli_param_count(object stmt) {
- Return the number of parameter for the given statement */
-PHP_FUNCTION(mysqli_stmt_param_count)
-{
- MY_STMT *stmt;
- zval *mysql_stmt;
-
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
&mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
- return;
- }
- MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt");
-
-#ifndef HAVE_MYSQLI_OLDAPI
- RETURN_LONG(mysql_stmt_param_count(stmt->stmt));
-#else
- RETURN_LONG(mysql_param_count(stmt->stmt));
-#endif
-}
-/* }}} */
/* {{{ proto bool mysqli_ping(object link)
Ping a server connection or reconnect if there is no connection */
@@ -1445,11 +1414,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter
number");
RETURN_FALSE;
}
-#ifndef HAVE_MYSQLI_OLDAPI
if (mysql_stmt_send_long_data(stmt->stmt, param_nr, data, data_len)) {
-#else
- if (mysql_send_long_data(stmt->stmt, param_nr, data, data_len)) {
-#endif
RETURN_FALSE;
}
RETURN_TRUE;
@@ -1547,7 +1512,22 @@
}
/* }}} */
-#ifndef HAVE_MYSQLI_OLDAPI
+/* {{{ proto int mysqli_stmt_field_count(object stmt) {
+ Return the number of result columns for the given statement */
+PHP_FUNCTION(mysqli_stmt_field_count)
+{
+ MY_STMT *stmt;
+ zval *mysql_stmt;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
&mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
+ return;
+ }
+ MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt");
+
+ RETURN_LONG(mysql_stmt_field_count(stmt->stmt));
+}
+/* }}} */
+
/* {{{ proto void mysqli_stmt_free_result(object stmt)
Free stored result memory for the given statement handle */
PHP_FUNCTION(mysqli_stmt_free_result)
@@ -1584,6 +1564,22 @@
}
/* }}} */
+/* {{{ proto int mysqli_stmt_param_count(object stmt) {
+ Return the number of parameter for the given statement */
+PHP_FUNCTION(mysqli_stmt_param_count)
+{
+ MY_STMT *stmt;
+ zval *mysql_stmt;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
&mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
+ return;
+ }
+ MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt");
+
+ RETURN_LONG(mysql_stmt_param_count(stmt->stmt));
+}
+/* }}} */
+
/* {{{ proto void mysqli_stmt_reset(object stmt)
reset a prepared statement */
PHP_FUNCTION(mysqli_stmt_reset)
@@ -1602,7 +1598,6 @@
return;
}
/* }}} */
-#endif
/* {{{ proto mixed mysqli_stmt_num_rows(object stmt)
Return the number of rows in statements result set */
@@ -1649,7 +1644,6 @@
/* {{{ proto string mysqli_sqlstate(object link)
Returns the SQLSTATE error from previous MySQL operation */
-#if MYSQL_VERSION_ID >= 40101
PHP_FUNCTION(mysqli_sqlstate)
{
MY_MYSQL *mysql;
@@ -1661,7 +1655,6 @@
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link");
RETURN_STRING((char *)mysql_sqlstate(mysql->mysql),1);
}
-#endif
/* }}} */
/* {{{ proto bool mysqli_ssl_set(object link ,string key ,string cert ,string ca
,string capath ,string cipher])
@@ -1711,6 +1704,50 @@
/* }}} */
+/* {{{ proto int mysqli_stmt_attr_set(object stmt, long attr, bool mode)
+*/
+PHP_FUNCTION(mysqli_stmt_attr_set)
+{
+ MY_STMT *stmt;
+ zval *mysql_stmt;
+ ulong mode;
+ ulong attr;
+ int rc;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Olb",
&mysql_stmt, mysqli_stmt_class_entry, &attr, &mode) == FAILURE) {
+ return;
+ }
+ MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt");
+
+ if (rc = mysql_stmt_attr_set(stmt->stmt, attr, (void *)&mode)) {
+ RETURN_FALSE;
+ }
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto int mysqli_stmt_attr_get(object stmt, long attr)
+*/
+PHP_FUNCTION(mysqli_stmt_attr_get)
+{
+ MY_STMT *stmt;
+ zval *mysql_stmt;
+ ulong value;
+ ulong attr;
+ int rc;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol",
&mysql_stmt, mysqli_stmt_class_entry, &attr) == FAILURE) {
+ return;
+ }
+ MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt");
+
+ if (rc = mysql_stmt_attr_get(stmt->stmt, attr, &value)) {
+ RETURN_FALSE;
+ }
+ RETURN_LONG(value);
+}
+/* }}} */
+
/* {{{ proto int mysqli_stmt_errno(object stmt)
*/
PHP_FUNCTION(mysqli_stmt_errno)
@@ -1808,11 +1845,7 @@
}
MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt");
-#ifndef HAVE_MYSQLI_OLDAPI
if (!(result = mysql_stmt_result_metadata(stmt->stmt))){
-#else
- if (!(result = mysql_get_metadata(stmt->stmt))){
-#endif
MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
RETURN_FALSE;
}
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.39&r2=1.40&ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.39 php-src/ext/mysqli/mysqli_fe.c:1.40
--- php-src/ext/mysqli/mysqli_fe.c:1.39 Wed Jun 23 12:47:25 2004
+++ php-src/ext/mysqli/mysqli_fe.c Wed Jul 7 04:02:27 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.39 2004/06/23 16:47:25 georg Exp $
+ $Id: mysqli_fe.c,v 1.40 2004/07/07 08:02:27 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -117,20 +117,19 @@
PHP_FE(mysqli_rpl_probe,
NULL)
PHP_FE(mysqli_rpl_query_type, NULL)
PHP_FE(mysqli_select_db,
NULL)
-#ifndef HAVE_MYSQLI_OLDAPI
+ PHP_FE(mysqli_stmt_attr_get, NULL)
+ PHP_FE(mysqli_stmt_attr_set, NULL)
+ PHP_FE(mysqli_stmt_field_count, NULL)
PHP_FE(mysqli_stmt_init,
NULL)
PHP_FE(mysqli_stmt_prepare,
NULL)
-#endif
PHP_FE(mysqli_stmt_result_metadata, NULL)
PHP_FE(mysqli_stmt_send_long_data, NULL)
PHP_FE(mysqli_stmt_bind_param,
third_arg_force_by_ref_rest)
PHP_FE(mysqli_stmt_bind_result,
second_arg_force_by_ref_rest)
PHP_FE(mysqli_stmt_fetch,
NULL)
-#ifndef HAVE_MYSQLI_OLDAPI
PHP_FE(mysqli_stmt_free_result, NULL)
PHP_FE(mysqli_stmt_insert_id, NULL)
PHP_FE(mysqli_stmt_reset,
NULL)
-#endif
PHP_FE(mysqli_stmt_param_count, NULL)
PHP_FE(mysqli_send_query,
NULL)
#ifdef HAVE_EMBEDDED_MYSQLI
@@ -138,9 +137,7 @@
PHP_FE(mysqli_server_init,
NULL)
#endif
PHP_FE(mysqli_slave_query,
NULL)
-#if MYSQL_VERSION_ID >= 40101
PHP_FE(mysqli_sqlstate,
NULL)
-#endif
PHP_FE(mysqli_ssl_set,
NULL)
PHP_FE(mysqli_stat,
NULL)
PHP_FE(mysqli_stmt_affected_rows, NULL)
@@ -149,9 +146,7 @@
PHP_FE(mysqli_stmt_errno,
NULL)
PHP_FE(mysqli_stmt_error,
NULL)
PHP_FE(mysqli_stmt_num_rows, NULL)
-#if MYSQL_VERSION_ID >= 40101
PHP_FE(mysqli_stmt_sqlstate, NULL)
-#endif
PHP_FE(mysqli_store_result,
NULL)
PHP_FE(mysqli_stmt_store_result, NULL)
PHP_FE(mysqli_thread_id,
NULL)
@@ -226,9 +221,7 @@
PHP_FALIAS(slave_query,mysqli_slave_query,NULL)
PHP_FALIAS(ssl_set,mysqli_ssl_set,NULL)
PHP_FALIAS(stat,mysqli_stat,NULL)
-#ifndef HAVE_MYSQLI_OLDAPI
PHP_FALIAS(stmt_init,mysqli_stmt_init, NULL)
-#endif
PHP_FALIAS(store_result,mysqli_store_result,NULL)
PHP_FALIAS(thread_safe,mysqli_thread_safe,NULL)
PHP_FALIAS(use_result,mysqli_use_result,NULL)
@@ -263,7 +256,8 @@
* Every user visible function must have an entry in mysqli_stmt_functions[].
*/
function_entry mysqli_stmt_methods[] = {
- PHP_FALIAS(affected_rows,mysqli_stmt_affected_rows,NULL)
+ PHP_FALIAS(attr_get,mysqli_stmt_attr_get,NULL)
+ PHP_FALIAS(attr_set,mysqli_stmt_attr_set,NULL)
PHP_FALIAS(bind_param,mysqli_stmt_bind_param,second_arg_force_by_ref_rest)
PHP_FALIAS(bind_result,mysqli_stmt_bind_result,all_args_force_by_ref)
PHP_FALIAS(close,mysqli_stmt_close,NULL)
@@ -274,11 +268,9 @@
PHP_FALIAS(num_rows, mysqli_stmt_num_rows,NULL)
PHP_FALIAS(send_long_data,mysqli_stmt_send_long_data,NULL)
PHP_FALIAS(stmt,mysqli_prepare,NULL)
-#ifndef HAVE_MYSQLI_OLDAPI
PHP_FALIAS(free_result,mysqli_stmt_free_result,NULL)
PHP_FALIAS(reset,mysqli_stmt_reset,NULL)
PHP_FALIAS(prepare,mysqli_stmt_prepare, NULL)
-#endif
PHP_FALIAS(store_result,mysqli_stmt_store_result,NULL)
{NULL, NULL, NULL}
};
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.13 php-src/ext/mysqli/mysqli_prop.c:1.14
--- php-src/ext/mysqli/mysqli_prop.c:1.13 Sat Jun 5 14:31:56 2004
+++ php-src/ext/mysqli/mysqli_prop.c Wed Jul 7 04:02:27 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_prop.c,v 1.13 2004/06/05 18:31:56 georg Exp $
+ $Id: mysqli_prop.c,v 1.14 2004/07/07 08:02:27 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -87,6 +87,19 @@
}
/* }}} */
+/* {{{ property link_test_read */
+int link_test_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+{
+ long i;
+ ALLOC_ZVAL(*retval);
+ array_init(*retval);
+
+ for (i=0; i < 10; i++)
+ add_index_long(*retval, i, i + 10);
+ return SUCCESS;
+}
+/*i }}} */
+
/* {{{ property link_connect_errno_read */
int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
@@ -171,7 +184,7 @@
MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_insert_id_read, mysql_stmt_insert_id,
MYSQLI_GET_STMT(), my_ulonglong);
MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_num_rows_read, mysql_stmt_num_rows,
MYSQLI_GET_STMT(), my_ulonglong);
MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_param_count_read, mysql_stmt_param_count,
MYSQLI_GET_STMT(), ulong);
-//MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_field_count_read, mysql_stmt_field_count,
MYSQLI_GET_STMT(), ulong);
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_field_count_read, mysql_stmt_field_count,
MYSQLI_GET_STMT(), ulong);
MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_errno_read, mysql_stmt_errno, MYSQLI_GET_STMT(),
ulong);
MYSQLI_MAP_PROPERTY_FUNC_STRING(stmt_error_read, mysql_stmt_error, MYSQLI_GET_STMT());
MYSQLI_MAP_PROPERTY_FUNC_STRING(stmt_sqlstate_read, mysql_stmt_sqlstate,
MYSQLI_GET_STMT());
@@ -179,6 +192,7 @@
mysqli_property_entry mysqli_link_property_entries[] = {
{"affected_rows", link_affected_rows_read, NULL},
{"client_version", link_client_version_read, NULL},
+ {"test", link_test_read, NULL},
{"connect_errno", link_connect_errno_read, NULL},
{"connect_error", link_connect_error_read, NULL},
{"errno", link_errno_read, NULL},
@@ -212,9 +226,9 @@
{"param_count", stmt_param_count_read, NULL},
/* TODO: stmt->field_count doesn't work currently, remove comments until
mysqli_stmt_field_count
- is implemented in client library
- {"field_count", stmt_field_count_read, NULL},
+ is implemented in client library
*/
+ {"field_count", stmt_field_count_read, NULL},
{"errno", stmt_errno_read, NULL},
{"error", stmt_error_read, NULL},
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_report.c?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/mysqli/mysqli_report.c
diff -u php-src/ext/mysqli/mysqli_report.c:1.8 php-src/ext/mysqli/mysqli_report.c:1.9
--- php-src/ext/mysqli/mysqli_report.c:1.8 Tue Mar 16 16:43:25 2004
+++ php-src/ext/mysqli/mysqli_report.c Wed Jul 7 04:02:27 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_report.c,v 1.8 2004/03/16 21:43:25 georg Exp $
+ $Id: mysqli_report.c,v 1.9 2004/07/07 08:02:27 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -52,7 +52,6 @@
/* {{{ void php_mysqli_report_index() */
void php_mysqli_report_index(char *query, unsigned int status TSRMLS_DC) {
-#if MYSQL_VERSION_ID > 40101
char index[15];
if (status & SERVER_QUERY_NO_GOOD_INDEX_USED) {
@@ -63,9 +62,6 @@
return;
}
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s used in query/prepared
statement %s", index, query);
-#else
- return;
-#endif
}
/* }}} */
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.37&r2=1.38&ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.37 php-src/ext/mysqli/php_mysqli.h:1.38
--- php-src/ext/mysqli/php_mysqli.h:1.37 Sun Jun 6 04:52:19 2004
+++ php-src/ext/mysqli/php_mysqli.h Wed Jul 7 04:02:27 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.37 2004/06/06 08:52:19 georg Exp $
+ $Id: php_mysqli.h,v 1.38 2004/07/07 08:02:27 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -334,13 +334,14 @@
PHP_FUNCTION(mysqli_rpl_probe);
PHP_FUNCTION(mysqli_rpl_query_type);
PHP_FUNCTION(mysqli_select_db);
+PHP_FUNCTION(mysqli_stmt_attr_get);
+PHP_FUNCTION(mysqli_stmt_attr_set);
PHP_FUNCTION(mysqli_stmt_bind_param);
PHP_FUNCTION(mysqli_stmt_bind_result);
PHP_FUNCTION(mysqli_stmt_execute);
-#ifndef MYSQLI_HAVE_OLDAPI
+PHP_FUNCTION(mysqli_stmt_field_count);
PHP_FUNCTION(mysqli_stmt_init);
PHP_FUNCTION(mysqli_stmt_prepare);
-#endif
PHP_FUNCTION(mysqli_stmt_fetch);
PHP_FUNCTION(mysqli_stmt_param_count);
PHP_FUNCTION(mysqli_stmt_send_long_data);
@@ -350,9 +351,7 @@
PHP_FUNCTION(mysqli_server_end);
#endif
PHP_FUNCTION(mysqli_slave_query);
-#if MYSQL_VERSION_ID >= 40101
PHP_FUNCTION(mysqli_sqlstate);
-#endif
PHP_FUNCTION(mysqli_ssl_set);
PHP_FUNCTION(mysqli_stat);
PHP_FUNCTION(mysqli_stmt_affected_rows);
@@ -360,15 +359,11 @@
PHP_FUNCTION(mysqli_stmt_data_seek);
PHP_FUNCTION(mysqli_stmt_errno);
PHP_FUNCTION(mysqli_stmt_error);
-#ifndef HAVE_MYSQLI_OLDAPI
PHP_FUNCTION(mysqli_stmt_free_result);
PHP_FUNCTION(mysqli_stmt_reset);
-#endif
PHP_FUNCTION(mysqli_stmt_insert_id);
PHP_FUNCTION(mysqli_stmt_num_rows);
-#if MYSQL_VERSION_ID >= 40101
PHP_FUNCTION(mysqli_stmt_sqlstate);
-#endif
PHP_FUNCTION(mysqli_stmt_store_result);
PHP_FUNCTION(mysqli_store_result);
PHP_FUNCTION(mysqli_thread_id);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
