andrey Wed, 10 Aug 2011 14:12:24 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314740
Log:
relax constraint
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_structs.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2011-08-10 14:10:44 UTC
(rev 314739)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2011-08-10 14:12:24 UTC
(rev 314740)
@@ -1288,7 +1288,7 @@
/* {{{ mysqlnd_conn::escape_string */
static ulong
-MYSQLND_METHOD(mysqlnd_conn, escape_string)(const MYSQLND * const conn, char
*newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn, escape_string)(MYSQLND * const conn, char
*newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC)
{
DBG_ENTER("mysqlnd_conn::escape_string");
DBG_INF_FMT("conn=%llu", conn->thread_id);
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2011-08-10
14:10:44 UTC (rev 314739)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2011-08-10
14:12:24 UTC (rev 314740)
@@ -338,7 +338,7 @@
typedef enum_func_status (*func_mysqlnd_conn__init)(MYSQLND * conn
TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__connect)(MYSQLND *conn,
const char *host, const char * user, const char * passwd, unsigned int
passwd_len, const char * db, unsigned int db_len, unsigned int port, const char
* socket_or_pipe, unsigned int mysql_flags TSRMLS_DC);
-typedef ulong
(*func_mysqlnd_conn__escape_string)(const MYSQLND * const conn, char *newstr,
const char *escapestr, size_t escapestr_len TSRMLS_DC);
+typedef ulong
(*func_mysqlnd_conn__escape_string)(MYSQLND * const conn, char *newstr, const
char *escapestr, size_t escapestr_len TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__set_charset)(MYSQLND *
const conn, const char * const charset TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__query)(MYSQLND *conn,
const char *query, unsigned int query_len TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__send_query)(MYSQLND *conn,
const char *query, unsigned int query_len TSRMLS_DC);
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c 2011-08-10 14:10:44 UTC
(rev 314739)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c 2011-08-10 14:12:24 UTC
(rev 314740)
@@ -1404,7 +1404,7 @@
/* {{{ mysqlnd_conn::escape_string */
static ulong
-MYSQLND_METHOD(mysqlnd_conn, escape_string)(const MYSQLND * const conn, char
*newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn, escape_string)(MYSQLND * const conn, char
*newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC)
{
DBG_ENTER("mysqlnd_conn::escape_string");
DBG_INF_FMT("conn=%llu", conn->thread_id);
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_structs.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_structs.h 2011-08-10
14:10:44 UTC (rev 314739)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_structs.h 2011-08-10
14:12:24 UTC (rev 314740)
@@ -352,7 +352,7 @@
typedef enum_func_status (*func_mysqlnd_conn__init)(MYSQLND * conn
TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__connect)(MYSQLND *conn,
const char *host, const char * user, const char * passwd, unsigned int
passwd_len, const char * db, unsigned int db_len, unsigned int port, const char
* socket_or_pipe, unsigned int mysql_flags TSRMLS_DC);
-typedef ulong
(*func_mysqlnd_conn__escape_string)(const MYSQLND * const conn, char *newstr,
const char *escapestr, size_t escapestr_len TSRMLS_DC);
+typedef ulong
(*func_mysqlnd_conn__escape_string)(MYSQLND * const conn, char *newstr, const
char *escapestr, size_t escapestr_len TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__set_charset)(MYSQLND *
const conn, const char * const charset TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__query)(MYSQLND *conn,
const char *query, unsigned int query_len TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__send_query)(MYSQLND *conn,
const char *query, unsigned int query_len TSRMLS_DC);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-08-10 14:10:44 UTC (rev
314739)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-08-10 14:12:24 UTC (rev
314740)
@@ -1404,7 +1404,7 @@
/* {{{ mysqlnd_conn::escape_string */
static ulong
-MYSQLND_METHOD(mysqlnd_conn, escape_string)(const MYSQLND * const conn, char
*newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn, escape_string)(MYSQLND * const conn, char
*newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC)
{
DBG_ENTER("mysqlnd_conn::escape_string");
DBG_INF_FMT("conn=%llu", conn->thread_id);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h 2011-08-10 14:10:44 UTC
(rev 314739)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h 2011-08-10 14:12:24 UTC
(rev 314740)
@@ -352,7 +352,7 @@
typedef enum_func_status (*func_mysqlnd_conn__init)(MYSQLND * conn
TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__connect)(MYSQLND *conn,
const char *host, const char * user, const char * passwd, unsigned int
passwd_len, const char * db, unsigned int db_len, unsigned int port, const char
* socket_or_pipe, unsigned int mysql_flags TSRMLS_DC);
-typedef ulong
(*func_mysqlnd_conn__escape_string)(const MYSQLND * const conn, char *newstr,
const char *escapestr, size_t escapestr_len TSRMLS_DC);
+typedef ulong
(*func_mysqlnd_conn__escape_string)(MYSQLND * const conn, char *newstr, const
char *escapestr, size_t escapestr_len TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__set_charset)(MYSQLND *
const conn, const char * const charset TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__query)(MYSQLND *conn,
const char *query, unsigned int query_len TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__send_query)(MYSQLND *conn,
const char *query, unsigned int query_len TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
