[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:       2019-07-24 16:26:58
Message-ID: php-mail-284ab2c38910a6394f36b793cc5e545f1884341291 () git ! php ! net
[Download RAW message or body]

Commit:    0bae1916205396f978273779c0bd479260834a2a
Author:    Darek Slusarczyk <dariusz.slusarczyk@oracle.com>         Wed, 24 Jul 2019 \
                18:26:58 +0200
Parents:   86746e64b834ef489528515d8a93aacfde1f1f26 \
                8fe1f415515d81b5d00e6fef61978bc491c6cea9
Branches:  master

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


Log:
Merge remote-tracking branch 'remotes/origin/orabug-30088150-remove-messages' into \
wl-12683-add-overlaps-not-overlaps-as-operator

# Conflicts:
#	messages/mysqlx_connection.cc
#	messages/mysqlx_connection.h
#	messages/mysqlx_message__auth_ok.cc
#	messages/mysqlx_message__auth_ok.h
#	messages/mysqlx_message__auth_start.cc
#	messages/mysqlx_message__auth_start.h
#	messages/mysqlx_message__capabilities.cc
#	messages/mysqlx_message__capabilities.h
#	messages/mysqlx_message__capabilities_get.cc
#	messages/mysqlx_message__capabilities_get.h
#	messages/mysqlx_message__capabilities_set.cc
#	messages/mysqlx_message__capabilities_set.h
#	messages/mysqlx_message__capability.cc
#	messages/mysqlx_message__capability.h
#	messages/mysqlx_message__data_fetch_done.cc
#	messages/mysqlx_message__data_fetch_done.h
#	messages/mysqlx_message__error.cc
#	messages/mysqlx_message__error.h
#	messages/mysqlx_message__ok.cc
#	messages/mysqlx_message__ok.h
#	messages/mysqlx_message__stmt_execute.cc
#	messages/mysqlx_message__stmt_execute.h
#	messages/mysqlx_message__stmt_execute_ok.cc
#	messages/mysqlx_message__stmt_execute_ok.h
#	messages/mysqlx_pfc.cc
#	messages/mysqlx_pfc.h
#	messages/mysqlx_resultset__column_metadata.cc
#	messages/mysqlx_resultset__column_metadata.h
#	messages/mysqlx_resultset__data_row.cc
#	messages/mysqlx_resultset__data_row.h
#	messages/mysqlx_resultset__resultset_metadata.cc
#	messages/mysqlx_resultset__resultset_metadata.h

Changed paths:
  MM  config.m4
  MM  config.w32
  MM  package.xml
  MM  php_mysqlx_ex.cc


Diff:



--
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]