diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:18:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:18:46 +0300 |
| commit | be85d3e61bb4217453a6879cb28d9bd369ad17dd (patch) | |
| tree | c1ec0aab43cf0df71d88b8278367a79aabc43f52 /plugin/feedback | |
| parent | c0bc9480e73242b075178cb5da5713ba9d84be7c (diff) | |
| parent | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (diff) | |
| download | mariadb-git-be85d3e61bb4217453a6879cb28d9bd369ad17dd.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'plugin/feedback')
| -rw-r--r-- | plugin/feedback/feedback.cc | 2 | ||||
| -rw-r--r-- | plugin/feedback/feedback.h | 2 | ||||
| -rw-r--r-- | plugin/feedback/sender_thread.cc | 2 | ||||
| -rw-r--r-- | plugin/feedback/url_base.cc | 2 | ||||
| -rw-r--r-- | plugin/feedback/url_http.cc | 2 | ||||
| -rw-r--r-- | plugin/feedback/utils.cc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc index 826a929643d..75e9a1e430e 100644 --- a/plugin/feedback/feedback.cc +++ b/plugin/feedback/feedback.cc @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include "feedback.h" diff --git a/plugin/feedback/feedback.h b/plugin/feedback/feedback.h index 43c9f4ee844..04fe1ab6aa1 100644 --- a/plugin/feedback/feedback.h +++ b/plugin/feedback/feedback.h @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #define MYSQL_SERVER 1 #include <my_global.h> diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc index 92f186a1e2a..8e2e9dd5ed6 100644 --- a/plugin/feedback/sender_thread.cc +++ b/plugin/feedback/sender_thread.cc @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include "feedback.h" #include <sql_acl.h> diff --git a/plugin/feedback/url_base.cc b/plugin/feedback/url_base.cc index 44cb0b00c95..21661079c98 100644 --- a/plugin/feedback/url_base.cc +++ b/plugin/feedback/url_base.cc @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include "feedback.h" diff --git a/plugin/feedback/url_http.cc b/plugin/feedback/url_http.cc index 76aef909756..db05adebdd2 100644 --- a/plugin/feedback/url_http.cc +++ b/plugin/feedback/url_http.cc @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include "feedback.h" diff --git a/plugin/feedback/utils.cc b/plugin/feedback/utils.cc index 64510161691..e362446204f 100644 --- a/plugin/feedback/utils.cc +++ b/plugin/feedback/utils.cc @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include "feedback.h" |