[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] com =?UTF-8?Q?pecl/database/mysql=5Fxdevapi=3A=20Merge=20remote-tracking?= =?UTF-8?Q?=20b
From:       hery ramilison <mysqlre () php ! net>
Date:       2018-04-24 11:46:45
Message-ID: php-mail-7184d91fee0c724d7909bfc8c87c3391635529172 () git ! php ! net
[Download RAW message or body]

Commit:    4f6bb1d118c2c49f2846d1b2c584117e7f476c06
Author:    Darek Slusarczyk <dariusz.slusarczyk@oracle.com>         Tue, 24 Apr 2018 \
                13:46:45 +0200
Parents:   13a36cdd6337931d604f9fd2ba3a90ff87317fb3 \
                82aa87b4499f4e93cdf4354827a9090bf9e80a40
Branches:  master

Link:       http://git.php.net/?p=pecl/database/mysql_xdevapi.git;a=commitdiff;h=4f6bb1d118c2c49f2846d1b2c584117e7f476c06


Log:
Merge remote-tracking branch 'remotes/origin/wl-10740-bugs-and-refactorings' into \
wl-10882-bulk-refactorings

# Conflicts:
#	mysqlx_collection.cc
#	mysqlx_table.cc

Changed paths:
  MM  mysqlx_collection.cc
  MM  mysqlx_table.cc


Diff:
diff --cc mysqlx_collection.cc
index c8f756f,d3077ea..cf326f9
--- a/mysqlx_collection.cc
+++ b/mysqlx_collection.cc
@@@ -301,11 -303,12 +302,11 @@@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_collect
  
  	DBG_ENTER("mysqlx_collection::getSchema");
  
- 	if (FAILURE == zend_parse_method_parameters(
- 				ZEND_NUM_ARGS(),
+ 	if (FAILURE == util::zend::parse_method_parameters(
+ 				execute_data,
 -				getThis(), "Os",
 +				getThis(), "O",
  				&object_zv,
 -				mysqlx_collection_class_entry,
 -				&(schema_name.s), &(schema_name.l))) {
 +				mysqlx_collection_class_entry)) {
  		DBG_VOID_RETURN;
  	}
  
diff --cc mysqlx_table.cc
index 03789d1,916dbfe..21fa72b
--- a/mysqlx_table.cc
+++ b/mysqlx_table.cc
@@@ -290,11 -294,12 +293,11 @@@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_table, 
  
  	DBG_ENTER("mysqlx_collection::getSchema");
  
- 	if (FAILURE == zend_parse_method_parameters(
- 				ZEND_NUM_ARGS(),
+ 	if (FAILURE == util::zend::parse_method_parameters(
+ 				execute_data,
 -				getThis(), "Os",
 +				getThis(), "O",
  				&object_zv,
 -				mysqlx_table_class_entry,
 -				&(schema_name.s), &(schema_name.l))) {
 +				mysqlx_table_class_entry)) {
  		DBG_VOID_RETURN;
  	}


--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]