From c081ce628f0d76d44784d7bb8e06428b06142ac0 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:08:10 +0800 Subject: Bump year --- ext/mysql/php_mysql_structs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mysql/php_mysql_structs.h') diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index bf09b24b0c..ee1286d989 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From adcfee7b07ce96272349e6a17892151a150658bb Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sun, 23 Mar 2014 11:30:09 +0800 Subject: Refactor ext/mysql --- ext/mysql/php_mysql_structs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mysql/php_mysql_structs.h') diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index ee1286d989..0e8ab482a1 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -111,7 +111,7 @@ PHP_FUNCTION(mysql_set_charset); #endif ZEND_BEGIN_MODULE_GLOBALS(mysql) - long default_link; + zend_resource *default_link; long num_links,num_persistent; long max_links,max_persistent; long allow_persistent; -- cgit v1.2.1 From bdbf47df181bdafc1b2bc2df1d23815f01510b88 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 19 Aug 2014 16:51:06 +0200 Subject: ported mysql and mysqlnd --- ext/mysql/php_mysql_structs.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'ext/mysql/php_mysql_structs.h') diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index 0e8ab482a1..0f4dbec110 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -112,18 +112,18 @@ PHP_FUNCTION(mysql_set_charset); ZEND_BEGIN_MODULE_GLOBALS(mysql) zend_resource *default_link; - long num_links,num_persistent; - long max_links,max_persistent; - long allow_persistent; - long default_port; + php_int_t num_links,num_persistent; + php_int_t max_links,max_persistent; + php_int_t allow_persistent; + php_int_t default_port; char *default_host, *default_user, *default_password; char *default_socket; char *connect_error; - long connect_errno; - long connect_timeout; - long result_allocated; - long trace_mode; - long allow_local_infile; + php_int_t connect_errno; + php_int_t connect_timeout; + php_int_t result_allocated; + php_int_t trace_mode; + php_int_t allow_local_infile; ZEND_END_MODULE_GLOBALS(mysql) #ifdef ZTS -- cgit v1.2.1 From c3e3c98ec666812daaaca896cf5ef758a8a6df14 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 19:24:55 +0200 Subject: master renames phase 1 --- ext/mysql/php_mysql_structs.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'ext/mysql/php_mysql_structs.h') diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index 0f4dbec110..c39e5b25af 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -112,18 +112,18 @@ PHP_FUNCTION(mysql_set_charset); ZEND_BEGIN_MODULE_GLOBALS(mysql) zend_resource *default_link; - php_int_t num_links,num_persistent; - php_int_t max_links,max_persistent; - php_int_t allow_persistent; - php_int_t default_port; + zend_long num_links,num_persistent; + zend_long max_links,max_persistent; + zend_long allow_persistent; + zend_long default_port; char *default_host, *default_user, *default_password; char *default_socket; char *connect_error; - php_int_t connect_errno; - php_int_t connect_timeout; - php_int_t result_allocated; - php_int_t trace_mode; - php_int_t allow_local_infile; + zend_long connect_errno; + zend_long connect_timeout; + zend_long result_allocated; + zend_long trace_mode; + zend_long allow_local_infile; ZEND_END_MODULE_GLOBALS(mysql) #ifdef ZTS -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- ext/mysql/php_mysql_structs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mysql/php_mysql_structs.h') diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index c39e5b25af..8eb9aa1d29 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ -- cgit v1.2.1