georg Thu Sep 25 07:19:26 2003 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c mysqli_fe.c php_mysqli.h
Log:
mysql_prepare_result -> mysqli_get_metadata
This function was renamed in libmysql (changeset 1.607 by monty)
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.45 php-src/ext/mysqli/mysqli_api.c:1.46
--- php-src/ext/mysqli/mysqli_api.c:1.45 Tue Sep 16 15:45:22 2003
+++ php-src/ext/mysqli/mysqli_api.c Thu Sep 25 07:19:25 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.45 2003/09/16 19:45:22 hholzgra Exp $
+ $Id: mysqli_api.c,v 1.46 2003/09/25 11:19:25 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1325,9 +1325,9 @@
}
/* }}} */
-/* {{{ proto resource mysqli_prepare_result(object stmt)
+/* {{{ proto resource mysqli_get_metadata(object stmt)
*/
-PHP_FUNCTION(mysqli_prepare_result)
+PHP_FUNCTION(mysqli_get_metadata)
{
STMT *stmt;
MYSQL_RES *result;
@@ -1340,7 +1340,7 @@
}
MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, &mysql_stmt,
"mysqli_stmt");
- if (!(result = mysql_prepare_result(stmt->stmt))){
+ if (!(result = mysql_get_metadata(stmt->stmt))){
RETURN_FALSE;
}
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.18 php-src/ext/mysqli/mysqli_fe.c:1.19
--- php-src/ext/mysqli/mysqli_fe.c:1.18 Sun Aug 3 14:51:26 2003
+++ php-src/ext/mysqli/mysqli_fe.c Thu Sep 25 07:19:25 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.18 2003/08/03 18:51:26 helly Exp $
+ $Id: mysqli_fe.c,v 1.19 2003/09/25 11:19:25 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -98,7 +98,7 @@
PHP_FE(mysqli_param_count,
NULL)
PHP_FE(mysqli_ping,
NULL)
PHP_FE(mysqli_prepare,
NULL)
- PHP_FE(mysqli_prepare_result, NULL)
+ PHP_FE(mysqli_get_metadata,
NULL)
PHP_FE(mysqli_profiler,
NULL)
PHP_FE(mysqli_query,
NULL)
PHP_FE(mysqli_read_query_result, NULL)
@@ -238,16 +238,17 @@
PHP_FALIAS(affected_rows,mysqli_stmt_affected_rows,NULL)
PHP_FALIAS(bind_param,mysqli_bind_param,second_arg_force_by_ref_rest)
PHP_FALIAS(bind_result,mysqli_bind_result, all_args_by_ref)
- PHP_FALIAS(execute,mysqli_execute,NULL)
- PHP_FALIAS(fetch,mysqli_fetch,NULL)
- PHP_FALIAS(param_count,mysqli_param_count,NULL)
- PHP_FALIAS(send_long_data,mysqli_send_long_data,NULL)
- PHP_FALIAS(store_result,mysqli_stmt_store_result,NULL)
PHP_FALIAS(close,mysqli_stmt_close,NULL)
PHP_FALIAS(data_seek,mysqli_stmt_data_seek,NULL)
PHP_FALIAS(errno,mysqli_stmt_errno,NULL)
PHP_FALIAS(error,mysqli_stmt_error,NULL)
+ PHP_FALIAS(execute,mysqli_execute,NULL)
+ PHP_FALIAS(fetch,mysqli_fetch,NULL)
+ PHP_FALIAS(get_metadata, mysqli_get_metadata,NULL)
PHP_FALIAS(num_rows, mysqli_stmt_num_rows,NULL)
+ PHP_FALIAS(param_count,mysqli_param_count,NULL)
+ PHP_FALIAS(send_long_data,mysqli_send_long_data,NULL)
+ PHP_FALIAS(store_result,mysqli_stmt_store_result,NULL)
#if MYSQL_VERSION_ID >= 40101
PHP_FALIAS(sqlstate, mysqli_stmt_sqlstate,NULL)
#endif
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.21 php-src/ext/mysqli/php_mysqli.h:1.22
--- php-src/ext/mysqli/php_mysqli.h:1.21 Sat Sep 6 15:34:48 2003
+++ php-src/ext/mysqli/php_mysqli.h Thu Sep 25 07:19:25 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.21 2003/09/06 19:34:48 helly Exp $
+ $Id: php_mysqli.h,v 1.22 2003/09/25 11:19:25 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -245,7 +245,7 @@
PHP_FUNCTION(mysqli_ping);
PHP_FUNCTION(mysqli_prepare);
PHP_FUNCTION(mysqli_query);
-PHP_FUNCTION(mysqli_prepare_result);
+PHP_FUNCTION(mysqli_get_metadata);
PHP_FUNCTION(mysqli_profiler);
PHP_FUNCTION(mysqli_read_query_result);
PHP_FUNCTION(mysqli_real_connect);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
