diff options
| author | Andrey Hristov <andrey@php.net> | 2016-03-16 10:55:09 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2016-03-16 10:55:09 +0100 |
| commit | 61a61092987fa53a9eae87d1489dda263e866192 (patch) | |
| tree | 36aaa39dc211743482ef1ed6e6048912f21d8c55 | |
| parent | 3a33ee63e83a412b679eb2d72c63beb0064a3b5b (diff) | |
| parent | fa4addd40955e6a4b368447585fb5acc4b440967 (diff) | |
| download | php-git-61a61092987fa53a9eae87d1489dda263e866192.tar.gz | |
Merge branch 'PHP-7.0'
| -rw-r--r-- | ext/mysqlnd/mysqlnd_charset.c | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_debug.c | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_driver.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c index c22430ef30..2b3ddd0831 100644 --- a/ext/mysqlnd/mysqlnd_charset.c +++ b/ext/mysqlnd/mysqlnd_charset.c @@ -867,7 +867,7 @@ static struct st_mysqlnd_plugin_charsets mysqlnd_plugin_charsets_plugin = MYSQLND_VERSION_ID, PHP_MYSQLND_VERSION, "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 <uw@php.net>, Georg Richter <georg@php.net>", { NULL, /* no statistics , will be filled later if there are some */ NULL, /* no statistics */ diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index c343b4560c..3a03d56975 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -758,7 +758,7 @@ static struct st_mysqlnd_plugin_trace_log mysqlnd_plugin_trace_log_plugin = MYSQLND_VERSION_ID, PHP_MYSQLND_VERSION, "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 <uw@php.net>, Georg Richter <georg@php.net>", { NULL, /* no statistics , will be filled later if there are some */ NULL, /* no statistics */ diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c index 1cb6d8f35a..ced03cf3b2 100644 --- a/ext/mysqlnd/mysqlnd_driver.c +++ b/ext/mysqlnd/mysqlnd_driver.c @@ -41,7 +41,7 @@ static struct st_mysqlnd_plugin_core mysqlnd_plugin_core = MYSQLND_VERSION_ID, PHP_MYSQLND_VERSION, "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 <uw@php.net>, Georg Richter <georg@php.net>", { NULL, /* will be filled later */ mysqlnd_stats_values_names, |