mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Merge branch 'PHP-7.0'
This commit is contained in:
commit
3a33ee63e8
43 changed files with 119 additions and 127 deletions
|
@ -12,9 +12,9 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Georg Richter <georg@mysql.com> |
|
| Authors: Georg Richter <georg@php.net> |
|
||||||
| Andrey Hristov <andrey@mysql.com> |
|
| Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -12,12 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
| Georg Richter <georg@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
/* $Id$ */
|
|
||||||
|
|
||||||
#ifndef MYSQLND_H
|
#ifndef MYSQLND_H
|
||||||
#define MYSQLND_H
|
#define MYSQLND_H
|
||||||
|
|
|
@ -12,12 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: mysqlnd_debug.c 309303 2011-03-16 12:42:59Z andrey $ */
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_priv.h"
|
#include "mysqlnd_priv.h"
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -597,7 +596,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_native_auth_plugin =
|
||||||
MYSQLND_VERSION_ID,
|
MYSQLND_VERSION_ID,
|
||||||
PHP_MYSQLND_VERSION,
|
PHP_MYSQLND_VERSION,
|
||||||
"PHP License 3.01",
|
"PHP License 3.01",
|
||||||
"Andrey Hristov <andrey@mysql.com>, Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>",
|
"Andrey Hristov <andrey@php.net>, Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>",
|
||||||
{
|
{
|
||||||
NULL, /* no statistics , will be filled later if there are some */
|
NULL, /* no statistics , will be filled later if there are some */
|
||||||
NULL, /* no statistics */
|
NULL, /* no statistics */
|
||||||
|
@ -830,7 +829,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_sha256_authentication_plu
|
||||||
MYSQLND_VERSION_ID,
|
MYSQLND_VERSION_ID,
|
||||||
PHP_MYSQLND_VERSION,
|
PHP_MYSQLND_VERSION,
|
||||||
"PHP License 3.01",
|
"PHP License 3.01",
|
||||||
"Andrey Hristov <andrey@mysql.com>, Ulf Wendel <uwendel@mysql.com>",
|
"Andrey Hristov <andrey@php.net>, Ulf Wendel <uwendel@mysql.com>",
|
||||||
{
|
{
|
||||||
NULL, /* no statistics , will be filled later if there are some */
|
NULL, /* no statistics , will be filled later if there are some */
|
||||||
NULL, /* no statistics */
|
NULL, /* no statistics */
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -12,13 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id$ */
|
|
||||||
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_block_alloc.h"
|
#include "mysqlnd_block_alloc.h"
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -12,11 +12,12 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
| Georg Richter <georg@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_priv.h"
|
#include "mysqlnd_priv.h"
|
||||||
|
|
|
@ -12,11 +12,12 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
| Georg Richter <georg@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MYSQLND_CHARSET_H
|
#ifndef MYSQLND_CHARSET_H
|
||||||
#define MYSQLND_CHARSET_H
|
#define MYSQLND_CHARSET_H
|
||||||
|
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -12,10 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_priv.h"
|
#include "mysqlnd_priv.h"
|
||||||
|
|
|
@ -12,10 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MYSQLND_DEBUG_H
|
#ifndef MYSQLND_DEBUG_H
|
||||||
#define MYSQLND_DEBUG_H
|
#define MYSQLND_DEBUG_H
|
||||||
|
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_vio.h"
|
#include "mysqlnd_vio.h"
|
||||||
|
|
|
@ -12,9 +12,9 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
| Georg Richter <georg@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -12,10 +12,12 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Johannes Schlüter <johannes@php.net> |
|
||||||
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_priv.h"
|
#include "mysqlnd_priv.h"
|
||||||
|
|
|
@ -12,10 +12,12 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Johannes Schlüter <johannes@php.net> |
|
||||||
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MYSQLND_EXT_PLUGIN_H
|
#ifndef MYSQLND_EXT_PLUGIN_H
|
||||||
#define MYSQLND_EXT_PLUGIN_H
|
#define MYSQLND_EXT_PLUGIN_H
|
||||||
|
|
||||||
|
|
|
@ -12,11 +12,10 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Georg Richter <georg@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Andrey Hristov <andrey@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Georg Richter <georg@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
|
|
||||||
*/
|
*/
|
||||||
#ifndef MYSQLND_LIBMYSQL_COMPAT_H
|
#ifndef MYSQLND_LIBMYSQL_COMPAT_H
|
||||||
#define MYSQLND_LIBMYSQL_COMPAT_H
|
#define MYSQLND_LIBMYSQL_COMPAT_H
|
||||||
|
|
|
@ -12,9 +12,9 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
| Georg Richter <georg@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
|
|
|
@ -12,13 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: mysqlnd_ps.c 316906 2011-09-17 10:24:18Z pajoye $ */
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "php_globals.h"
|
#include "php_globals.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
/*
|
||||||
/*
|
/*
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| PHP Version 7 |
|
| PHP Version 7 |
|
||||||
|
@ -12,13 +13,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: mysqlnd.c 306407 2010-12-16 12:56:19Z andrey $ */
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_priv.h"
|
#include "mysqlnd_priv.h"
|
||||||
|
|
|
@ -12,10 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MYSQLND_PLUGIN_H
|
#ifndef MYSQLND_PLUGIN_H
|
||||||
#define MYSQLND_PLUGIN_H
|
#define MYSQLND_PLUGIN_H
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ This file is public domain and comes with NO WARRANTY of any kind */
|
||||||
Parts of the original, which are not applicable to mysqlnd have been removed.
|
Parts of the original, which are not applicable to mysqlnd have been removed.
|
||||||
|
|
||||||
With small modifications, mostly casting but adding few more macros by
|
With small modifications, mostly casting but adding few more macros by
|
||||||
Andrey Hristov <andrey@mysql.com> . The additions are in the public domain and
|
Andrey Hristov <andrey@php.net> . The additions are in the public domain and
|
||||||
were added to improve the header file, to get it more consistent.
|
were added to improve the header file, to get it more consistent.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -12,10 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MYSQLND_PRIV_H
|
#ifndef MYSQLND_PRIV_H
|
||||||
#define MYSQLND_PRIV_H
|
#define MYSQLND_PRIV_H
|
||||||
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_object_factory);
|
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_object_factory);
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_wireprotocol.h"
|
#include "mysqlnd_wireprotocol.h"
|
||||||
|
|
|
@ -12,13 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id$ */
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_wireprotocol.h"
|
#include "mysqlnd_wireprotocol.h"
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_wireprotocol.h"
|
#include "mysqlnd_wireprotocol.h"
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MYSQLND_RESULT_H
|
#ifndef MYSQLND_RESULT_H
|
||||||
#define MYSQLND_RESULT_H
|
#define MYSQLND_RESULT_H
|
||||||
|
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_connection.h"
|
#include "mysqlnd_connection.h"
|
||||||
|
|
|
@ -12,14 +12,12 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Johannes Schlüter <johannes@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id$ */
|
|
||||||
|
|
||||||
#ifndef MYSQLND_RESULT_META_H
|
#ifndef MYSQLND_RESULT_META_H
|
||||||
#define MYSQLND_RESULT_META_H
|
#define MYSQLND_RESULT_META_H
|
||||||
|
|
||||||
|
|
|
@ -12,13 +12,12 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Johannes Schlüter <johannes@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: mysqlnd.c 317989 2011-10-10 20:49:28Z andrey $ */
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_priv.h"
|
#include "mysqlnd_priv.h"
|
||||||
|
|
|
@ -12,12 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
| Georg Richter <georg@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
/* $Id: mysqlnd.h 318051 2011-10-12 16:18:02Z andrey $ */
|
|
||||||
|
|
||||||
#ifndef MYSQLND_REVERSE_API_H
|
#ifndef MYSQLND_REVERSE_API_H
|
||||||
#define MYSQLND_REVERSE_API_H
|
#define MYSQLND_REVERSE_API_H
|
||||||
|
|
|
@ -12,10 +12,12 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
|
| Georg Richter <georg@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_priv.h"
|
#include "mysqlnd_priv.h"
|
||||||
|
|
|
@ -12,10 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MYSQLND_STATISTICS_H
|
#ifndef MYSQLND_STATISTICS_H
|
||||||
#define MYSQLND_STATISTICS_H
|
#define MYSQLND_STATISTICS_H
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,8 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -12,10 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MYSQLND_VIO_H
|
#ifndef MYSQLND_VIO_H
|
||||||
#define MYSQLND_VIO_H
|
#define MYSQLND_VIO_H
|
||||||
|
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_connection.h"
|
#include "mysqlnd_connection.h"
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MYSQLND_WIREPROTOCOL_H
|
#ifndef MYSQLND_WIREPROTOCOL_H
|
||||||
#define MYSQLND_WIREPROTOCOL_H
|
#define MYSQLND_WIREPROTOCOL_H
|
||||||
|
|
||||||
|
|
|
@ -12,13 +12,11 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id$ */
|
|
||||||
#include "php.h"
|
#include "php.h"
|
||||||
#include "mysqlnd.h"
|
#include "mysqlnd.h"
|
||||||
#include "mysqlnd_priv.h"
|
#include "mysqlnd_priv.h"
|
||||||
|
|
|
@ -12,12 +12,9 @@
|
||||||
| obtain it through the world-wide-web, please send a note to |
|
| obtain it through the world-wide-web, please send a note to |
|
||||||
| license@php.net so we can mail you a copy immediately. |
|
| license@php.net so we can mail you a copy immediately. |
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
| Authors: Andrey Hristov <andrey@mysql.com> |
|
| Authors: Andrey Hristov <andrey@php.net> |
|
||||||
| Ulf Wendel <uwendel@mysql.com> |
|
| Ulf Wendel <uw@php.net> |
|
||||||
| Georg Richter <georg@mysql.com> |
|
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
|
|
||||||
$Id$
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef PHP_MYSQLND_H
|
#ifndef PHP_MYSQLND_H
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue