[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_fe.c php_mysqli.h
georg Sun Jun 6 04:52:19 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c mysqli_fe.c php_mysqli.h
Log:
removed conditional defines for load_data_infile_handlers on windows
(4.1.2 windows build is fixed now on mysql.com)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.82r2=1.83ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.82 php-src/ext/mysqli/mysqli_api.c:1.83
--- php-src/ext/mysqli/mysqli_api.c:1.82Sat Jun 5 14:31:56 2004
+++ php-src/ext/mysqli/mysqli_api.c Sun Jun 6 04:52:19 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.82 2004/06/05 18:31:56 georg Exp $
+ $Id: mysqli_api.c,v 1.83 2004/06/06 08:52:19 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1042,7 +1042,6 @@
}
/* }}} */
-#ifndef PHP_WIN32
/* {{{ proto mysqli_set_local_infile_default(object link)
unsets user defined handler for load local infile command */
PHP_FUNCTION(mysqli_set_local_infile_default)
@@ -1105,7 +1104,6 @@
php_local_infile_end, php_local_infile_error, (void
*)mysql);
}
/* }}} */
-#endif
/* {{{ proto bool mysqli_more_results(object link)
check if there any more query results from a multi query */
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.36r2=1.37ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.36 php-src/ext/mysqli/mysqli_fe.c:1.37
--- php-src/ext/mysqli/mysqli_fe.c:1.36 Sat Jun 5 14:31:56 2004
+++ php-src/ext/mysqli/mysqli_fe.c Sun Jun 6 04:52:19 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.36 2004/06/05 18:31:56 georg Exp $
+ $Id: mysqli_fe.c,v 1.37 2004/06/06 08:52:19 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -96,10 +96,8 @@
PHP_FE(mysqli_info,
NULL)
PHP_FE(mysqli_insert_id,
NULL)
PHP_FE(mysqli_kill,
NULL)
-#ifndef PHP_WIN32
PHP_FE(mysqli_set_local_infile_default, NULL)
PHP_FE(mysqli_set_local_infile_handler, NULL)
-#endif
PHP_FE(mysqli_master_query,
NULL)
PHP_FE(mysqli_more_results,
NULL)
PHP_FE(mysqli_multi_query,
NULL)
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.36r2=1.37ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.36 php-src/ext/mysqli/php_mysqli.h:1.37
--- php-src/ext/mysqli/php_mysqli.h:1.36Sat Jun 5 14:31:56 2004
+++ php-src/ext/mysqli/php_mysqli.h Sun Jun 6 04:52:19 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: php_mysqli.h,v 1.36 2004/06/05 18:31:56 georg Exp $
+ $Id: php_mysqli.h,v 1.37 2004/06/06 08:52:19 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -310,10 +310,8 @@
PHP_FUNCTION(mysqli_insert_id);
PHP_FUNCTION(mysqli_init);
PHP_FUNCTION(mysqli_kill);
-#ifndef PHP_WIN32
PHP_FUNCTION(mysqli_set_local_infile_default);
PHP_FUNCTION(mysqli_set_local_infile_handler);
-#endif
PHP_FUNCTION(mysqli_master_query);
PHP_FUNCTION(mysqli_more_results);
PHP_FUNCTION(mysqli_multi_query);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_fe.c php_mysqli.h
georg Wed Mar 10 04:50:07 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c php_mysqli.h mysqli_fe.c
Log:
added new function mysql_stmt_free_result
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.78r2=1.79ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.78 php-src/ext/mysqli/mysqli_api.c:1.79
--- php-src/ext/mysqli/mysqli_api.c:1.78Tue Mar 9 07:01:23 2004
+++ php-src/ext/mysqli/mysqli_api.c Wed Mar 10 04:50:05 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.78 2004/03/09 12:01:23 georg Exp $
+ $Id: mysqli_api.c,v 1.79 2004/03/10 09:50:05 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1483,6 +1483,27 @@
}
/* }}} */
+#ifndef HAVE_MYSQLI_OLDAPI
+/* {{{ proto void mysqli_stmt_free_result(object stmt)
+ Free stored result memory for the given statement handle */
+PHP_FUNCTION(mysqli_stmt_free_result)
+{
+ 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, STMT *, mysql_stmt, mysqli_stmt);
+
+ mysql_stmt_free_result(stmt-stmt);
+
+ return;
+}
+/* }}} */
+#endif
+
/* {{{ proto mixed mysqli_stmt_num_rows(object stmt)
Return the number of rows in statements result set */
PHP_FUNCTION(mysqli_stmt_num_rows)
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.33r2=1.34ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.33 php-src/ext/mysqli/php_mysqli.h:1.34
--- php-src/ext/mysqli/php_mysqli.h:1.33Tue Mar 9 07:01:23 2004
+++ php-src/ext/mysqli/php_mysqli.h Wed Mar 10 04:50:05 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: php_mysqli.h,v 1.33 2004/03/09 12:01:23 georg Exp $
+ $Id: php_mysqli.h,v 1.34 2004/03/10 09:50:05 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -347,6 +347,9 @@
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);
+#endif
PHP_FUNCTION(mysqli_stmt_num_rows);
#if MYSQL_VERSION_ID = 40101
PHP_FUNCTION(mysqli_stmt_sqlstate);
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.32r2=1.33ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.32 php-src/ext/mysqli/mysqli_fe.c:1.33
--- php-src/ext/mysqli/mysqli_fe.c:1.32 Tue Mar 9 07:01:23 2004
+++ php-src/ext/mysqli/mysqli_fe.c Wed Mar 10 04:50:05 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.32 2004/03/09 12:01:23 georg Exp $
+ $Id: mysqli_fe.c,v 1.33 2004/03/10 09:50:05 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -124,6 +124,9 @@
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)
+#endif
PHP_FE(mysqli_stmt_param_count, NULL)
PHP_FE(mysqli_send_query,
NULL)
#ifdef HAVE_EMBEDDED_MYSQLI
@@ -267,6 +270,7 @@
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(prepare,mysqli_stmt_prepare, NULL)
#endif
PHP_FALIAS(store_result,mysqli_stmt_store_result,NULL)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_fe.c php_mysqli.h
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.45Tue 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.21Sat 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:
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_fe.c php_mysqli.h
georg Tue Jul 15 10:00:19 2003 EDT
Modified files:
/php-src/ext/mysqli php_mysqli.h mysqli_api.c mysqli_fe.c
Log:
added new function mysqli_stmt_data_seek
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.18 php-src/ext/mysqli/php_mysqli.h:1.19
--- php-src/ext/mysqli/php_mysqli.h:1.18Tue Jul 15 06:37:19 2003
+++ php-src/ext/mysqli/php_mysqli.h Tue Jul 15 10:00:18 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: php_mysqli.h,v 1.18 2003/07/15 10:37:19 georg Exp $
+ $Id: php_mysqli.h,v 1.19 2003/07/15 14:00:18 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -266,6 +266,7 @@
PHP_FUNCTION(mysqli_stat);
PHP_FUNCTION(mysqli_stmt_affected_rows);
PHP_FUNCTION(mysqli_stmt_close);
+PHP_FUNCTION(mysqli_stmt_data_seek);
PHP_FUNCTION(mysqli_stmt_errno);
PHP_FUNCTION(mysqli_stmt_error);
PHP_FUNCTION(mysqli_stmt_num_rows);
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.35 php-src/ext/mysqli/mysqli_api.c:1.36
--- php-src/ext/mysqli/mysqli_api.c:1.35Tue Jul 15 06:37:19 2003
+++ php-src/ext/mysqli/mysqli_api.c Tue Jul 15 10:00:18 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.35 2003/07/15 10:37:19 georg Exp $
+ $Id: mysqli_api.c,v 1.36 2003/07/15 14:00:18 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -454,7 +454,7 @@
}
/* }}} */
-/* {{{ proto void mysqli_data_seek(object result)
+/* {{{ proto void mysqli_data_seek(object result, int offset)
Move internal result pointer */
PHP_FUNCTION(mysqli_data_seek)
{
@@ -464,7 +464,7 @@
PR_COMMAND *prcommand;
longoffset;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), Orl,
mysql_result, mysqli_result_class_entry, mysql_result, offset) == FAILURE) {
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), Ol,
mysql_result, mysqli_result_class_entry, offset) == FAILURE) {
return;
}
@@ -1671,6 +1671,27 @@
MYSQLI_CLEAR_RESOURCE(mysql_stmt);
RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto void mysqli_stmt_data_seek(object stmt, int offset)
+ Move internal result pointer */
+PHP_FUNCTION(mysqli_stmt_data_seek)
+{
+ STMT*stmt;
+ zval*mysql_stmt;
+ PR_STMT *prstmt;
+ longoffset;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), Ol,
mysql_stmt, mysqli_stmt_class_entry, offset) == FAILURE) {
+ return;
+ }
+
+ MYSQLI_FETCH_RESOURCE(stmt, STMT *, prstmt, PR_STMT *, mysql_stmt,
mysqli_stmt);
+
+
+ mysql_stmt_data_seek(stmt-stmt, offset);
+ return;
}
/* }}} */
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.14 php-src/ext/mysqli/mysqli_fe.c:1.15
--- php-src/ext/mysqli/mysqli_fe.c:1.14 Sat Jun 28 17:27:08 2003
+++ php-src/ext/mysqli/mysqli_fe.c Tue Jul 15 10:00:19 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.14 2003/06/28 21:27:08 georg Exp $
+ $Id: mysqli_fe.c,v 1.15 2003/07/15 14:00:19 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -116,6 +116,7 @@
PHP_FE(mysqli_stat,
NULL)
PHP_FE(mysqli_stmt_affected_rows, NULL)
PHP_FE(mysqli_stmt_close,
NULL)
+ PHP_FE(mysqli_stmt_data_seek, NULL)
PHP_FE(mysqli_stmt_errno,
NULL)
PHP_FE(mysqli_stmt_error,
NULL)
PHP_FE(mysqli_stmt_num_rows,NULL)
@@ -234,6 +235,7 @@
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(num_rows, mysqli_stmt_num_rows,NULL)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
