[PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c /ext/mysqli/tests bug47050.phpt
johannesMon Jan 12 14:01:47 2009 UTC
Added files:
/php-src/ext/mysqli/tests bug47050.phpt
Modified files:
/php-src/ext/mysqli mysqli_fe.c
Log:
Fix #47050 mysqli_poll() modifies improper variables
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.68r2=1.69diff_format=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.68 php-src/ext/mysqli/mysqli_fe.c:1.69
--- php-src/ext/mysqli/mysqli_fe.c:1.68 Wed Dec 31 11:12:33 2008
+++ php-src/ext/mysqli/mysqli_fe.c Mon Jan 12 14:01:47 2009
@@ -17,7 +17,7 @@
| Ulf Wendel u...@php.net |
+--+
- $Id: mysqli_fe.c,v 1.68 2008/12/31 11:12:33 sebastian Exp $
+ $Id: mysqli_fe.c,v 1.69 2009/01/12 14:01:47 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -44,6 +44,13 @@
ZEND_BEGIN_ARG_INFO(all_args_force_by_ref, 1)
ZEND_END_ARG_INFO();
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_poll, 0, 0, 4)
+ ZEND_ARG_ARRAY_INFO(1, read, 1)
+ ZEND_ARG_ARRAY_INFO(1, write, 1)
+ ZEND_ARG_ARRAY_INFO(1, error, 1)
+ ZEND_ARG_INFO(0, sec)
+ ZEND_ARG_INFO(0, usec)
+ZEND_END_ARG_INFO();
/* {{{ mysqli_functions[]
*
@@ -116,7 +123,7 @@
PHP_FE(mysqli_options,
NULL)
PHP_FE(mysqli_ping,
NULL)
#if defined(MYSQLI_USE_MYSQLND)
- PHP_FE(mysqli_poll,
NULL)
+ PHP_FE(mysqli_poll,
arginfo_mysqli_poll)
#endif
PHP_FE(mysqli_prepare,
NULL)
PHP_FE(mysqli_report,
NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug47050.phpt?view=markuprev=1.1
Index: php-src/ext/mysqli/tests/bug47050.phpt
+++ php-src/ext/mysqli/tests/bug47050.phpt
--TEST--
Bug #47050 (mysqli_poll() modifies improper variables)
--SKIPIF--
?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?
--FILE--
?php
include (connect.inc);
$link1 = mysqli_connect($host, $user, $passwd, null, $port, $socket);
mysqli_select_db($link1, $db);
$link1-query(SELECT 'test', MYSQLI_ASYNC);
$all_links = array($link1);
$links = $errors = $reject = $all_links;
mysqli_poll($links, $errors, $reject, 1);
echo links: , sizeof($links), \n;
echo errors: ,sizeof($errors), \n;
echo reject: ,sizeof($reject), \n;
echo all_links: , sizeof($all_links), \n;
$link1-close();
?
--EXPECT--
links: 1
errors: 0
reject: 0
all_links: 1
--
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_fe.c
zeevMon Dec 26 09:30:40 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_fe.c
Log:
Whitespace
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.51r2=1.52diff_format=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.51 php-src/ext/mysqli/mysqli_fe.c:1.52
--- php-src/ext/mysqli/mysqli_fe.c:1.51 Tue Dec 6 01:38:43 2005
+++ php-src/ext/mysqli/mysqli_fe.c Mon Dec 26 09:30:40 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.51 2005/12/06 01:38:43 sniper Exp $
+ $Id: mysqli_fe.c,v 1.52 2005/12/26 09:30:40 zeev Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -158,22 +158,15 @@
PHP_FE(mysqli_warning_count,
NULL)
/* Aliases */
- PHP_FALIAS(mysqli_bind_param,
- mysqli_stmt_bind_param,
third_arg_force_by_ref_rest)
- PHP_FALIAS(mysqli_bind_result,
- mysqli_stmt_bind_result,
second_arg_force_by_ref_rest)
- PHP_FALIAS(mysqli_client_encoding,
- mysqli_character_set_name,
NULL)
- PHP_FALIAS(mysqli_escape_string,
- mysqli_real_escape_string,
NULL)
- PHP_FALIAS(mysqli_fetch, mysqli_stmt_fetch, NULL)
- PHP_FALIAS(mysqli_param_count,
- mysqli_stmt_param_count,
NULL)
- PHP_FALIAS(mysqli_get_metadata,
- mysqli_stmt_result_metadata,
NULL)
- PHP_FALIAS(mysqli_send_long_data,
- mysqli_stmt_send_long_data,
NULL)
- PHP_FALIAS(mysqli_set_opt, mysqli_options, NULL)
+ PHP_FALIAS(mysqli_bind_param, mysqli_stmt_bind_param,
third_arg_force_by_ref_rest)
+ PHP_FALIAS(mysqli_bind_result, mysqli_stmt_bind_result,
second_arg_force_by_ref_rest)
+ PHP_FALIAS(mysqli_client_encoding, mysqli_character_set_name,
NULL)
+ PHP_FALIAS(mysqli_escape_string,mysqli_real_escape_string,
NULL)
+ PHP_FALIAS(mysqli_fetch,mysqli_stmt_fetch,
NULL)
+ PHP_FALIAS(mysqli_param_count, mysqli_stmt_param_count,
NULL)
+ PHP_FALIAS(mysqli_get_metadata, mysqli_stmt_result_metadata,
NULL)
+ PHP_FALIAS(mysqli_send_long_data, mysqli_stmt_send_long_data,
NULL)
+ PHP_FALIAS(mysqli_set_opt, mysqli_options,
NULL)
{NULL, NULL, NULL} /* Must be the last line in mysqli_functions[]
*/
};
--
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_fe.c
tony2001Tue Oct 18 06:01:12 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_fe.c
Log:
fix bug #34902 (mysqli::character_set_name() - undefined method)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.49r2=1.50ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.49 php-src/ext/mysqli/mysqli_fe.c:1.50
--- php-src/ext/mysqli/mysqli_fe.c:1.49 Wed Aug 3 10:07:30 2005
+++ php-src/ext/mysqli/mysqli_fe.c Tue Oct 18 06:01:08 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.49 2005/08/03 14:07:30 sniper Exp $
+ $Id: mysqli_fe.c,v 1.50 2005/10/18 10:01:08 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -186,6 +186,7 @@
function_entry mysqli_link_methods[] = {
PHP_FALIAS(autocommit,mysqli_autocommit,NULL)
PHP_FALIAS(change_user,mysqli_change_user,NULL)
+ PHP_FALIAS(character_set_name, mysqli_character_set_name,NULL)
PHP_FALIAS(client_encoding, mysqli_character_set_name,NULL)
PHP_FALIAS(close,mysqli_close,NULL)
PHP_FALIAS(commit,mysqli_commit,NULL)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c php_mysqli.h
Is this a critical patch to include in Beta 3? Andi At 08:38 PM 7/12/2005 +, Antony Dovgal wrote: tony2001Tue Jul 12 16:38:35 2005 EDT Modified files: /php-src/ext/mysqli mysqli_fe.c php_mysqli.h Log: add forgotten ifdefs, fix #33667 (mysqli doesn't compile) http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.47r2=1.48ty=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.47 php-src/ext/mysqli/mysqli_fe.c:1.48 --- php-src/ext/mysqli/mysqli_fe.c:1.47 Fri Jun 24 10:44:45 2005 +++ php-src/ext/mysqli/mysqli_fe.c Tue Jul 12 16:38:34 2005 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli_fe.c,v 1.47 2005/06/24 14:44:45 georg Exp $ + $Id: mysqli_fe.c,v 1.48 2005/07/12 20:38:34 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H @@ -85,7 +85,9 @@ PHP_FE(mysqli_field_seek, NULL) PHP_FE(mysqli_field_tell, NULL) PHP_FE(mysqli_free_result, NULL) +#ifdef HAVE_MYSQLI_GET_CHARSET PHP_FE(mysqli_get_charset, NULL) +#endif PHP_FE(mysqli_get_client_info, NULL) PHP_FE(mysqli_get_client_version, NULL) PHP_FE(mysqli_get_host_info, NULL) @@ -194,7 +196,9 @@ PHP_FALIAS(dump_debug_info,mysqli_dump_debug_info,NULL) PHP_FALIAS(enable_reads_from_master,mysqli_enable_reads_from_master,NULL) PHP_FALIAS(enable_rpl_parse,mysqli_enable_rpl_parse,NULL) +#ifdef HAVE_MYSQLI_GET_CHARSET PHP_FALIAS(get_charset,mysqli_get_charset,NULL) +#endif PHP_FALIAS(get_client_info,mysqli_get_client_info,NULL) PHP_FALIAS(get_server_info,mysqli_get_server_info,NULL) PHP_FALIAS(get_warnings, mysqli_get_warnings, NULL) http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.52r2=1.53ty=u Index: php-src/ext/mysqli/php_mysqli.h diff -u php-src/ext/mysqli/php_mysqli.h:1.52 php-src/ext/mysqli/php_mysqli.h:1.53 --- php-src/ext/mysqli/php_mysqli.h:1.52Tue Jul 12 11:45:07 2005 +++ php-src/ext/mysqli/php_mysqli.h Tue Jul 12 16:38:34 2005 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: php_mysqli.h,v 1.52 2005/07/12 15:45:07 georg Exp $ + $Id: php_mysqli.h,v 1.53 2005/07/12 20:38:34 tony2001 Exp $ */ /* A little hack to prevent build break, when mysql is used together with @@ -334,7 +334,9 @@ PHP_FUNCTION(mysqli_field_seek); PHP_FUNCTION(mysqli_field_tell); PHP_FUNCTION(mysqli_free_result); +#ifdef HAVE_MYSQLI_GET_CHARSET PHP_FUNCTION(mysqli_get_charset); +#endif PHP_FUNCTION(mysqli_get_client_info); PHP_FUNCTION(mysqli_get_client_version); PHP_FUNCTION(mysqli_get_host_info); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c php_mysqli.h
On Tue, 12 Jul 2005 13:43:39 -0700 Andi Gutmans [EMAIL PROTECTED] wrote: Is this a critical patch to include in Beta 3? Yes, as ext/mysqli just doesn't compile without these ifdefs, if you have MySQL 5.0.10 installed (and I guess only Georg uses it ATM =). But thanks for asking, I almost forgot that we're too close to the release and wanted to commit another one non-critical fix. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c php_mysqli.h
OK good. I'll reroll. Thanks. Andi At 12:50 AM 7/13/2005 +0400, Antony Dovgal wrote: On Tue, 12 Jul 2005 13:43:39 -0700 Andi Gutmans [EMAIL PROTECTED] wrote: Is this a critical patch to include in Beta 3? Yes, as ext/mysqli just doesn't compile without these ifdefs, if you have MySQL 5.0.10 installed (and I guess only Georg uses it ATM =). But thanks for asking, I almost forgot that we're too close to the release and wanted to commit another one non-critical fix. -- Wbr, Antony Dovgal -- 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_fe.c
georg Fri Jun 24 10:44:46 2005 EDT Modified files: /php-src/ext/mysqli mysqli_fe.c Log: reverted Ilias changes - added get_warnings methods (forgot to commit the file in my last commit) http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.46r2=1.47ty=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.46 php-src/ext/mysqli/mysqli_fe.c:1.47 --- php-src/ext/mysqli/mysqli_fe.c:1.46 Wed Jun 22 22:15:04 2005 +++ php-src/ext/mysqli/mysqli_fe.c Fri Jun 24 10:44:45 2005 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli_fe.c,v 1.46 2005/06/23 02:15:04 iliaa Exp $ + $Id: mysqli_fe.c,v 1.47 2005/06/24 14:44:45 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -92,6 +92,7 @@ PHP_FE(mysqli_get_proto_info, NULL) PHP_FE(mysqli_get_server_info, NULL) PHP_FE(mysqli_get_server_version, NULL) + PHP_FE(mysqli_get_warnings, NULL) PHP_FE(mysqli_init, NULL) PHP_FE(mysqli_info, NULL) PHP_FE(mysqli_insert_id, NULL) @@ -131,6 +132,7 @@ PHP_FE(mysqli_stmt_bind_result, second_arg_force_by_ref_rest) PHP_FE(mysqli_stmt_fetch, NULL) PHP_FE(mysqli_stmt_free_result, NULL) + PHP_FE(mysqli_stmt_get_warnings, NULL) PHP_FE(mysqli_stmt_insert_id, NULL) PHP_FE(mysqli_stmt_reset, NULL) PHP_FE(mysqli_stmt_param_count, NULL) @@ -195,7 +197,7 @@ PHP_FALIAS(get_charset,mysqli_get_charset,NULL) PHP_FALIAS(get_client_info,mysqli_get_client_info,NULL) PHP_FALIAS(get_server_info,mysqli_get_server_info,NULL) -/* XXX: temp_fix PHP_FALIAS(get_warnings, mysqli_warning_construct, NULL) */ + PHP_FALIAS(get_warnings, mysqli_get_warnings, NULL) PHP_FALIAS(init,mysqli_init,NULL) PHP_FALIAS(kill,mysqli_kill,NULL) PHP_FALIAS(set_local_infile_default,mysqli_set_local_infile_default,NULL) @@ -268,7 +270,7 @@ PHP_FALIAS(data_seek,mysqli_stmt_data_seek,NULL) PHP_FALIAS(execute,mysqli_stmt_execute,NULL) PHP_FALIAS(fetch,mysqli_stmt_fetch,NULL) -/* XXX: temp_fix PHP_FALIAS(get_warnings, mysqli_warning_construct, NULL) */ + PHP_FALIAS(get_warnings, mysqli_stmt_get_warnings, NULL) PHP_FALIAS(result_metadata, mysqli_stmt_result_metadata,NULL) PHP_FALIAS(num_rows, mysqli_stmt_num_rows,NULL) PHP_FALIAS(send_long_data,mysqli_stmt_send_long_data,NULL) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c
Georg Richter wrote: georg Fri Jun 24 10:44:46 2005 EDT Modified files: /php-src/ext/mysqli mysqli_fe.c Log: reverted Ilias changes - added get_warnings methods (forgot to commit the file in my last commit) Looks like there is still something missing, compilation fails with the following: ext/mysqli/.libs/mysqli_fe.o(.data+0x3d8): undefined reference to `zif_mysqli_get_warnings' ext/mysqli/.libs/mysqli_fe.o(.data+0x6bc): undefined reference to `zif_mysqli_stmt_get_warnings' ext/mysqli/.libs/mysqli_fe.o(.data+0xa70): undefined reference to `zif_mysqli_get_warnings' ext/mysqli/.libs/mysqli_fe.o(.data+0xec4): undefined reference to `zif_mysqli_stmt_get_warnings' Ilia -- 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_fe.c
iliaa Wed Jun 22 22:15:05 2005 EDT Modified files: /php-src/ext/mysqli mysqli_fe.c Log: temporary fix to let mysqli extension build, so we can make a release. http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.45r2=1.46ty=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.45 php-src/ext/mysqli/mysqli_fe.c:1.46 --- php-src/ext/mysqli/mysqli_fe.c:1.45 Fri Jun 3 04:49:01 2005 +++ php-src/ext/mysqli/mysqli_fe.c Wed Jun 22 22:15:04 2005 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli_fe.c,v 1.45 2005/06/03 08:49:01 georg Exp $ + $Id: mysqli_fe.c,v 1.46 2005/06/23 02:15:04 iliaa Exp $ */ #ifdef HAVE_CONFIG_H @@ -195,7 +195,7 @@ PHP_FALIAS(get_charset,mysqli_get_charset,NULL) PHP_FALIAS(get_client_info,mysqli_get_client_info,NULL) PHP_FALIAS(get_server_info,mysqli_get_server_info,NULL) - PHP_FALIAS(get_warnings, mysqli_warning_construct, NULL) +/* XXX: temp_fix PHP_FALIAS(get_warnings, mysqli_warning_construct, NULL) */ PHP_FALIAS(init,mysqli_init,NULL) PHP_FALIAS(kill,mysqli_kill,NULL) PHP_FALIAS(set_local_infile_default,mysqli_set_local_infile_default,NULL) @@ -268,7 +268,7 @@ PHP_FALIAS(data_seek,mysqli_stmt_data_seek,NULL) PHP_FALIAS(execute,mysqli_stmt_execute,NULL) PHP_FALIAS(fetch,mysqli_stmt_fetch,NULL) - PHP_FALIAS(get_warnings, mysqli_warning_construct, NULL) +/* XXX: temp_fix PHP_FALIAS(get_warnings, mysqli_warning_construct, NULL) */ PHP_FALIAS(result_metadata, mysqli_stmt_result_metadata,NULL) PHP_FALIAS(num_rows, mysqli_stmt_num_rows,NULL) PHP_FALIAS(send_long_data,mysqli_stmt_send_long_data,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_fe.c mysqli_nonapi.c php_mysqli.h /ext/mysqli/tests 065.phpt
georg Fri May 13 09:11:41 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c mysqli_fe.c php_mysqli.h
/php-src/ext/mysqli/tests 065.phpt
Log:
- fixed compile error under windows. Functionality for changing the
character set was moved to libmysql (4.1 bk tree - will be merged into
5.0 within the next days).
- renamed mysql_set_character_set to mysqli_set_charset
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.43r2=1.44ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.43
php-src/ext/mysqli/mysqli_nonapi.c:1.44
--- php-src/ext/mysqli/mysqli_nonapi.c:1.43 Sun May 8 04:39:54 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c Fri May 13 09:11:40 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_nonapi.c,v 1.43 2005/05/08 08:39:54 georg Exp $
+ $Id: mysqli_nonapi.c,v 1.44 2005/05/13 13:11:40 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -254,12 +254,10 @@
/* }}} */
#ifdef HAVE_MYSQLI_SET_CHARSET
-/* {{{ proto bool mysqli_set_character_set_name(object link, string csname)
+/* {{{ proto bool mysqli_set_charset(object link, string csname)
sets client character set */
-PHP_FUNCTION(mysqli_set_character_set_name)
+PHP_FUNCTION(mysqli_set_charset)
{
- struct charset_info_st *cs;
- const char *save_csdir = charsets_dir;
MY_MYSQL*mysql;
zval*mysql_link;
char*cs_name = NULL;
@@ -270,30 +268,10 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, mysql_link, mysqli_link);
- if (mysql-mysql-options.charset_dir){
- charsets_dir = mysql-mysql-options.charset_dir;
- }
-
- cs = get_charset_by_csname(cs_name, 1, MYF(0));
-
- if (cs) {
- char buff[MY_CS_NAME_SIZE + 10];
- charsets_dir = save_csdir;
- sprintf(buff, SET NAMES %s, cs_name);
- if (!mysql_query(mysql-mysql, buff)) {
- mysql-mysql-charset = cs;
- RETURN_TRUE;
- }
- } else {
- char cs_dir_name[FN_REFLEN];
- get_charsets_dir(cs_dir_name);
- mysql-mysql-net.last_errno=CR_CANT_READ_CHARSET;
- strcpy(mysql-mysql-net.sqlstate, HY000);
- sprintf(mysql-mysql-net.last_error, Can't initialize
character set %-.32s (path: %-.100s),
- cs_name, cs_dir_name);
+ if (mysql_set_character_set(mysql-mysql, cs_name)) {
+ RETURN_FALSE;
}
- charsets_dir = save_csdir;
- RETURN_FALSE;
+ RETURN_TRUE;
}
/* }}} */
#endif
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.43r2=1.44ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.43 php-src/ext/mysqli/mysqli_fe.c:1.44
--- php-src/ext/mysqli/mysqli_fe.c:1.43 Sun May 8 04:39:54 2005
+++ php-src/ext/mysqli/mysqli_fe.c Fri May 13 09:11:40 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.43 2005/05/08 08:39:54 georg Exp $
+ $Id: mysqli_fe.c,v 1.44 2005/05/13 13:11:40 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -117,7 +117,7 @@
PHP_FE(mysqli_rpl_query_type,
NULL)
PHP_FE(mysqli_select_db,
NULL)
#ifdef HAVE_MYSQLI_SET_CHARSET
- PHP_FE(mysqli_set_character_set_name, NULL)
+ PHP_FE(mysqli_set_charset,
NULL)
#endif
PHP_FE(mysqli_stmt_attr_get,
NULL)
PHP_FE(mysqli_stmt_attr_set,
NULL)
@@ -181,7 +181,6 @@
function_entry mysqli_link_methods[] = {
PHP_FALIAS(autocommit,mysqli_autocommit,NULL)
PHP_FALIAS(change_user,mysqli_change_user,NULL)
- PHP_FALIAS(character_set_name,mysqli_character_set_name,NULL)
PHP_FALIAS(client_encoding, mysqli_character_set_name,NULL)
PHP_FALIAS(close,mysqli_close,NULL)
PHP_FALIAS(commit,mysqli_commit,NULL)
@@ -218,8 +217,7 @@
PHP_FALIAS(rpl_query_type,mysqli_rpl_query_type,NULL)
PHP_FALIAS(select_db,mysqli_select_db,NULL)
#ifdef HAVE_MYSQLI_SET_CHARSET
- PHP_FALIAS(set_character_set_name,mysqli_set_character_set_name,NULL)
- PHP_FALIAS(set_client_encoding,mysqli_set_character_set_name,NULL)
+ PHP_FALIAS(set_charset,mysqli_set_charset,NULL)
#endif
PHP_FALIAS(set_opt, mysqli_options,NULL)
Re: [PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c mysqli_nonapi.c php_mysqli.h /ext/mysqli/tests 065.phpt
What about the mysqli_get_charset_name() (instead of
mysqli_character_set_name)?
--Jani
On Fri, 13 May 2005, Georg Richter wrote:
georg Fri May 13 09:11:41 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c mysqli_fe.c php_mysqli.h
/php-src/ext/mysqli/tests065.phpt
Log:
- fixed compile error under windows. Functionality for changing the
character set was moved to libmysql (4.1 bk tree - will be merged into
5.0 within the next days).
- renamed mysql_set_character_set to mysqli_set_charset
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.43r2=1.44ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.43
php-src/ext/mysqli/mysqli_nonapi.c:1.44
--- php-src/ext/mysqli/mysqli_nonapi.c:1.43 Sun May 8 04:39:54 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c Fri May 13 09:11:40 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_nonapi.c,v 1.43 2005/05/08 08:39:54 georg Exp $
+ $Id: mysqli_nonapi.c,v 1.44 2005/05/13 13:11:40 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -254,12 +254,10 @@
/* }}} */
#ifdef HAVE_MYSQLI_SET_CHARSET
-/* {{{ proto bool mysqli_set_character_set_name(object link, string csname)
+/* {{{ proto bool mysqli_set_charset(object link, string csname)
sets client character set */
-PHP_FUNCTION(mysqli_set_character_set_name)
+PHP_FUNCTION(mysqli_set_charset)
{
- struct charset_info_st *cs;
- const char *save_csdir = charsets_dir;
MY_MYSQL*mysql;
zval*mysql_link;
char*cs_name = NULL;
@@ -270,30 +268,10 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, mysql_link, mysqli_link);
- if (mysql-mysql-options.charset_dir){
- charsets_dir = mysql-mysql-options.charset_dir;
- }
-
- cs = get_charset_by_csname(cs_name, 1, MYF(0));
-
- if (cs) {
- char buff[MY_CS_NAME_SIZE + 10];
- charsets_dir = save_csdir;
- sprintf(buff, SET NAMES %s, cs_name);
- if (!mysql_query(mysql-mysql, buff)) {
- mysql-mysql-charset = cs;
- RETURN_TRUE;
- }
- } else {
- char cs_dir_name[FN_REFLEN];
- get_charsets_dir(cs_dir_name);
- mysql-mysql-net.last_errno=CR_CANT_READ_CHARSET;
- strcpy(mysql-mysql-net.sqlstate, HY000);
- sprintf(mysql-mysql-net.last_error, Can't initialize character
set %-.32s (path: %-.100s),
- cs_name, cs_dir_name);
+ if (mysql_set_character_set(mysql-mysql, cs_name)) {
+ RETURN_FALSE;
}
- charsets_dir = save_csdir;
- RETURN_FALSE;
+ RETURN_TRUE;
}
/* }}} */
#endif
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.43r2=1.44ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.43 php-src/ext/mysqli/mysqli_fe.c:1.44
--- php-src/ext/mysqli/mysqli_fe.c:1.43 Sun May 8 04:39:54 2005
+++ php-src/ext/mysqli/mysqli_fe.c Fri May 13 09:11:40 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.43 2005/05/08 08:39:54 georg Exp $
+ $Id: mysqli_fe.c,v 1.44 2005/05/13 13:11:40 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -117,7 +117,7 @@
PHP_FE(mysqli_rpl_query_type,
NULL)
PHP_FE(mysqli_select_db,
NULL)
#ifdef HAVE_MYSQLI_SET_CHARSET
- PHP_FE(mysqli_set_character_set_name, NULL)
+ PHP_FE(mysqli_set_charset,
NULL)
#endif
PHP_FE(mysqli_stmt_attr_get,
NULL)
PHP_FE(mysqli_stmt_attr_set,
NULL)
@@ -181,7 +181,6 @@
function_entry mysqli_link_methods[] = {
PHP_FALIAS(autocommit,mysqli_autocommit,NULL)
PHP_FALIAS(change_user,mysqli_change_user,NULL)
- PHP_FALIAS(character_set_name,mysqli_character_set_name,NULL)
PHP_FALIAS(client_encoding, mysqli_character_set_name,NULL)
PHP_FALIAS(close,mysqli_close,NULL)
PHP_FALIAS(commit,mysqli_commit,NULL)
@@ -218,8 +217,7 @@
PHP_FALIAS(rpl_query_type,mysqli_rpl_query_type,NULL)
PHP_FALIAS(select_db,mysqli_select_db,NULL)
#ifdef HAVE_MYSQLI_SET_CHARSET
- PHP_FALIAS(set_character_set_name,mysqli_set_character_set_name,NULL)
- PHP_FALIAS(set_client_encoding,mysqli_set_character_set_name,NULL)
+ PHP_FALIAS(set_charset,mysqli_set_charset,NULL)
#endif
PHP_FALIAS(set_opt,
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c mysqli_nonapi.c php_mysqli.h /ext/mysqli/tests 065.phpt
georg Sun May 8 04:39:56 2005 EDT
Added files:
/php-src/ext/mysqli/tests 065.phpt
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c mysqli_fe.c php_mysqli.h
Log:
Added new function mysqli_set_character_set_name
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.42r2=1.43ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.42
php-src/ext/mysqli/mysqli_nonapi.c:1.43
--- php-src/ext/mysqli/mysqli_nonapi.c:1.42 Fri May 6 06:09:42 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c Sun May 8 04:39:54 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_nonapi.c,v 1.42 2005/05/06 10:09:42 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.43 2005/05/08 08:39:54 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -29,6 +29,8 @@
#include ext/standard/info.h
#include php_mysqli.h
+extern const char *charsets_dir;
+
/* {{{ proto object mysqli_connect([string hostname [,string username [,string
passwd [,string dbname [,int port [,string socket]])
Open a connection to a mysql server */
PHP_FUNCTION(mysqli_connect)
@@ -251,6 +253,51 @@
}
/* }}} */
+#ifdef HAVE_MYSQLI_SET_CHARSET
+/* {{{ proto bool mysqli_set_character_set_name(object link, string csname)
+ sets client character set */
+PHP_FUNCTION(mysqli_set_character_set_name)
+{
+ struct charset_info_st *cs;
+ const char *save_csdir = charsets_dir;
+ MY_MYSQL*mysql;
+ zval*mysql_link;
+ char*cs_name = NULL;
+ unsigned intlen;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
Os, mysql_link, mysqli_link_class_entry, cs_name, len) == FAILURE) {
+ return;
+ }
+ MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, mysql_link, mysqli_link);
+
+ if (mysql-mysql-options.charset_dir){
+ charsets_dir = mysql-mysql-options.charset_dir;
+ }
+
+ cs = get_charset_by_csname(cs_name, 1, MYF(0));
+
+ if (cs) {
+ char buff[MY_CS_NAME_SIZE + 10];
+ charsets_dir = save_csdir;
+ sprintf(buff, SET NAMES %s, cs_name);
+ if (!mysql_query(mysql-mysql, buff)) {
+ mysql-mysql-charset = cs;
+ RETURN_TRUE;
+ }
+ } else {
+ char cs_dir_name[FN_REFLEN];
+ get_charsets_dir(cs_dir_name);
+ mysql-mysql-net.last_errno=CR_CANT_READ_CHARSET;
+ strcpy(mysql-mysql-net.sqlstate, HY000);
+ sprintf(mysql-mysql-net.last_error, Can't initialize
character set %-.32s (path: %-.100s),
+ cs_name, cs_dir_name);
+ }
+ charsets_dir = save_csdir;
+ RETURN_FALSE;
+}
+/* }}} */
+#endif
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.42r2=1.43ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.42 php-src/ext/mysqli/mysqli_fe.c:1.43
--- php-src/ext/mysqli/mysqli_fe.c:1.42 Fri Jan 7 09:59:59 2005
+++ php-src/ext/mysqli/mysqli_fe.c Sun May 8 04:39:54 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.42 2005/01/07 14:59:59 georg Exp $
+ $Id: mysqli_fe.c,v 1.43 2005/05/08 08:39:54 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -116,6 +116,9 @@
PHP_FE(mysqli_rpl_probe,
NULL)
PHP_FE(mysqli_rpl_query_type,
NULL)
PHP_FE(mysqli_select_db,
NULL)
+#ifdef HAVE_MYSQLI_SET_CHARSET
+ PHP_FE(mysqli_set_character_set_name, NULL)
+#endif
PHP_FE(mysqli_stmt_attr_get,
NULL)
PHP_FE(mysqli_stmt_attr_set,
NULL)
PHP_FE(mysqli_stmt_field_count,
NULL)
@@ -214,6 +217,10 @@
PHP_FALIAS(rpl_probe,mysqli_rpl_probe,NULL)
PHP_FALIAS(rpl_query_type,mysqli_rpl_query_type,NULL)
PHP_FALIAS(select_db,mysqli_select_db,NULL)
+#ifdef HAVE_MYSQLI_SET_CHARSET
+ PHP_FALIAS(set_character_set_name,mysqli_set_character_set_name,NULL)
+ PHP_FALIAS(set_client_encoding,mysqli_set_character_set_name,NULL)
+#endif
PHP_FALIAS(set_opt, mysqli_options,NULL)
PHP_FALIAS(slave_query,mysqli_slave_query,NULL)
PHP_FALIAS(ssl_set,mysqli_ssl_set,NULL)
Re: [PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c mysqli_nonapi.c php_mysqli.h /ext/mysqli/tests 065.phpt
Wouldn't it make more sense if these functions were called
mysqli_get_charset_name() (instead of mysqli_character_set_name)
mysqli_set_charset_name() (instead of mysqli_set_character_set_name)
Those that there are now are quite confusing..
--Jani
On Sun, 8 May 2005, Georg Richter wrote:
georg Sun May 8 04:39:56 2005 EDT
Added files:
/php-src/ext/mysqli/tests065.phpt
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c mysqli_fe.c php_mysqli.h
Log:
Added new function mysqli_set_character_set_name
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.42r2=1.43ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.42
php-src/ext/mysqli/mysqli_nonapi.c:1.43
--- php-src/ext/mysqli/mysqli_nonapi.c:1.42 Fri May 6 06:09:42 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c Sun May 8 04:39:54 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_nonapi.c,v 1.42 2005/05/06 10:09:42 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.43 2005/05/08 08:39:54 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -29,6 +29,8 @@
#include ext/standard/info.h
#include php_mysqli.h
+extern const char *charsets_dir;
+
/* {{{ proto object mysqli_connect([string hostname [,string username [,string
passwd [,string dbname [,int port [,string socket]])
Open a connection to a mysql server */
PHP_FUNCTION(mysqli_connect)
@@ -251,6 +253,51 @@
}
/* }}} */
+#ifdef HAVE_MYSQLI_SET_CHARSET
+/* {{{ proto bool mysqli_set_character_set_name(object link, string csname)
+ sets client character set */
+PHP_FUNCTION(mysqli_set_character_set_name)
+{
+ struct charset_info_st *cs;
+ const char *save_csdir = charsets_dir;
+ MY_MYSQL*mysql;
+ zval*mysql_link;
+ char*cs_name = NULL;
+ unsigned intlen;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), Os,
mysql_link, mysqli_link_class_entry, cs_name, len) == FAILURE) {
+ return;
+ }
+ MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, mysql_link, mysqli_link);
+
+ if (mysql-mysql-options.charset_dir){
+ charsets_dir = mysql-mysql-options.charset_dir;
+ }
+
+ cs = get_charset_by_csname(cs_name, 1, MYF(0));
+
+ if (cs) {
+ char buff[MY_CS_NAME_SIZE + 10];
+ charsets_dir = save_csdir;
+ sprintf(buff, SET NAMES %s, cs_name);
+ if (!mysql_query(mysql-mysql, buff)) {
+ mysql-mysql-charset = cs;
+ RETURN_TRUE;
+ }
+ } else {
+ char cs_dir_name[FN_REFLEN];
+ get_charsets_dir(cs_dir_name);
+ mysql-mysql-net.last_errno=CR_CANT_READ_CHARSET;
+ strcpy(mysql-mysql-net.sqlstate, HY000);
+ sprintf(mysql-mysql-net.last_error, Can't initialize character
set %-.32s (path: %-.100s),
+ cs_name, cs_dir_name);
+ }
+ charsets_dir = save_csdir;
+ RETURN_FALSE;
+}
+/* }}} */
+#endif
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.42r2=1.43ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.42 php-src/ext/mysqli/mysqli_fe.c:1.43
--- php-src/ext/mysqli/mysqli_fe.c:1.42 Fri Jan 7 09:59:59 2005
+++ php-src/ext/mysqli/mysqli_fe.c Sun May 8 04:39:54 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.42 2005/01/07 14:59:59 georg Exp $
+ $Id: mysqli_fe.c,v 1.43 2005/05/08 08:39:54 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -116,6 +116,9 @@
PHP_FE(mysqli_rpl_probe,
NULL)
PHP_FE(mysqli_rpl_query_type,
NULL)
PHP_FE(mysqli_select_db,
NULL)
+#ifdef HAVE_MYSQLI_SET_CHARSET
+ PHP_FE(mysqli_set_character_set_name, NULL)
+#endif
PHP_FE(mysqli_stmt_attr_get,
NULL)
PHP_FE(mysqli_stmt_attr_set,
NULL)
PHP_FE(mysqli_stmt_field_count,
NULL)
@@ -214,6 +217,10 @@
PHP_FALIAS(rpl_probe,mysqli_rpl_probe,NULL)
PHP_FALIAS(rpl_query_type,mysqli_rpl_query_type,NULL)
PHP_FALIAS(select_db,mysqli_select_db,NULL)
+#ifdef HAVE_MYSQLI_SET_CHARSET
+ PHP_FALIAS(set_character_set_name,mysqli_set_character_set_name,NULL)
+
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c
georg Mon Jun 7 04:34:52 2004 EDT Modified files: /php-src/ext/mysqli mysqli_fe.c Log: forgot to remove Win32 restrictions for mysql methods http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.37r2=1.38ty=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.37 php-src/ext/mysqli/mysqli_fe.c:1.38 --- php-src/ext/mysqli/mysqli_fe.c:1.37 Sun Jun 6 04:52:19 2004 +++ php-src/ext/mysqli/mysqli_fe.c Mon Jun 7 04:34:52 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli_fe.c,v 1.37 2004/06/06 08:52:19 georg Exp $ + $Id: mysqli_fe.c,v 1.38 2004/06/07 08:34:52 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -203,10 +203,8 @@ PHP_FALIAS(get_server_info,mysqli_get_server_info,NULL) PHP_FALIAS(init,mysqli_init,NULL) PHP_FALIAS(kill,mysqli_kill,NULL) -#ifndef PHP_WIN32 PHP_FALIAS(set_local_infile_default,mysqli_set_local_infile_default,NULL) PHP_FALIAS(set_local_infile_handler,mysqli_set_local_infile_handler,NULL) -#endif PHP_FALIAS(master_query,mysqli_master_query,NULL) PHP_FALIAS(mysqli, mysqli_connect, NULL) PHP_FALIAS(multi_query,mysqli_multi_query,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_fe.c
georg Sun Mar 21 15:45:00 2004 EDT Modified files: /php-src/ext/mysqli mysqli_fe.c Log: renamed get_metadata method to get_result_metadata. (We have to differentiate between result_metadata and param_metdata. mysql_stmt_param_metadata will be added in libmysql 4.1.3) http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.33r2=1.34ty=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.33 php-src/ext/mysqli/mysqli_fe.c:1.34 --- php-src/ext/mysqli/mysqli_fe.c:1.33 Wed Mar 10 04:50:05 2004 +++ php-src/ext/mysqli/mysqli_fe.c Sun Mar 21 15:43:44 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli_fe.c,v 1.33 2004/03/10 09:50:05 georg Exp $ + $Id: mysqli_fe.c,v 1.34 2004/03/21 20:43:44 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -126,6 +126,7 @@ PHP_FE(mysqli_stmt_fetch, NULL) #ifndef HAVE_MYSQLI_OLDAPI PHP_FE(mysqli_stmt_free_result, NULL) + PHP_FE(mysqli_stmt_reset, NULL) #endif PHP_FE(mysqli_stmt_param_count, NULL) PHP_FE(mysqli_send_query, NULL) @@ -167,7 +168,7 @@ PHP_FALIAS(mysqli_fetch, mysqli_stmt_fetch, NULL) PHP_FALIAS(mysqli_param_count, mysqli_stmt_param_count, NULL) - PHP_FALIAS(mysqli_get_metadata, + PHP_FALIAS(mysqli_get_result_metadata, mysqli_stmt_result_metadata,NULL) PHP_FALIAS(mysqli_send_long_data, mysqli_stmt_send_long_data, NULL) @@ -271,6 +272,7 @@ 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) -- 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_fe.c
georg Sun Mar 21 15:47:12 2004 EDT Modified files: /php-src/ext/mysqli mysqli_fe.c Log: ups - changed alias instead of method before http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.34r2=1.35ty=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.34 php-src/ext/mysqli/mysqli_fe.c:1.35 --- php-src/ext/mysqli/mysqli_fe.c:1.34 Sun Mar 21 15:43:44 2004 +++ php-src/ext/mysqli/mysqli_fe.c Sun Mar 21 15:45:57 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli_fe.c,v 1.34 2004/03/21 20:43:44 georg Exp $ + $Id: mysqli_fe.c,v 1.35 2004/03/21 20:45:57 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -168,7 +168,7 @@ PHP_FALIAS(mysqli_fetch, mysqli_stmt_fetch, NULL) PHP_FALIAS(mysqli_param_count, mysqli_stmt_param_count, NULL) - PHP_FALIAS(mysqli_get_result_metadata, + PHP_FALIAS(mysqli_get_metadata, mysqli_stmt_result_metadata,NULL) PHP_FALIAS(mysqli_send_long_data, mysqli_stmt_send_long_data, NULL) @@ -266,7 +266,7 @@ PHP_FALIAS(data_seek,mysqli_stmt_data_seek,NULL) PHP_FALIAS(execute,mysqli_stmt_execute,NULL) PHP_FALIAS(fetch,mysqli_stmt_fetch,NULL) - PHP_FALIAS(get_metadata, mysqli_stmt_result_metadata,NULL) + PHP_FALIAS(result_metadata, mysqli_stmt_result_metadata,NULL) 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) -- 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_fe.c
edink Wed Mar 3 13:54:21 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_fe.c
Log:
Attempt at fixing win32 link errors
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.30r2=1.31ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.30 php-src/ext/mysqli/mysqli_fe.c:1.31
--- php-src/ext/mysqli/mysqli_fe.c:1.30 Thu Feb 26 03:27:24 2004
+++ php-src/ext/mysqli/mysqli_fe.c Wed Mar 3 13:54:20 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.30 2004/02/26 08:27:24 georg Exp $
+ $Id: mysqli_fe.c,v 1.31 2004/03/03 18:54:20 edink Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -41,6 +41,11 @@
ZEND_ARG_PASS_INFO(0)
ZEND_END_ARG_INFO();
+static
+ ZEND_BEGIN_ARG_INFO(all_args_force_by_ref, 1)
+ ZEND_END_ARG_INFO();
+
+
/* {{{ mysqli_functions[]
*
* Every user visible function must have an entry in mysqli_functions[].
@@ -230,7 +235,7 @@
function_entry mysqli_stmt_methods[] = {
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(bind_result,mysqli_bind_result,all_args_force_by_ref)
PHP_FALIAS(close,mysqli_stmt_close,NULL)
PHP_FALIAS(data_seek,mysqli_stmt_data_seek,NULL)
PHP_FALIAS(execute,mysqli_execute,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_fe.c
georg Sat Feb 21 02:37:42 2004 EDT Modified files: /php-src/ext/mysqli mysqli_fe.c Log: fixed typo in method alias http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.28r2=1.29ty=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.28 php-src/ext/mysqli/mysqli_fe.c:1.29 --- php-src/ext/mysqli/mysqli_fe.c:1.28 Wed Jan 28 17:51:54 2004 +++ php-src/ext/mysqli/mysqli_fe.c Sat Feb 21 02:37:41 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli_fe.c,v 1.28 2004/01/28 22:51:54 georg Exp $ + $Id: mysqli_fe.c,v 1.29 2004/02/21 07:37:41 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -210,7 +210,7 @@ PHP_FALIAS(data_seek,mysqli_data_seek,NULL) PHP_FALIAS(fetch_field,mysqli_fetch_field,NULL) PHP_FALIAS(fetch_fields,mysqli_fetch_fields,NULL) - PHP_FALIAS(fetvh_field_direct,mysqli_fetch_field_direct,NULL) + PHP_FALIAS(fetch_field_direct,mysqli_fetch_field_direct,NULL) PHP_FALIAS(fetch_array,mysqli_fetch_array,NULL) PHP_FALIAS(fetch_assoc,mysqli_fetch_assoc,NULL) PHP_FALIAS(fetch_object,mysqli_fetch_object,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_fe.c
georg Wed Oct 29 15:52:25 2003 EDT Modified files: /php-src/ext/mysqli mysqli_fe.c Log: added functions for embedded server Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.19 php-src/ext/mysqli/mysqli_fe.c:1.20 --- php-src/ext/mysqli/mysqli_fe.c:1.19 Thu Sep 25 07:19:25 2003 +++ php-src/ext/mysqli/mysqli_fe.c Wed Oct 29 15:52:25 2003 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli_fe.c,v 1.19 2003/09/25 11:19:25 georg Exp $ + $Id: mysqli_fe.c,v 1.20 2003/10/29 20:52:25 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -64,6 +64,9 @@ PHP_FE(mysqli_disable_reads_from_master,NULL) PHP_FE(mysqli_disable_rpl_parse,NULL) PHP_FE(mysqli_dump_debug_info, NULL) +#ifdef HAVE_EMBEDDED_MYSQLI + PHP_FE(mysqli_embedded_connect, NULL) +#endif PHP_FE(mysqli_enable_reads_from_master, NULL) PHP_FE(mysqli_enable_rpl_parse, NULL) PHP_FE(mysqli_errno, NULL) @@ -115,9 +118,12 @@ PHP_FE(mysqli_select_db, NULL) PHP_FE(mysqli_send_long_data, NULL) PHP_FE(mysqli_send_query, NULL) +#ifdef HAVE_EMBEDDED_MYSQLI + PHP_FE(mysqli_server_end, NULL) + PHP_FE(mysqli_server_init, NULL) +#endif PHP_FALIAS(mysqli_set_opt, mysqli_options, NULL) PHP_FE(mysqli_slave_query, NULL) - #if MYSQL_VERSION_ID = 40101 PHP_FE(mysqli_sqlstate, NULL) #endif -- 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_fe.c
helly Sun Aug 3 14:51:26 2003 EDT
Modified files:
/php-src/ext/mysqli mysqli_fe.c
Log:
Fix build
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.17 php-src/ext/mysqli/mysqli_fe.c:1.18
--- php-src/ext/mysqli/mysqli_fe.c:1.17 Sun Aug 3 13:44:36 2003
+++ php-src/ext/mysqli/mysqli_fe.c Sun Aug 3 14:51:26 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.17 2003/08/03 17:44:36 zeev Exp $
+ $Id: mysqli_fe.c,v 1.18 2003/08/03 18:51:26 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -237,7 +237,7 @@
function_entry mysqli_stmt_methods[] = {
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_force_ref)
+ 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 CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
