diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 19:15:57 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 19:15:57 +0300 |
| commit | f177f125d4bfa8817833960286a5f18efe2fef1f (patch) | |
| tree | 12c6aa853460beb2ff9510d0547c55586dccfa83 /plugin/feedback | |
| parent | 3e8cab51cb78f3e60e139af944eef8f25502fc81 (diff) | |
| parent | 15f1e03d46dfa704beeed4880ed72c0163869dc3 (diff) | |
| download | mariadb-git-f177f125d4bfa8817833960286a5f18efe2fef1f.tar.gz | |
Merge branch '5.5' into 10.1
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 bd433efa4d3..75e6e8ddf17 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 5e7e7b1516e..0fffeb922d5 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 <sql_class.h> diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc index d61e303e8b3..e22550998a7 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 4851097e63f..6ae94d5b9c4 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 6da1b591652..684d95a3dbf 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" |