summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-13 17:47:26 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-13 17:54:04 +0300
commit26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch)
tree7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /sql
parent8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff)
parentcb248f880619431850e5638009a6098048050edf (diff)
downloadmariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'sql')
-rw-r--r--sql/CMakeLists.txt2
-rw-r--r--sql/authors.h2
-rw-r--r--sql/bounded_queue.h2
-rw-r--r--sql/client_settings.h2
-rw-r--r--sql/compat56.cc2
-rw-r--r--sql/compat56.h2
-rw-r--r--sql/contributors.h2
-rw-r--r--sql/create_options.cc2
-rw-r--r--sql/create_options.h2
-rw-r--r--sql/custom_conf.h2
-rw-r--r--sql/datadict.cc2
-rw-r--r--sql/datadict.h2
-rw-r--r--sql/debug_sync.cc2
-rw-r--r--sql/debug_sync.h2
-rw-r--r--sql/derror.cc2
-rw-r--r--sql/derror.h2
-rw-r--r--sql/des_key_file.cc2
-rw-r--r--sql/des_key_file.h2
-rw-r--r--sql/discover.cc2
-rw-r--r--sql/discover.h2
-rw-r--r--sql/encryption.cc2
-rw-r--r--sql/event_data_objects.cc2
-rw-r--r--sql/event_data_objects.h2
-rw-r--r--sql/event_db_repository.cc2
-rw-r--r--sql/event_db_repository.h2
-rw-r--r--sql/event_parse_data.cc2
-rw-r--r--sql/event_parse_data.h2
-rw-r--r--sql/event_queue.cc2
-rw-r--r--sql/event_queue.h2
-rw-r--r--sql/event_scheduler.cc2
-rw-r--r--sql/event_scheduler.h2
-rw-r--r--sql/events.cc2
-rw-r--r--sql/events.h2
-rw-r--r--sql/field.cc2
-rw-r--r--sql/field.h2
-rw-r--r--sql/field_conv.cc2
-rw-r--r--sql/filesort.cc2
-rw-r--r--sql/filesort.h2
-rw-r--r--sql/filesort_utils.cc2
-rw-r--r--sql/filesort_utils.h2
-rw-r--r--sql/gcalc_slicescan.cc2
-rw-r--r--sql/gcalc_slicescan.h2
-rw-r--r--sql/gcalc_tools.cc2
-rw-r--r--sql/gcalc_tools.h2
-rw-r--r--sql/gen_lex_hash.cc2
-rw-r--r--sql/gen_lex_token.cc2
-rw-r--r--sql/group_by_handler.cc2
-rw-r--r--sql/group_by_handler.h2
-rw-r--r--sql/gstream.cc2
-rw-r--r--sql/gstream.h2
-rw-r--r--sql/ha_partition.cc2
-rw-r--r--sql/ha_partition.h2
-rw-r--r--sql/handler.cc4
-rw-r--r--sql/handler.h2
-rw-r--r--sql/hash_filo.cc2
-rw-r--r--sql/hash_filo.h2
-rw-r--r--sql/hostname.cc2
-rw-r--r--sql/hostname.h2
-rw-r--r--sql/init.cc2
-rw-r--r--sql/init.h2
-rw-r--r--sql/innodb_priv.h2
-rw-r--r--sql/item.cc2
-rw-r--r--sql/item.h2
-rw-r--r--sql/item_buff.cc2
-rw-r--r--sql/item_cmpfunc.cc2
-rw-r--r--sql/item_cmpfunc.h2
-rw-r--r--sql/item_create.cc2
-rw-r--r--sql/item_create.h2
-rw-r--r--sql/item_func.cc2
-rw-r--r--sql/item_func.h2
-rw-r--r--sql/item_geofunc.cc2
-rw-r--r--sql/item_geofunc.h2
-rw-r--r--sql/item_inetfunc.cc2
-rw-r--r--sql/item_inetfunc.h2
-rw-r--r--sql/item_row.cc2
-rw-r--r--sql/item_row.h2
-rw-r--r--sql/item_strfunc.cc2
-rw-r--r--sql/item_strfunc.h2
-rw-r--r--sql/item_subselect.cc2
-rw-r--r--sql/item_subselect.h2
-rw-r--r--sql/item_sum.cc2
-rw-r--r--sql/item_sum.h2
-rw-r--r--sql/item_timefunc.cc2
-rw-r--r--sql/item_timefunc.h2
-rw-r--r--sql/item_xmlfunc.cc2
-rw-r--r--sql/item_xmlfunc.h2
-rw-r--r--sql/key.cc2
-rw-r--r--sql/key.h2
-rw-r--r--sql/keycaches.cc2
-rw-r--r--sql/keycaches.h2
-rw-r--r--sql/lex.h2
-rw-r--r--sql/lex_symbol.h2
-rw-r--r--sql/lock.cc2
-rw-r--r--sql/lock.h2
-rw-r--r--sql/log.cc2
-rw-r--r--sql/log.h2
-rw-r--r--sql/log_event.cc2
-rw-r--r--sql/log_event.h2
-rw-r--r--sql/log_event_old.cc2
-rw-r--r--sql/log_event_old.h2
-rw-r--r--sql/log_slow.h2
-rw-r--r--sql/main.cc2
-rw-r--r--sql/mdl.cc2
-rw-r--r--sql/mdl.h2
-rw-r--r--sql/mem_root_array.h2
-rw-r--r--sql/message.h2
-rw-r--r--sql/mf_iocache.cc2
-rw-r--r--sql/mf_iocache_encr.cc2
-rw-r--r--sql/multi_range_read.cc2
-rw-r--r--sql/multi_range_read.h2
-rw-r--r--sql/my_apc.cc2
-rw-r--r--sql/my_apc.h2
-rw-r--r--sql/my_decimal.cc2
-rw-r--r--sql/my_decimal.h2
-rw-r--r--sql/my_json_writer.cc2
-rw-r--r--sql/my_json_writer.h2
-rw-r--r--sql/mysql_install_db.cc2
-rw-r--r--sql/mysql_upgrade_service.cc4
-rw-r--r--sql/mysqld.cc2
-rw-r--r--sql/mysqld.h2
-rw-r--r--sql/mysqld_suffix.h2
-rw-r--r--sql/net_serv.cc2
-rw-r--r--sql/opt_index_cond_pushdown.cc2
-rw-r--r--sql/opt_range.cc2
-rw-r--r--sql/opt_range.h2
-rw-r--r--sql/opt_range_mrr.cc2
-rw-r--r--sql/opt_subselect.cc2
-rw-r--r--sql/opt_subselect.h2
-rw-r--r--sql/opt_sum.cc2
-rw-r--r--sql/opt_table_elimination.cc2
-rw-r--r--sql/parse_file.cc2
-rw-r--r--sql/parse_file.h2
-rw-r--r--sql/partition_element.h2
-rw-r--r--sql/partition_info.cc2
-rw-r--r--sql/partition_info.h2
-rw-r--r--sql/password.c2
-rw-r--r--sql/plistsort.c2
-rw-r--r--sql/procedure.cc2
-rw-r--r--sql/procedure.h2
-rw-r--r--sql/protocol.cc2
-rw-r--r--sql/protocol.h2
-rw-r--r--sql/records.cc2
-rw-r--r--sql/records.h2
-rw-r--r--sql/repl_failsafe.cc2
-rw-r--r--sql/repl_failsafe.h2
-rw-r--r--sql/replication.h2
-rw-r--r--sql/rpl_constants.h2
-rw-r--r--sql/rpl_filter.cc2
-rw-r--r--sql/rpl_filter.h2
-rw-r--r--sql/rpl_gtid.cc2
-rw-r--r--sql/rpl_gtid.h2
-rw-r--r--sql/rpl_handler.cc2
-rw-r--r--sql/rpl_handler.h2
-rw-r--r--sql/rpl_injector.cc2
-rw-r--r--sql/rpl_injector.h2
-rw-r--r--sql/rpl_mi.cc2
-rw-r--r--sql/rpl_mi.h2
-rw-r--r--sql/rpl_record.cc2
-rw-r--r--sql/rpl_record.h2
-rw-r--r--sql/rpl_record_old.cc2
-rw-r--r--sql/rpl_record_old.h2
-rw-r--r--sql/rpl_reporting.cc2
-rw-r--r--sql/rpl_reporting.h2
-rw-r--r--sql/rpl_rli.cc2
-rw-r--r--sql/rpl_rli.h2
-rw-r--r--sql/rpl_tblmap.cc2
-rw-r--r--sql/rpl_tblmap.h2
-rw-r--r--sql/rpl_utility.cc2
-rw-r--r--sql/rpl_utility.h2
-rw-r--r--sql/scheduler.cc2
-rw-r--r--sql/scheduler.h2
-rw-r--r--sql/set_var.cc2
-rw-r--r--sql/set_var.h2
-rw-r--r--sql/share/CMakeLists.txt2
-rw-r--r--sql/share/charsets/Index.xml2
-rw-r--r--sql/share/charsets/armscii8.xml2
-rw-r--r--sql/share/charsets/ascii.xml2
-rw-r--r--sql/share/charsets/cp1250.xml2
-rw-r--r--sql/share/charsets/cp1251.xml2
-rw-r--r--sql/share/charsets/cp1256.xml2
-rw-r--r--sql/share/charsets/cp1257.xml2
-rw-r--r--sql/share/charsets/cp850.xml2
-rw-r--r--sql/share/charsets/cp852.xml2
-rw-r--r--sql/share/charsets/cp866.xml2
-rw-r--r--sql/share/charsets/dec8.xml2
-rw-r--r--sql/share/charsets/geostd8.xml2
-rw-r--r--sql/share/charsets/greek.xml2
-rw-r--r--sql/share/charsets/hebrew.xml2
-rw-r--r--sql/share/charsets/hp8.xml2
-rw-r--r--sql/share/charsets/keybcs2.xml2
-rw-r--r--sql/share/charsets/koi8r.xml2
-rw-r--r--sql/share/charsets/koi8u.xml2
-rw-r--r--sql/share/charsets/languages.html2
-rw-r--r--sql/share/charsets/latin1.xml2
-rw-r--r--sql/share/charsets/latin2.xml2
-rw-r--r--sql/share/charsets/latin5.xml2
-rw-r--r--sql/share/charsets/latin7.xml2
-rw-r--r--sql/share/charsets/macce.xml2
-rw-r--r--sql/share/charsets/macroman.xml2
-rw-r--r--sql/share/charsets/swe7.xml2
-rw-r--r--sql/signal_handler.cc2
-rw-r--r--sql/slave.cc2
-rw-r--r--sql/slave.h2
-rw-r--r--sql/sp.cc2
-rw-r--r--sql/sp.h2
-rw-r--r--sql/sp_cache.cc2
-rw-r--r--sql/sp_cache.h2
-rw-r--r--sql/sp_head.cc2
-rw-r--r--sql/sp_head.h2
-rw-r--r--sql/sp_pcontext.cc2
-rw-r--r--sql/sp_pcontext.h2
-rw-r--r--sql/sp_rcontext.cc2
-rw-r--r--sql/sp_rcontext.h2
-rw-r--r--sql/spatial.cc2
-rw-r--r--sql/spatial.h2
-rw-r--r--sql/sql_acl.cc2
-rw-r--r--sql/sql_acl.h2
-rw-r--r--sql/sql_admin.cc2
-rw-r--r--sql/sql_admin.h2
-rw-r--r--sql/sql_alter.cc2
-rw-r--r--sql/sql_alter.h2
-rw-r--r--sql/sql_analyse.cc2
-rw-r--r--sql/sql_analyse.h2
-rw-r--r--sql/sql_analyze_stmt.cc2
-rw-r--r--sql/sql_analyze_stmt.h2
-rw-r--r--sql/sql_array.h2
-rw-r--r--sql/sql_audit.cc2
-rw-r--r--sql/sql_audit.h2
-rw-r--r--sql/sql_base.cc2
-rw-r--r--sql/sql_base.h2
-rw-r--r--sql/sql_basic_types.h2
-rw-r--r--sql/sql_binlog.cc2
-rw-r--r--sql/sql_binlog.h2
-rw-r--r--sql/sql_bitmap.h2
-rw-r--r--sql/sql_bootstrap.cc2
-rw-r--r--sql/sql_bootstrap.h2
-rw-r--r--sql/sql_builtin.cc.in2
-rw-r--r--sql/sql_cache.cc2
-rw-r--r--sql/sql_cache.h2
-rw-r--r--sql/sql_callback.h2
-rw-r--r--sql/sql_class.cc2
-rw-r--r--sql/sql_class.h2
-rw-r--r--sql/sql_client.cc2
-rw-r--r--sql/sql_cmd.h2
-rw-r--r--sql/sql_connect.cc2
-rw-r--r--sql/sql_connect.h2
-rw-r--r--sql/sql_const.h2
-rw-r--r--sql/sql_crypt.cc2
-rw-r--r--sql/sql_crypt.h2
-rw-r--r--sql/sql_cursor.cc2
-rw-r--r--sql/sql_cursor.h2
-rw-r--r--sql/sql_db.cc2
-rw-r--r--sql/sql_db.h2
-rw-r--r--sql/sql_delete.cc2
-rw-r--r--sql/sql_delete.h2
-rw-r--r--sql/sql_derived.cc2
-rw-r--r--sql/sql_derived.h2
-rw-r--r--sql/sql_digest.cc2
-rw-r--r--sql/sql_digest.h2
-rw-r--r--sql/sql_digest_stream.h2
-rw-r--r--sql/sql_do.cc2
-rw-r--r--sql/sql_do.h2
-rw-r--r--sql/sql_error.cc2
-rw-r--r--sql/sql_error.h2
-rw-r--r--sql/sql_explain.cc2
-rw-r--r--sql/sql_explain.h2
-rw-r--r--sql/sql_expression_cache.cc2
-rw-r--r--sql/sql_expression_cache.h2
-rw-r--r--sql/sql_get_diagnostics.cc2
-rw-r--r--sql/sql_get_diagnostics.h2
-rw-r--r--sql/sql_handler.cc2
-rw-r--r--sql/sql_handler.h2
-rw-r--r--sql/sql_help.cc2
-rw-r--r--sql/sql_help.h2
-rw-r--r--sql/sql_hset.h2
-rw-r--r--sql/sql_insert.cc2
-rw-r--r--sql/sql_insert.h2
-rw-r--r--sql/sql_join_cache.cc2
-rw-r--r--sql/sql_join_cache.h2
-rw-r--r--sql/sql_lex.cc2
-rw-r--r--sql/sql_lex.h2
-rw-r--r--sql/sql_lifo_buffer.h2
-rw-r--r--sql/sql_list.cc2
-rw-r--r--sql/sql_list.h2
-rw-r--r--sql/sql_load.cc2
-rw-r--r--sql/sql_load.h2
-rw-r--r--sql/sql_locale.cc2
-rw-r--r--sql/sql_locale.h2
-rw-r--r--sql/sql_manager.cc2
-rw-r--r--sql/sql_manager.h2
-rw-r--r--sql/sql_parse.cc2
-rw-r--r--sql/sql_parse.h2
-rw-r--r--sql/sql_partition.cc2
-rw-r--r--sql/sql_partition.h2
-rw-r--r--sql/sql_partition_admin.cc2
-rw-r--r--sql/sql_partition_admin.h2
-rw-r--r--sql/sql_plist.h2
-rw-r--r--sql/sql_plugin.cc2
-rw-r--r--sql/sql_plugin.h2
-rw-r--r--sql/sql_plugin_compat.h2
-rw-r--r--sql/sql_plugin_services.ic2
-rw-r--r--sql/sql_prepare.cc2
-rw-r--r--sql/sql_prepare.h2
-rw-r--r--sql/sql_priv.h2
-rw-r--r--sql/sql_profile.cc2
-rw-r--r--sql/sql_profile.h2
-rw-r--r--sql/sql_reload.cc2
-rw-r--r--sql/sql_reload.h2
-rw-r--r--sql/sql_rename.cc2
-rw-r--r--sql/sql_rename.h2
-rw-r--r--sql/sql_repl.cc2
-rw-r--r--sql/sql_repl.h2
-rw-r--r--sql/sql_select.cc2
-rw-r--r--sql/sql_select.h2
-rw-r--r--sql/sql_servers.cc2
-rw-r--r--sql/sql_servers.h2
-rw-r--r--sql/sql_show.cc2
-rw-r--r--sql/sql_show.h2
-rw-r--r--sql/sql_signal.cc2
-rw-r--r--sql/sql_signal.h2
-rw-r--r--sql/sql_sort.h2
-rw-r--r--sql/sql_state.c2
-rw-r--r--sql/sql_statistics.cc2
-rw-r--r--sql/sql_statistics.h2
-rw-r--r--sql/sql_string.cc2
-rw-r--r--sql/sql_string.h2
-rw-r--r--sql/sql_table.cc2
-rw-r--r--sql/sql_table.h2
-rw-r--r--sql/sql_tablespace.cc2
-rw-r--r--sql/sql_tablespace.h2
-rw-r--r--sql/sql_test.cc2
-rw-r--r--sql/sql_test.h2
-rw-r--r--sql/sql_time.cc2
-rw-r--r--sql/sql_time.h2
-rw-r--r--sql/sql_trigger.cc2
-rw-r--r--sql/sql_trigger.h2
-rw-r--r--sql/sql_truncate.cc2
-rw-r--r--sql/sql_truncate.h2
-rw-r--r--sql/sql_type.cc2
-rw-r--r--sql/sql_type.h2
-rw-r--r--sql/sql_type_int.h2
-rw-r--r--sql/sql_udf.cc2
-rw-r--r--sql/sql_udf.h2
-rw-r--r--sql/sql_union.cc2
-rw-r--r--sql/sql_union.h2
-rw-r--r--sql/sql_update.cc2
-rw-r--r--sql/sql_update.h2
-rw-r--r--sql/sql_view.cc2
-rw-r--r--sql/sql_view.h2
-rw-r--r--sql/sql_yacc.yy2
-rw-r--r--sql/strfunc.cc2
-rw-r--r--sql/strfunc.h2
-rw-r--r--sql/structs.h2
-rw-r--r--sql/sys_vars.cc2
-rw-r--r--sql/sys_vars.ic2
-rw-r--r--sql/sys_vars_shared.h2
-rw-r--r--sql/table.cc2
-rw-r--r--sql/table.h2
-rw-r--r--sql/table_cache.cc2
-rw-r--r--sql/table_cache.h2
-rw-r--r--sql/thr_malloc.cc2
-rw-r--r--sql/thr_malloc.h2
-rw-r--r--sql/threadpool.h2
-rw-r--r--sql/threadpool_common.cc2
-rw-r--r--sql/threadpool_generic.cc2
-rw-r--r--sql/threadpool_win.cc2
-rw-r--r--sql/transaction.cc2
-rw-r--r--sql/transaction.h2
-rw-r--r--sql/tzfile.h2
-rw-r--r--sql/tztime.cc2
-rw-r--r--sql/tztime.h2
-rw-r--r--sql/udf_example.c2
-rw-r--r--sql/uniques.cc2
-rw-r--r--sql/unireg.cc2
-rw-r--r--sql/unireg.h2
-rw-r--r--sql/winservice.c2
-rw-r--r--sql/winservice.h2
-rw-r--r--sql/wsrep_applier.cc2
-rw-r--r--sql/wsrep_applier.h2
-rw-r--r--sql/wsrep_binlog.cc2
-rw-r--r--sql/wsrep_binlog.h2
-rw-r--r--sql/wsrep_check_opts.cc2
-rw-r--r--sql/wsrep_dummy.cc2
-rw-r--r--sql/wsrep_hton.cc2
-rw-r--r--sql/wsrep_mysqld.cc2
-rw-r--r--sql/wsrep_mysqld.h2
-rw-r--r--sql/wsrep_mysqld_c.h2
-rw-r--r--sql/wsrep_notify.cc2
-rw-r--r--sql/wsrep_priv.h2
-rw-r--r--sql/wsrep_sst.cc2
-rw-r--r--sql/wsrep_sst.h2
-rw-r--r--sql/wsrep_thd.cc2
-rw-r--r--sql/wsrep_thd.h2
-rw-r--r--sql/wsrep_utils.cc2
-rw-r--r--sql/wsrep_utils.h2
-rw-r--r--sql/wsrep_var.cc2
-rw-r--r--sql/wsrep_var.h2
-rw-r--r--sql/wsrep_xid.cc2
-rw-r--r--sql/wsrep_xid.h2
399 files changed, 401 insertions, 401 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 1b52c26ce22..769a1b53331 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
IF(WITH_WSREP AND NOT EMBEDDED_LIBRARY)
diff --git a/sql/authors.h b/sql/authors.h
index 3a8f5497248..4c6482ed680 100644
--- a/sql/authors.h
+++ b/sql/authors.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Structure of the name list */
diff --git a/sql/bounded_queue.h b/sql/bounded_queue.h
index 3573c5ceb27..466b00bdb1f 100644
--- a/sql/bounded_queue.h
+++ b/sql/bounded_queue.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 */
#ifndef BOUNDED_QUEUE_INCLUDED
#define BOUNDED_QUEUE_INCLUDED
diff --git a/sql/client_settings.h b/sql/client_settings.h
index 486862b276d..cc4981ec6ae 100644
--- a/sql/client_settings.h
+++ b/sql/client_settings.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef CLIENT_SETTINGS_INCLUDED
diff --git a/sql/compat56.cc b/sql/compat56.cc
index b2e67a50491..1ae654338c0 100644
--- a/sql/compat56.cc
+++ b/sql/compat56.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "my_global.h"
#include "compat56.h"
diff --git a/sql/compat56.h b/sql/compat56.h
index bb5e2670f7d..7f72c26c03a 100644
--- a/sql/compat56.h
+++ b/sql/compat56.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/** MySQL56 routines and macros **/
diff --git a/sql/contributors.h b/sql/contributors.h
index 69f8fa6bd4c..34f06087c8c 100644
--- a/sql/contributors.h
+++ b/sql/contributors.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Structure of the name list */
diff --git a/sql/create_options.cc b/sql/create_options.cc
index 53258dac3fc..4049443de2a 100644
--- a/sql/create_options.cc
+++ b/sql/create_options.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 */
/**
@file
diff --git a/sql/create_options.h b/sql/create_options.h
index 191ec88750a..6a8d1acd8fe 100644
--- a/sql/create_options.h
+++ b/sql/create_options.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 */
/**
@file
diff --git a/sql/custom_conf.h b/sql/custom_conf.h
index 62fdb619c27..5847b939ca7 100644
--- a/sql/custom_conf.h
+++ b/sql/custom_conf.h
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef __MYSQL_CUSTOM_BUILD_CONFIG__
#define __MYSQL_CUSTOM_BUILD_CONFIG__
diff --git a/sql/datadict.cc b/sql/datadict.cc
index ec3d65f0113..77f7a0fcfcb 100644
--- a/sql/datadict.cc
+++ b/sql/datadict.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "datadict.h"
diff --git a/sql/datadict.h b/sql/datadict.h
index 9b180a882f9..a256c89ba84 100644
--- a/sql/datadict.h
+++ b/sql/datadict.h
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "handler.h"
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
index 2d34322c59e..aafce9065e3 100644
--- a/sql/debug_sync.cc
+++ b/sql/debug_sync.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* see include/mysql/service_debug_sync.h for debug sync documentation */
diff --git a/sql/debug_sync.h b/sql/debug_sync.h
index 999667b9efc..1a3e51b898b 100644
--- a/sql/debug_sync.h
+++ b/sql/debug_sync.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/derror.cc b/sql/derror.cc
index 5a1bee23f4a..f5e63772d54 100644
--- a/sql/derror.cc
+++ b/sql/derror.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/derror.h b/sql/derror.h
index 9f2aee71c7e..f80ed17fd7b 100644
--- a/sql/derror.h
+++ b/sql/derror.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef DERROR_INCLUDED
#define DERROR_INCLUDED
diff --git a/sql/des_key_file.cc b/sql/des_key_file.cc
index ede2e9fa9d4..f942feb5823 100644
--- a/sql/des_key_file.cc
+++ b/sql/des_key_file.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h> // HAVE_*
#include "sql_priv.h"
diff --git a/sql/des_key_file.h b/sql/des_key_file.h
index 024a1715d47..847cd767b4b 100644
--- a/sql/des_key_file.h
+++ b/sql/des_key_file.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef DES_KEY_FILE_INCLUDED
#define DES_KEY_FILE_INCLUDED
diff --git a/sql/discover.cc b/sql/discover.cc
index 62a0084e2e7..c9dea535727 100644
--- a/sql/discover.cc
+++ b/sql/discover.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/discover.h b/sql/discover.h
index e1508107235..a3d61c4f155 100644
--- a/sql/discover.h
+++ b/sql/discover.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef DISCOVER_INCLUDED
#define DISCOVER_INCLUDED
diff --git a/sql/encryption.cc b/sql/encryption.cc
index e5b54633066..ad23c80b8ab 100644
--- a/sql/encryption.cc
+++ b/sql/encryption.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include <mysql/plugin_encryption.h>
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc
index 90e839debb5..dab09161ca0 100644
--- a/sql/event_data_objects.cc
+++ b/sql/event_data_objects.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#define MYSQL_LEX 1
#include <my_global.h> /* NO_EMBEDDED_ACCESS_CHECKS */
diff --git a/sql/event_data_objects.h b/sql/event_data_objects.h
index 7ad8191f4d2..0acf301ef5a 100644
--- a/sql/event_data_objects.h
+++ b/sql/event_data_objects.h
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@addtogroup Event_Scheduler
diff --git a/sql/event_db_repository.cc b/sql/event_db_repository.cc
index 50bc84883a0..5188f86c01b 100644
--- a/sql/event_db_repository.cc
+++ b/sql/event_db_repository.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/event_db_repository.h b/sql/event_db_repository.h
index e7b52bacc2a..d6834d5aec6 100644
--- a/sql/event_db_repository.h
+++ b/sql/event_db_repository.h
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
/**
diff --git a/sql/event_parse_data.cc b/sql/event_parse_data.cc
index 6fa0c25508e..e88ace53149 100644
--- a/sql/event_parse_data.cc
+++ b/sql/event_parse_data.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/event_parse_data.h b/sql/event_parse_data.h
index 3ca7fcaab72..03f6e8c3d14 100644
--- a/sql/event_parse_data.h
+++ b/sql/event_parse_data.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _EVENT_PARSE_DATA_H_
#define _EVENT_PARSE_DATA_H_
diff --git a/sql/event_queue.cc b/sql/event_queue.cc
index 01a1507f6f2..6cc2179be5b 100644
--- a/sql/event_queue.cc
+++ b/sql/event_queue.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/event_queue.h b/sql/event_queue.h
index fdd5937ee17..2f1e9a59c9d 100644
--- a/sql/event_queue.h
+++ b/sql/event_queue.h
@@ -13,7 +13,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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc
index 57bbf0e1eea..f680163c49a 100644
--- a/sql/event_scheduler.cc
+++ b/sql/event_scheduler.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/event_scheduler.h b/sql/event_scheduler.h
index 6ec7dccefb9..59ac923cf6d 100644
--- a/sql/event_scheduler.h
+++ b/sql/event_scheduler.h
@@ -13,7 +13,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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@addtogroup Event_Scheduler
diff --git a/sql/events.cc b/sql/events.cc
index 70ee0c2631f..15da0adee70 100644
--- a/sql/events.cc
+++ b/sql/events.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/events.h b/sql/events.h
index 368aa9a05d5..7268c569b03 100644
--- a/sql/events.h
+++ b/sql/events.h
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@defgroup Event_Scheduler Event Scheduler
diff --git a/sql/field.cc b/sql/field.cc
index 30eed286512..e9eaa440952 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
/**
diff --git a/sql/field.h b/sql/field.h
index 5a1ec2df8d0..083f3d01bb8 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Because of the function make_new_field() all field classes that have static
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index cec3d3a3e7d..e92f1930a7c 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 2bab4390309..f6530124b60 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/filesort.h b/sql/filesort.h
index 2b4f7ac2654..748e6b2b1ce 100644
--- a/sql/filesort.h
+++ b/sql/filesort.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef FILESORT_INCLUDED
#define FILESORT_INCLUDED
diff --git a/sql/filesort_utils.cc b/sql/filesort_utils.cc
index cb0b2d52b6f..0546ba3374d 100644
--- a/sql/filesort_utils.cc
+++ b/sql/filesort_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 "filesort_utils.h"
#include "sql_const.h"
diff --git a/sql/filesort_utils.h b/sql/filesort_utils.h
index d537b602edf..c463e1858ca 100644
--- a/sql/filesort_utils.h
+++ b/sql/filesort_utils.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef FILESORT_UTILS_INCLUDED
#define FILESORT_UTILS_INCLUDED
diff --git a/sql/gcalc_slicescan.cc b/sql/gcalc_slicescan.cc
index ba75a1ed827..d42babebf85 100644
--- a/sql/gcalc_slicescan.cc
+++ b/sql/gcalc_slicescan.cc
@@ -12,7 +12,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 <my_global.h>
diff --git a/sql/gcalc_slicescan.h b/sql/gcalc_slicescan.h
index ebf173c1a57..54b12962d2a 100644
--- a/sql/gcalc_slicescan.h
+++ b/sql/gcalc_slicescan.h
@@ -12,7 +12,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 */
#ifndef GCALC_SLICESCAN_INCLUDED
diff --git a/sql/gcalc_tools.cc b/sql/gcalc_tools.cc
index b472665d0d2..8bd6a45f7aa 100644
--- a/sql/gcalc_tools.cc
+++ b/sql/gcalc_tools.cc
@@ -12,7 +12,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 <my_global.h>
diff --git a/sql/gcalc_tools.h b/sql/gcalc_tools.h
index 4d5aec0d443..77da791f0b9 100644
--- a/sql/gcalc_tools.h
+++ b/sql/gcalc_tools.h
@@ -12,7 +12,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 */
#ifndef GCALC_TOOLS_INCLUDED
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc
index 05ac7e4fa42..e0e0cadb742 100644
--- a/sql/gen_lex_hash.cc
+++ b/sql/gen_lex_hash.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/gen_lex_token.cc b/sql/gen_lex_token.cc
index bd2b9728177..631c8ecfe52 100644
--- a/sql/gen_lex_token.cc
+++ b/sql/gen_lex_token.cc
@@ -12,7 +12,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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include <stdlib.h>
diff --git a/sql/group_by_handler.cc b/sql/group_by_handler.cc
index c1b5cfbe254..197ada0d4c3 100644
--- a/sql/group_by_handler.cc
+++ b/sql/group_by_handler.cc
@@ -12,7 +12,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 */
/*
This file implements the group_by_handler code. This interface
diff --git a/sql/group_by_handler.h b/sql/group_by_handler.h
index d3f48a15c24..108ebc989d9 100644
--- a/sql/group_by_handler.h
+++ b/sql/group_by_handler.h
@@ -12,7 +12,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 */
/*
This file implements the group_by_handler interface. This interface
diff --git a/sql/gstream.cc b/sql/gstream.cc
index adb46083621..8a3e35ac0c2 100644
--- a/sql/gstream.cc
+++ b/sql/gstream.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Functions to read and parse geometrical data.
diff --git a/sql/gstream.h b/sql/gstream.h
index f10b7e9b830..687627aa5f2 100644
--- a/sql/gstream.h
+++ b/sql/gstream.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "my_global.h" /* NULL, NullS */
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index c280bc13e0a..15e3a765075 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
/*
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 9a73eeff817..1bd3209d82d 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -16,7 +16,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "sql_partition.h" /* part_id_range, partition_element */
#include "queues.h" /* QUEUE */
diff --git a/sql/handler.cc b/sql/handler.cc
index e5b452f9649..10d2991e67c 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -11,8 +11,8 @@
GNU General Public License for more details.
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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/** @file handler.cc
diff --git a/sql/handler.h b/sql/handler.h
index d1e9f93797b..9af46ea98a2 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -16,7 +16,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
/* Definitions for parameters to do with handler-routines */
diff --git a/sql/hash_filo.cc b/sql/hash_filo.cc
index fc89bb83a9d..967ef641bab 100644
--- a/sql/hash_filo.cc
+++ b/sql/hash_filo.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
diff --git a/sql/hash_filo.h b/sql/hash_filo.h
index 4c8c7575efc..d815c428ac6 100644
--- a/sql/hash_filo.h
+++ b/sql/hash_filo.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
diff --git a/sql/hostname.cc b/sql/hostname.cc
index e8d6780d095..a35b8a4f5c7 100644
--- a/sql/hostname.cc
+++ b/sql/hostname.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/hostname.h b/sql/hostname.h
index d6137b7c260..9e84e329a60 100644
--- a/sql/hostname.h
+++ b/sql/hostname.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef HOSTNAME_INCLUDED
#define HOSTNAME_INCLUDED
diff --git a/sql/init.cc b/sql/init.cc
index 8001e60b65e..5f452439f23 100644
--- a/sql/init.cc
+++ b/sql/init.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/init.h b/sql/init.h
index af2621e5e70..053e9612c70 100644
--- a/sql/init.h
+++ b/sql/init.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef INIT_INCLUDED
#define INIT_INCLUDED
diff --git a/sql/innodb_priv.h b/sql/innodb_priv.h
index 27aa9ac8645..e01b9f89d88 100644
--- a/sql/innodb_priv.h
+++ b/sql/innodb_priv.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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef INNODB_PRIV_INCLUDED
#define INNODB_PRIV_INCLUDED
diff --git a/sql/item.cc b/sql/item.cc
index f7092eb6c86..da4a3ee1e05 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_IMPLEMENTATION
diff --git a/sql/item.h b/sql/item.h
index bd72fed5300..326b1a0f867 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -15,7 +15,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_INTERFACE
diff --git a/sql/item_buff.cc b/sql/item_buff.cc
index 488eb52fb77..c0fcb93cbab 100644
--- a/sql/item_buff.cc
+++ b/sql/item_buff.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 83716a0e924..8bf130b297f 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index d083248f6cd..f14b5676876 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -14,7 +14,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* compare and test functions */
diff --git a/sql/item_create.cc b/sql/item_create.cc
index 3218d4df844..6e98bccbfb2 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/item_create.h b/sql/item_create.h
index 05fe48f656a..97dc594b11c 100644
--- a/sql/item_create.h
+++ b/sql/item_create.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Functions to create an item. Used by sql/sql_yacc.yy */
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 0fa941319a6..6b3373f0795 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/item_func.h b/sql/item_func.h
index 7592fc9b779..81a7e948085 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -14,7 +14,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* Function items used by mysql */
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index 246be438e36..645a3668ed8 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h
index acc94183d47..a858a9a2d57 100644
--- a/sql/item_geofunc.h
+++ b/sql/item_geofunc.h
@@ -15,7 +15,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* This file defines all spatial functions */
diff --git a/sql/item_inetfunc.cc b/sql/item_inetfunc.cc
index 4ea0f544819..3643daf903f 100644
--- a/sql/item_inetfunc.cc
+++ b/sql/item_inetfunc.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "item_inetfunc.h"
diff --git a/sql/item_inetfunc.h b/sql/item_inetfunc.h
index 670dce3da9f..3704f3c952e 100644
--- a/sql/item_inetfunc.h
+++ b/sql/item_inetfunc.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "item.h"
diff --git a/sql/item_row.cc b/sql/item_row.cc
index 24320d884dc..000253ece07 100644
--- a/sql/item_row.cc
+++ b/sql/item_row.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/item_row.h b/sql/item_row.h
index bc82b31f9e2..cb92e741af9 100644
--- a/sql/item_row.h
+++ b/sql/item_row.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
Row items used for comparing rows and IN operations on rows:
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index b88f376e8dd..753b6134419 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
/**
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 9a78a7f34f5..a398b4972cb 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -16,7 +16,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* This file defines all string functions */
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 8cff8f3a5c4..6140097891b 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index 5366c759795..0ff7ee4997e 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* subselect Item */
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index b1b22d0877f..b4bfba0add3 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/item_sum.h b/sql/item_sum.h
index c1373f6c1fc..290aa5c50e3 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* classes for sum functions */
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 23d9c3d2f04..394552f219e 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index c983e1a6f8a..e37438947dd 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -14,7 +14,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* Function items used by mysql */
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc
index 738047fea9b..7fa9f6a8c22 100644
--- a/sql/item_xmlfunc.cc
+++ b/sql/item_xmlfunc.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/item_xmlfunc.h b/sql/item_xmlfunc.h
index c46365ee5f0..692b7a4249e 100644
--- a/sql/item_xmlfunc.h
+++ b/sql/item_xmlfunc.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* This file defines all XML functions */
diff --git a/sql/key.cc b/sql/key.cc
index 116f2954d9e..0eeb256dd87 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Functions to handle keys and fields in forms */
diff --git a/sql/key.h b/sql/key.h
index f2521e4a665..950c45b5512 100644
--- a/sql/key.h
+++ b/sql/key.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef KEY_INCLUDED
#define KEY_INCLUDED
diff --git a/sql/keycaches.cc b/sql/keycaches.cc
index 78e64ebac72..bc0f43a4d69 100644
--- a/sql/keycaches.cc
+++ b/sql/keycaches.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "keycaches.h"
diff --git a/sql/keycaches.h b/sql/keycaches.h
index fff48d51c6f..99528682d0e 100644
--- a/sql/keycaches.h
+++ b/sql/keycaches.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "sql_list.h"
#include <keycache.h>
diff --git a/sql/lex.h b/sql/lex.h
index cd42672b6eb..8efaff665ac 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* This file includes all reserved words and functions */
diff --git a/sql/lex_symbol.h b/sql/lex_symbol.h
index d48ca57df85..e7819cd4e2f 100644
--- a/sql/lex_symbol.h
+++ b/sql/lex_symbol.h
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* This struct includes all reserved words and functions */
diff --git a/sql/lock.cc b/sql/lock.cc
index aba22ebb73d..92e1d2d80fd 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -12,7 +12,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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/lock.h b/sql/lock.h
index b2de4f60b38..460cbd7df8f 100644
--- a/sql/lock.h
+++ b/sql/lock.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef LOCK_INCLUDED
#define LOCK_INCLUDED
diff --git a/sql/log.cc b/sql/log.cc
index 2152fa4f11f..5fd384d55a0 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/log.h b/sql/log.h
index 2a3912a52d3..391030db81f 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef LOG_H
#define LOG_H
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 8aea32004c3..c37ee8d1e5c 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
diff --git a/sql/log_event.h b/sql/log_event.h
index 4ecb3d49e63..a15b2168dda 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@addtogroup Replication
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc
index 098672947b3..55d8660abad 100644
--- a/sql/log_event_old.cc
+++ b/sql/log_event_old.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/log_event_old.h b/sql/log_event_old.h
index 40e01d37318..cccb0674e82 100644
--- a/sql/log_event_old.h
+++ b/sql/log_event_old.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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef LOG_EVENT_OLD_H
#define LOG_EVENT_OLD_H
diff --git a/sql/log_slow.h b/sql/log_slow.h
index 9811d298335..349e366974d 100644
--- a/sql/log_slow.h
+++ b/sql/log_slow.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 */
/* Defining what to log to slow log */
diff --git a/sql/main.cc b/sql/main.cc
index 10141c132a6..957efb8fa2e 100644
--- a/sql/main.cc
+++ b/sql/main.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
main() for mysqld.
diff --git a/sql/mdl.cc b/sql/mdl.cc
index f5c5d06328d..9eeb82eeffd 100644
--- a/sql/mdl.cc
+++ b/sql/mdl.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include "sql_class.h"
diff --git a/sql/mdl.h b/sql/mdl.h
index b76d70763e7..65c7c98c31b 100644
--- a/sql/mdl.h
+++ b/sql/mdl.h
@@ -13,7 +13,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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include "sql_plist.h"
#include <my_sys.h>
diff --git a/sql/mem_root_array.h b/sql/mem_root_array.h
index 5daeedadcba..1230f41247c 100644
--- a/sql/mem_root_array.h
+++ b/sql/mem_root_array.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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MEM_ROOT_ARRAY_INCLUDED
diff --git a/sql/message.h b/sql/message.h
index 6641453a965..934503751d6 100644
--- a/sql/message.h
+++ b/sql/message.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
To change or add messages mysqld writes to the Windows error log, run
diff --git a/sql/mf_iocache.cc b/sql/mf_iocache.cc
index 8337c93fe70..8533c9037aa 100644
--- a/sql/mf_iocache.cc
+++ b/sql/mf_iocache.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/mf_iocache_encr.cc b/sql/mf_iocache_encr.cc
index 879da12faa4..d741cf8b837 100644
--- a/sql/mf_iocache_encr.cc
+++ b/sql/mf_iocache_encr.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*************************************************************************
Limitation of encrypted IO_CACHEs
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc
index 9b6d0e86f90..2151b6d41cc 100644
--- a/sql/multi_range_read.cc
+++ b/sql/multi_range_read.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 "sql_parse.h"
#include <my_bit.h>
diff --git a/sql/multi_range_read.h b/sql/multi_range_read.h
index b8234998f74..524e60cb593 100644
--- a/sql/multi_range_read.h
+++ b/sql/multi_range_read.h
@@ -12,7 +12,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 */
/**
@defgroup DS-MRR declarations
diff --git a/sql/my_apc.cc b/sql/my_apc.cc
index b165a801ce5..f54e2ad3a8f 100644
--- a/sql/my_apc.cc
+++ b/sql/my_apc.cc
@@ -12,7 +12,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 */
#ifndef MY_APC_STANDALONE
diff --git a/sql/my_apc.h b/sql/my_apc.h
index 46c6fbd549d..0ac840b784e 100644
--- a/sql/my_apc.h
+++ b/sql/my_apc.h
@@ -14,7 +14,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 */
/*
Interface
diff --git a/sql/my_decimal.cc b/sql/my_decimal.cc
index be732d4a927..eec2676766c 100644
--- a/sql/my_decimal.cc
+++ b/sql/my_decimal.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/my_decimal.h b/sql/my_decimal.h
index 265b370a154..f318bcd1cd3 100644
--- a/sql/my_decimal.h
+++ b/sql/my_decimal.h
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/my_json_writer.cc b/sql/my_json_writer.cc
index 390123fbba9..72b000df639 100644
--- a/sql/my_json_writer.cc
+++ b/sql/my_json_writer.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 <my_global.h>
#include "sql_priv.h"
diff --git a/sql/my_json_writer.h b/sql/my_json_writer.h
index c4b528ae10d..349a1f380da 100644
--- a/sql/my_json_writer.h
+++ b/sql/my_json_writer.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 */
class Json_writer;
diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc
index 73281161335..cadf080cad9 100644
--- a/sql/mysql_install_db.cc
+++ b/sql/mysql_install_db.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 */
/*
mysql_install_db creates a new database instance (optionally as service)
diff --git a/sql/mysql_upgrade_service.cc b/sql/mysql_upgrade_service.cc
index ef01afe899d..37dae648563 100644
--- a/sql/mysql_upgrade_service.cc
+++ b/sql/mysql_upgrade_service.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 */
/*
mysql_upgrade_service upgrades mysql service on Windows.
@@ -530,4 +530,4 @@ int main(int argc, char **argv)
CloseHandle(logfile_handle);
my_end(0);
exit(0);
-} \ No newline at end of file
+}
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index cf96318f34c..2a5661215da 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include "sql_plugin.h" // Includes my_global.h
#include "sql_priv.h"
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 7177f0b2e20..8faac6f6f5d 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MYSQLD_INCLUDED
#define MYSQLD_INCLUDED
diff --git a/sql/mysqld_suffix.h b/sql/mysqld_suffix.h
index fd515ac5998..3c36ba2bc91 100644
--- a/sql/mysqld_suffix.h
+++ b/sql/mysqld_suffix.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index 7b988fd369b..f39eaaadf46 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/opt_index_cond_pushdown.cc b/sql/opt_index_cond_pushdown.cc
index 1dde5228263..cbaa6f4fe7a 100644
--- a/sql/opt_index_cond_pushdown.cc
+++ b/sql/opt_index_cond_pushdown.cc
@@ -12,7 +12,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 "sql_select.h"
#include "sql_test.h"
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index d7bbdeb82a4..70e64c4483a 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
TODO:
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 9e0bd3ae9ff..dff50252e1a 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* classes to use when handling where clause */
diff --git a/sql/opt_range_mrr.cc b/sql/opt_range_mrr.cc
index c7e4496f2c1..e3de12779d3 100644
--- a/sql/opt_range_mrr.cc
+++ b/sql/opt_range_mrr.cc
@@ -12,7 +12,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 */
/****************************************************************************
MRR Range Sequence Interface implementation that walks a SEL_ARG* tree.
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index e7bd7e88af3..38c4d622db1 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -12,7 +12,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 */
/**
@file
diff --git a/sql/opt_subselect.h b/sql/opt_subselect.h
index 7954becfad4..1b4c8116135 100644
--- a/sql/opt_subselect.h
+++ b/sql/opt_subselect.h
@@ -12,7 +12,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 */
/*
Semi-join subquery optimization code definitions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index 8a75aaed8d6..02b95dae44a 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/opt_table_elimination.cc b/sql/opt_table_elimination.cc
index a480a1659e9..91b42b2cc12 100644
--- a/sql/opt_table_elimination.cc
+++ b/sql/opt_table_elimination.cc
@@ -12,7 +12,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 */
/**
@file
diff --git a/sql/parse_file.cc b/sql/parse_file.cc
index 2aad3f38761..999f53bd681 100644
--- a/sql/parse_file.cc
+++ b/sql/parse_file.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/parse_file.h b/sql/parse_file.h
index 87917dbd71b..54a2b86dca9 100644
--- a/sql/parse_file.h
+++ b/sql/parse_file.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _PARSE_FILE_H_
#define _PARSE_FILE_H_
diff --git a/sql/partition_element.h b/sql/partition_element.h
index b979b7a58e6..5241d00989f 100644
--- a/sql/partition_element.h
+++ b/sql/partition_element.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "my_base.h" /* ha_rows */
#include "handler.h" /* UNDEF_NODEGROUP */
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index 3d10166b3d8..ef817fffe1e 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Some general useful functions */
diff --git a/sql/partition_info.h b/sql/partition_info.h
index ab880f24a74..d42ef380c8c 100644
--- a/sql/partition_info.h
+++ b/sql/partition_info.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
diff --git a/sql/password.c b/sql/password.c
index debdf598189..8ac6ee0ebae 100644
--- a/sql/password.c
+++ b/sql/password.c
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* password checking routines */
/*****************************************************************************
diff --git a/sql/plistsort.c b/sql/plistsort.c
index e66bd7c7276..6efea273963 100644
--- a/sql/plistsort.c
+++ b/sql/plistsort.c
@@ -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 */
/*
diff --git a/sql/procedure.cc b/sql/procedure.cc
index 8f9d6c0a7f3..75a3a4ea8a9 100644
--- a/sql/procedure.cc
+++ b/sql/procedure.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Procedures (functions with changes output of select) */
diff --git a/sql/procedure.h b/sql/procedure.h
index b9d5066bb3d..c1b97c9afb9 100644
--- a/sql/procedure.h
+++ b/sql/procedure.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* When using sql procedures */
diff --git a/sql/protocol.cc b/sql/protocol.cc
index 256cecac6bb..8b7e0cbcbea 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/protocol.h b/sql/protocol.h
index 1a6cb3bdc3c..6d6bf4b2297 100644
--- a/sql/protocol.h
+++ b/sql/protocol.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
diff --git a/sql/records.cc b/sql/records.cc
index 7d36d52228b..3db34425e29 100644
--- a/sql/records.cc
+++ b/sql/records.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_INTERFACE
#pragma implementation /* gcc class implementation */
diff --git a/sql/records.h b/sql/records.h
index 473cb610be5..b5f04dbd161 100644
--- a/sql/records.h
+++ b/sql/records.h
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index 4cf7df5227f..7a3725a7687 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/repl_failsafe.h b/sql/repl_failsafe.h
index 2cc031a462d..d11cfae1108 100644
--- a/sql/repl_failsafe.h
+++ b/sql/repl_failsafe.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef HAVE_REPLICATION
diff --git a/sql/replication.h b/sql/replication.h
index 4731c2246ef..cd3d05d2159 100644
--- a/sql/replication.h
+++ b/sql/replication.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef REPLICATION_H
#define REPLICATION_H
diff --git a/sql/rpl_constants.h b/sql/rpl_constants.h
index 0a7fde439dd..f319d08303c 100644
--- a/sql/rpl_constants.h
+++ b/sql/rpl_constants.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef RPL_CONSTANTS_H
#define RPL_CONSTANTS_H
diff --git a/sql/rpl_filter.cc b/sql/rpl_filter.cc
index 0ab4c62235f..4c4b56f591f 100644
--- a/sql/rpl_filter.cc
+++ b/sql/rpl_filter.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/rpl_filter.h b/sql/rpl_filter.h
index f24ece30a80..f22ec8a0ce4 100644
--- a/sql/rpl_filter.h
+++ b/sql/rpl_filter.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef RPL_FILTER_H
#define RPL_FILTER_H
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc
index f700f7411ca..cc6c169c0df 100644
--- a/sql/rpl_gtid.cc
+++ b/sql/rpl_gtid.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Definitions for MariaDB global transaction ID (GTID). */
diff --git a/sql/rpl_gtid.h b/sql/rpl_gtid.h
index 35744bc35b1..e4949ff0d39 100644
--- a/sql/rpl_gtid.h
+++ b/sql/rpl_gtid.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef RPL_GTID_H
#define RPL_GTID_H
diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc
index 520fb61d8c4..9582e087672 100644
--- a/sql/rpl_handler.cc
+++ b/sql/rpl_handler.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/rpl_handler.h b/sql/rpl_handler.h
index afcfd9d55b1..b53f93dca38 100644
--- a/sql/rpl_handler.h
+++ b/sql/rpl_handler.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef RPL_HANDLER_H
#define RPL_HANDLER_H
diff --git a/sql/rpl_injector.cc b/sql/rpl_injector.cc
index bff0da26862..53999d57bf6 100644
--- a/sql/rpl_injector.cc
+++ b/sql/rpl_injector.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/rpl_injector.h b/sql/rpl_injector.h
index 41e1fcf460c..cd4568cdb08 100644
--- a/sql/rpl_injector.h
+++ b/sql/rpl_injector.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef INJECTOR_H
#define INJECTOR_H
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc
index 3b0de3deb1c..9c73d85bc36 100644
--- a/sql/rpl_mi.cc
+++ b/sql/rpl_mi.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h> // For HAVE_REPLICATION
#include "sql_priv.h"
diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h
index d0f6171815c..12574285de0 100644
--- a/sql/rpl_mi.h
+++ b/sql/rpl_mi.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef RPL_MI_H
#define RPL_MI_H
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc
index dd4c952fa30..214738f930a 100644
--- a/sql/rpl_record.cc
+++ b/sql/rpl_record.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/rpl_record.h b/sql/rpl_record.h
index be69716d9d5..36b654a45e0 100644
--- a/sql/rpl_record.h
+++ b/sql/rpl_record.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef RPL_RECORD_H
#define RPL_RECORD_H
diff --git a/sql/rpl_record_old.cc b/sql/rpl_record_old.cc
index 8e21c4a94a5..baedf60cfde 100644
--- a/sql/rpl_record_old.cc
+++ b/sql/rpl_record_old.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/rpl_record_old.h b/sql/rpl_record_old.h
index 34ef9f11c47..0b2dd432138 100644
--- a/sql/rpl_record_old.h
+++ b/sql/rpl_record_old.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef RPL_RECORD_OLD_H
#define RPL_RECORD_OLD_H
diff --git a/sql/rpl_reporting.cc b/sql/rpl_reporting.cc
index ad949402511..d6107e94987 100644
--- a/sql/rpl_reporting.cc
+++ b/sql/rpl_reporting.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/rpl_reporting.h b/sql/rpl_reporting.h
index d90b7ad6650..6867b77eb0a 100644
--- a/sql/rpl_reporting.h
+++ b/sql/rpl_reporting.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef RPL_REPORTING_H
#define RPL_REPORTING_H
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 26b93da3917..3e1bb28f701 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -12,7 +12,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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h
index 564582a47be..4ec4821b67d 100644
--- a/sql/rpl_rli.h
+++ b/sql/rpl_rli.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef RPL_RLI_H
#define RPL_RLI_H
diff --git a/sql/rpl_tblmap.cc b/sql/rpl_tblmap.cc
index 15bb8a054eb..2ec48162786 100644
--- a/sql/rpl_tblmap.cc
+++ b/sql/rpl_tblmap.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/rpl_tblmap.h b/sql/rpl_tblmap.h
index 05b298e6053..63bac5e68a8 100644
--- a/sql/rpl_tblmap.h
+++ b/sql/rpl_tblmap.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef TABLE_MAPPING_H
#define TABLE_MAPPING_H
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc
index 9554daeedbd..4277e68a8b5 100644
--- a/sql/rpl_utility.cc
+++ b/sql/rpl_utility.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include <my_bit.h>
diff --git a/sql/rpl_utility.h b/sql/rpl_utility.h
index ed0ce16363b..b42b11231e0 100644
--- a/sql/rpl_utility.h
+++ b/sql/rpl_utility.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef RPL_UTILITY_H
#define RPL_UTILITY_H
diff --git a/sql/scheduler.cc b/sql/scheduler.cc
index de472ae2504..1d2f506cde6 100644
--- a/sql/scheduler.cc
+++ b/sql/scheduler.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Implementation for the thread scheduler
diff --git a/sql/scheduler.h b/sql/scheduler.h
index 71553372999..a32d090f563 100644
--- a/sql/scheduler.h
+++ b/sql/scheduler.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Classes for the thread scheduler
diff --git a/sql/set_var.cc b/sql/set_var.cc
index a17e7b0aa58..036cc5f1d43 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* variable declarations are in sys_vars.cc now !!! */
diff --git a/sql/set_var.h b/sql/set_var.h
index d92b244cd1a..8a563f3c089 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -14,7 +14,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/share/CMakeLists.txt b/sql/share/CMakeLists.txt
index 2980e6153f5..55f39e5e22b 100644
--- a/sql/share/CMakeLists.txt
+++ b/sql/share/CMakeLists.txt
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
SET (dirs
danish
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index 912d196cc3c..058f48ace15 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<description>
diff --git a/sql/share/charsets/armscii8.xml b/sql/share/charsets/armscii8.xml
index c1eb93b1f91..161d469c3bc 100644
--- a/sql/share/charsets/armscii8.xml
+++ b/sql/share/charsets/armscii8.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="armscii8">
diff --git a/sql/share/charsets/ascii.xml b/sql/share/charsets/ascii.xml
index c516a68516c..0f90f4983e3 100644
--- a/sql/share/charsets/ascii.xml
+++ b/sql/share/charsets/ascii.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="ascii">
diff --git a/sql/share/charsets/cp1250.xml b/sql/share/charsets/cp1250.xml
index e6681a625a2..55379ef6618 100644
--- a/sql/share/charsets/cp1250.xml
+++ b/sql/share/charsets/cp1250.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="cp1250">
diff --git a/sql/share/charsets/cp1251.xml b/sql/share/charsets/cp1251.xml
index 4cd584c0bf5..33a36289e5e 100644
--- a/sql/share/charsets/cp1251.xml
+++ b/sql/share/charsets/cp1251.xml
@@ -16,7 +16,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="cp1251">
diff --git a/sql/share/charsets/cp1256.xml b/sql/share/charsets/cp1256.xml
index ab0ba855f3b..4584b30c0c3 100644
--- a/sql/share/charsets/cp1256.xml
+++ b/sql/share/charsets/cp1256.xml
@@ -19,7 +19,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="cp1256">
diff --git a/sql/share/charsets/cp1257.xml b/sql/share/charsets/cp1257.xml
index 61d1d276b0a..d2f3d59fefa 100644
--- a/sql/share/charsets/cp1257.xml
+++ b/sql/share/charsets/cp1257.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="cp1257">
diff --git a/sql/share/charsets/cp850.xml b/sql/share/charsets/cp850.xml
index 06465540a75..32eb37e3c80 100644
--- a/sql/share/charsets/cp850.xml
+++ b/sql/share/charsets/cp850.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="cp850">
diff --git a/sql/share/charsets/cp852.xml b/sql/share/charsets/cp852.xml
index e0c574d2ea1..f038fa92d9b 100644
--- a/sql/share/charsets/cp852.xml
+++ b/sql/share/charsets/cp852.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="cp852">
diff --git a/sql/share/charsets/cp866.xml b/sql/share/charsets/cp866.xml
index 9cd8c8c504b..3245326afc2 100644
--- a/sql/share/charsets/cp866.xml
+++ b/sql/share/charsets/cp866.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="cp866">
diff --git a/sql/share/charsets/dec8.xml b/sql/share/charsets/dec8.xml
index 68949309ced..2569713318a 100644
--- a/sql/share/charsets/dec8.xml
+++ b/sql/share/charsets/dec8.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="dec8">
diff --git a/sql/share/charsets/geostd8.xml b/sql/share/charsets/geostd8.xml
index 822cc083724..bcb3148feb8 100644
--- a/sql/share/charsets/geostd8.xml
+++ b/sql/share/charsets/geostd8.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="geostd8">
diff --git a/sql/share/charsets/greek.xml b/sql/share/charsets/greek.xml
index cbbe22e675a..9ab0cb68338 100644
--- a/sql/share/charsets/greek.xml
+++ b/sql/share/charsets/greek.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="greek">
diff --git a/sql/share/charsets/hebrew.xml b/sql/share/charsets/hebrew.xml
index 562fa4f4748..295440b4e3e 100644
--- a/sql/share/charsets/hebrew.xml
+++ b/sql/share/charsets/hebrew.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="hebrew">
diff --git a/sql/share/charsets/hp8.xml b/sql/share/charsets/hp8.xml
index b17f75ed73e..628ebe7f34c 100644
--- a/sql/share/charsets/hp8.xml
+++ b/sql/share/charsets/hp8.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="hp8">
diff --git a/sql/share/charsets/keybcs2.xml b/sql/share/charsets/keybcs2.xml
index 7c2775ba5c3..a6079319628 100644
--- a/sql/share/charsets/keybcs2.xml
+++ b/sql/share/charsets/keybcs2.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="keybcs2">
diff --git a/sql/share/charsets/koi8r.xml b/sql/share/charsets/koi8r.xml
index 25264d4f9ce..7a8a936f7a7 100644
--- a/sql/share/charsets/koi8r.xml
+++ b/sql/share/charsets/koi8r.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="koi8r">
diff --git a/sql/share/charsets/koi8u.xml b/sql/share/charsets/koi8u.xml
index a2f5de9feb2..83e85b84360 100644
--- a/sql/share/charsets/koi8u.xml
+++ b/sql/share/charsets/koi8u.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="koi8u">
diff --git a/sql/share/charsets/languages.html b/sql/share/charsets/languages.html
index 3263d6a2ae2..9adce32f393 100644
--- a/sql/share/charsets/languages.html
+++ b/sql/share/charsets/languages.html
@@ -14,7 +14,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 02110-1301, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
#<pre>
(
diff --git a/sql/share/charsets/latin1.xml b/sql/share/charsets/latin1.xml
index 68307847d91..f88a2840f56 100644
--- a/sql/share/charsets/latin1.xml
+++ b/sql/share/charsets/latin1.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="latin1">
diff --git a/sql/share/charsets/latin2.xml b/sql/share/charsets/latin2.xml
index 29ff4cb974b..20e7803cefe 100644
--- a/sql/share/charsets/latin2.xml
+++ b/sql/share/charsets/latin2.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="latin2">
diff --git a/sql/share/charsets/latin5.xml b/sql/share/charsets/latin5.xml
index ca7dd106de5..727019ccd94 100644
--- a/sql/share/charsets/latin5.xml
+++ b/sql/share/charsets/latin5.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="latin5">
diff --git a/sql/share/charsets/latin7.xml b/sql/share/charsets/latin7.xml
index 81866c23bbd..78b7dda61f2 100644
--- a/sql/share/charsets/latin7.xml
+++ b/sql/share/charsets/latin7.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="latin7">
diff --git a/sql/share/charsets/macce.xml b/sql/share/charsets/macce.xml
index 4fa46301d2e..2a601b7b668 100644
--- a/sql/share/charsets/macce.xml
+++ b/sql/share/charsets/macce.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="macce">
diff --git a/sql/share/charsets/macroman.xml b/sql/share/charsets/macroman.xml
index 4ee8dc1f952..711a391457c 100644
--- a/sql/share/charsets/macroman.xml
+++ b/sql/share/charsets/macroman.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="macroman">
diff --git a/sql/share/charsets/swe7.xml b/sql/share/charsets/swe7.xml
index d881f1e7d62..513c3eeb8d7 100644
--- a/sql/share/charsets/swe7.xml
+++ b/sql/share/charsets/swe7.xml
@@ -17,7 +17,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="swe7">
diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc
index 6c0220b1254..c20f9920b7e 100644
--- a/sql/signal_handler.cc
+++ b/sql/signal_handler.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "my_global.h"
#include <signal.h>
diff --git a/sql/slave.cc b/sql/slave.cc
index 6b234697f09..88a80029bba 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/slave.h b/sql/slave.h
index d3cbaae03df..4b2e6d95b55 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SLAVE_H
#define SLAVE_H
diff --git a/sql/sp.cc b/sql/sp.cc
index 207ece47356..9ffc33486b5 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/sp.h b/sql/sp.h
index 96d49cfe676..3b979d96413 100644
--- a/sql/sp.h
+++ b/sql/sp.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _SP_H_
#define _SP_H_
diff --git a/sql/sp_cache.cc b/sql/sp_cache.cc
index bafd0f34ab6..f99c0bd0b6e 100644
--- a/sql/sp_cache.cc
+++ b/sql/sp_cache.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/sp_cache.h b/sql/sp_cache.h
index b21d4c4bf25..607495666fc 100644
--- a/sql/sp_cache.h
+++ b/sql/sp_cache.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _SP_CACHE_H_
#define _SP_CACHE_H_
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index c473aec51a1..027892b8441 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h> /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_priv.h"
diff --git a/sql/sp_head.h b/sql/sp_head.h
index 9f1745f2aab..e4665360288 100644
--- a/sql/sp_head.h
+++ b/sql/sp_head.h
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _SP_HEAD_H_
#define _SP_HEAD_H_
diff --git a/sql/sp_pcontext.cc b/sql/sp_pcontext.cc
index 9a6353c9337..a6669795de3 100644
--- a/sql/sp_pcontext.cc
+++ b/sql/sp_pcontext.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h
index d4d532340fb..76ddf730ace 100644
--- a/sql/sp_pcontext.h
+++ b/sql/sp_pcontext.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _SP_PCONTEXT_H_
#define _SP_PCONTEXT_H_
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc
index d612e15c000..80a1ffe82c2 100644
--- a/sql/sp_rcontext.cc
+++ b/sql/sp_rcontext.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h
index 2640490fefa..a0a009adb8f 100644
--- a/sql/sp_rcontext.h
+++ b/sql/sp_rcontext.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _SP_RCONTEXT_H_
#define _SP_RCONTEXT_H_
diff --git a/sql/spatial.cc b/sql/spatial.cc
index 5f045f8cbfa..7c78b0dcb71 100644
--- a/sql/spatial.cc
+++ b/sql/spatial.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/spatial.h b/sql/spatial.h
index 901544b6916..76dbd06fdf4 100644
--- a/sql/spatial.h
+++ b/sql/spatial.h
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _spatial_h
#define _spatial_h
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index d5ef3c38b7b..ec6a1de6230 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/*
diff --git a/sql/sql_acl.h b/sql/sql_acl.h
index a4182a4d300..09a721936b9 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "violite.h" /* SSL_type */
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 76bb65fba30..ed5ba93c3fe 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "sql_class.h" // THD and my_global.h
#include "keycaches.h" // get_key_cache
diff --git a/sql/sql_admin.h b/sql/sql_admin.h
index 96594fad0cb..e764ebb1472 100644
--- a/sql/sql_admin.h
+++ b/sql/sql_admin.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_TABLE_MAINTENANCE_H
#define SQL_TABLE_MAINTENANCE_H
diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc
index f6db1847063..b75c3a82858 100644
--- a/sql/sql_alter.cc
+++ b/sql/sql_alter.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "sql_parse.h" // check_access
#include "sql_table.h" // mysql_alter_table,
diff --git a/sql/sql_alter.h b/sql/sql_alter.h
index e33efc9476f..302432cd822 100644
--- a/sql/sql_alter.h
+++ b/sql/sql_alter.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_ALTER_TABLE_H
#define SQL_ALTER_TABLE_H
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index 8b3e945e891..a00b4448d32 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* Analyse database */
diff --git a/sql/sql_analyse.h b/sql/sql_analyse.h
index 738737f0edc..440e49d509c 100644
--- a/sql/sql_analyse.h
+++ b/sql/sql_analyse.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Analyse database */
diff --git a/sql/sql_analyze_stmt.cc b/sql/sql_analyze_stmt.cc
index 9aed432c2b6..6c146c1ec04 100644
--- a/sql/sql_analyze_stmt.cc
+++ b/sql/sql_analyze_stmt.cc
@@ -12,7 +12,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 */
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
diff --git a/sql/sql_analyze_stmt.h b/sql/sql_analyze_stmt.h
index 27fd7fb6d6a..3d294f50a49 100644
--- a/sql/sql_analyze_stmt.h
+++ b/sql/sql_analyze_stmt.h
@@ -12,7 +12,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 */
/*
diff --git a/sql/sql_array.h b/sql/sql_array.h
index e1adc9b9785..ed8686a2d0b 100644
--- a/sql/sql_array.h
+++ b/sql/sql_array.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_sys.h>
diff --git a/sql/sql_audit.cc b/sql/sql_audit.cc
index 8134adca13f..73871988d03 100644
--- a/sql/sql_audit.cc
+++ b/sql/sql_audit.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/sql_audit.h b/sql/sql_audit.h
index 96f9d0caece..c3cdfd45941 100644
--- a/sql/sql_audit.h
+++ b/sql/sql_audit.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index cb817e83fd7..bda3e649ad3 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* Basic functions needed by many modules */
diff --git a/sql/sql_base.h b/sql/sql_base.h
index 46520f6d83f..b9e96bffab7 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_BASE_INCLUDED
#define SQL_BASE_INCLUDED
diff --git a/sql/sql_basic_types.h b/sql/sql_basic_types.h
index 1e97262cdf0..6749b2251df 100644
--- a/sql/sql_basic_types.h
+++ b/sql/sql_basic_types.h
@@ -13,7 +13,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* File that includes common types used globally in MariaDB */
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc
index 5cd2a341353..5bc4c179721 100644
--- a/sql/sql_binlog.cc
+++ b/sql/sql_binlog.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/sql_binlog.h b/sql/sql_binlog.h
index 3a6d561701a..d10d78e1e3e 100644
--- a/sql/sql_binlog.h
+++ b/sql/sql_binlog.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_BINLOG_INCLUDED
#define SQL_BINLOG_INCLUDED
diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h
index 5a2caf89fe2..fb40d003ccd 100644
--- a/sql/sql_bitmap.h
+++ b/sql/sql_bitmap.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Implementation of a bitmap type.
diff --git a/sql/sql_bootstrap.cc b/sql/sql_bootstrap.cc
index 9733831b41f..3db985f9d16 100644
--- a/sql/sql_bootstrap.cc
+++ b/sql/sql_bootstrap.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
diff --git a/sql/sql_bootstrap.h b/sql/sql_bootstrap.h
index b8a302a8646..f12d66a522e 100644
--- a/sql/sql_bootstrap.h
+++ b/sql/sql_bootstrap.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_BOOTSTRAP_H
diff --git a/sql/sql_builtin.cc.in b/sql/sql_builtin.cc.in
index a40a064dc4b..e666985eb86 100644
--- a/sql/sql_builtin.cc.in
+++ b/sql/sql_builtin.cc.in
@@ -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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include <mysql/plugin.h>
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 17f896374a4..d8c78055d12 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -12,7 +12,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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Description of the query cache:
diff --git a/sql/sql_cache.h b/sql/sql_cache.h
index ad9cac76b0a..6ad73bbb0a2 100644
--- a/sql/sql_cache.h
+++ b/sql/sql_cache.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _SQL_CACHE_H
#define _SQL_CACHE_H
diff --git a/sql/sql_callback.h b/sql/sql_callback.h
index 316f94a0213..1f798ad5ac7 100644
--- a/sql/sql_callback.h
+++ b/sql/sql_callback.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
#ifndef SQL_CALLBACK_INCLUDED
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 142088faea4..5774120f5a1 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 9c968abf25c..f640113d946 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -13,7 +13,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_CLASS_INCLUDED
#define SQL_CLASS_INCLUDED
diff --git a/sql/sql_client.cc b/sql/sql_client.cc
index efac01f9894..bd60b17ea95 100644
--- a/sql/sql_client.cc
+++ b/sql/sql_client.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
This files defines some MySQL C API functions that are server specific
diff --git a/sql/sql_cmd.h b/sql/sql_cmd.h
index e33f8e443dc..b5bd7409cdf 100644
--- a/sql/sql_cmd.h
+++ b/sql/sql_cmd.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file Representation of an SQL command.
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index d7b388e310f..6b3bd283f26 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
/*
diff --git a/sql/sql_connect.h b/sql/sql_connect.h
index 9cd31814ad7..c87dc4e6377 100644
--- a/sql/sql_connect.h
+++ b/sql/sql_connect.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_CONNECT_INCLUDED
#define SQL_CONNECT_INCLUDED
diff --git a/sql/sql_const.h b/sql/sql_const.h
index abadfbe48ff..b4fdbaafda5 100644
--- a/sql/sql_const.h
+++ b/sql/sql_const.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/sql_crypt.cc b/sql/sql_crypt.cc
index 2460a16551d..f913cd3ebfa 100644
--- a/sql/sql_crypt.cc
+++ b/sql/sql_crypt.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
diff --git a/sql/sql_crypt.h b/sql/sql_crypt.h
index 3df554e9d31..e077452e527 100644
--- a/sql/sql_crypt.h
+++ b/sql/sql_crypt.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_INTERFACE
diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc
index dbe5dd0dce9..475e388718e 100644
--- a/sql/sql_cursor.cc
+++ b/sql/sql_cursor.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation /* gcc class implementation */
#endif
diff --git a/sql/sql_cursor.h b/sql/sql_cursor.h
index bff47d654b3..e07cb9973d1 100644
--- a/sql/sql_cursor.h
+++ b/sql/sql_cursor.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _sql_cursor_h_
#define _sql_cursor_h_
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index ebc04decbb3..bbc333632ae 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -13,7 +13,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* create and drop of databases */
diff --git a/sql/sql_db.h b/sql/sql_db.h
index b778e42645a..5841de63514 100644
--- a/sql/sql_db.h
+++ b/sql/sql_db.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_DB_INCLUDED
#define SQL_DB_INCLUDED
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 503e9b9dcbe..b8e158d39c3 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Delete of records tables.
diff --git a/sql/sql_delete.h b/sql/sql_delete.h
index 9cd09dc5722..5975598f657 100644
--- a/sql/sql_delete.h
+++ b/sql/sql_delete.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_DELETE_INCLUDED
#define SQL_DELETE_INCLUDED
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 500b0431bf9..6785bf8e815 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
diff --git a/sql/sql_derived.h b/sql/sql_derived.h
index 621a6e9ec24..a3657758c5a 100644
--- a/sql/sql_derived.h
+++ b/sql/sql_derived.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_DERIVED_INCLUDED
#define SQL_DERIVED_INCLUDED
diff --git a/sql/sql_digest.cc b/sql/sql_digest.cc
index b7ee3c4ffea..47ed8fd4ecb 100644
--- a/sql/sql_digest.cc
+++ b/sql/sql_digest.cc
@@ -12,7 +12,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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/*
This code needs extra visibility in the lexer structures
diff --git a/sql/sql_digest.h b/sql/sql_digest.h
index eaf74b9542e..9f3f75ab4eb 100644
--- a/sql/sql_digest.h
+++ b/sql/sql_digest.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_DIGEST_H
#define SQL_DIGEST_H
diff --git a/sql/sql_digest_stream.h b/sql/sql_digest_stream.h
index 55f7e2293c6..75e534e8350 100644
--- a/sql/sql_digest_stream.h
+++ b/sql/sql_digest_stream.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_DIGEST_STREAM_H
#define SQL_DIGEST_STREAM_H
diff --git a/sql/sql_do.cc b/sql/sql_do.cc
index da7dfe0c137..f4420552a25 100644
--- a/sql/sql_do.cc
+++ b/sql/sql_do.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Execute DO statement */
diff --git a/sql/sql_do.h b/sql/sql_do.h
index 35130cc5836..5280a4a52e1 100644
--- a/sql/sql_do.h
+++ b/sql/sql_do.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_DO_INCLUDED
#define SQL_DO_INCLUDED
diff --git a/sql/sql_error.cc b/sql/sql_error.cc
index d14c7b83b77..d2436d5fcb4 100644
--- a/sql/sql_error.cc
+++ b/sql/sql_error.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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**********************************************************************
This file contains the implementation of error and warnings related
diff --git a/sql/sql_error.h b/sql/sql_error.h
index 3ac06657323..239efd06c4b 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.h
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_ERROR_H
#define SQL_ERROR_H
diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc
index fe51f8e1d64..1ab10fb3c37 100644
--- a/sql/sql_explain.cc
+++ b/sql/sql_explain.cc
@@ -12,7 +12,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 */
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
diff --git a/sql/sql_explain.h b/sql/sql_explain.h
index 489a23f7cda..3ca816477fc 100644
--- a/sql/sql_explain.h
+++ b/sql/sql_explain.h
@@ -12,7 +12,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 */
/*
diff --git a/sql/sql_expression_cache.cc b/sql/sql_expression_cache.cc
index c79783bf561..4b6d4b4472e 100644
--- a/sql/sql_expression_cache.cc
+++ b/sql/sql_expression_cache.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 <my_global.h>
#include "sql_base.h"
diff --git a/sql/sql_expression_cache.h b/sql/sql_expression_cache.h
index 05ac51f81f2..61e0c4c69b3 100644
--- a/sql/sql_expression_cache.h
+++ b/sql/sql_expression_cache.h
@@ -12,7 +12,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 */
#ifndef SQL_EXPRESSION_CACHE_INCLUDED
#define SQL_EXPRESSION_CACHE_INCLUDED
diff --git a/sql/sql_get_diagnostics.cc b/sql/sql_get_diagnostics.cc
index fcda2463e13..b164a247c4d 100644
--- a/sql/sql_get_diagnostics.cc
+++ b/sql/sql_get_diagnostics.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 St, Fifth Floor, Boston, MA 02111-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "sql_list.h" // Sql_alloc, List, List_iterator
#include "sql_cmd.h" // Sql_cmd
diff --git a/sql/sql_get_diagnostics.h b/sql/sql_get_diagnostics.h
index 6f1652bb146..f283aa5b2c6 100644
--- a/sql/sql_get_diagnostics.h
+++ b/sql/sql_get_diagnostics.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 St, Fifth Floor, Boston, MA 02111-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_GET_DIAGNOSTICS_H
#define SQL_GET_DIAGNOSTICS_H
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index e908e703bdd..a811cee998f 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* HANDLER ... commands - direct access to ISAM */
diff --git a/sql/sql_handler.h b/sql/sql_handler.h
index 7fe5ae5bba8..9f0ef7bd08d 100644
--- a/sql/sql_handler.h
+++ b/sql/sql_handler.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
diff --git a/sql/sql_help.cc b/sql/sql_help.cc
index fc218cb18f2..c05c9a7d229 100644
--- a/sql/sql_help.cc
+++ b/sql/sql_help.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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/sql_help.h b/sql/sql_help.h
index b6ae490e757..cb3314b756c 100644
--- a/sql/sql_help.h
+++ b/sql/sql_help.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_HELP_INCLUDED
#define SQL_HELP_INCLUDED
diff --git a/sql/sql_hset.h b/sql/sql_hset.h
index 4dfddf898f0..18113ec2e7e 100644
--- a/sql/sql_hset.h
+++ b/sql/sql_hset.h
@@ -13,7 +13,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include "my_global.h"
#include "hash.h"
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 4005153cb64..2502be7e454 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
/* Insert of records */
diff --git a/sql/sql_insert.h b/sql/sql_insert.h
index aea0dac6b0d..3c0d0164da4 100644
--- a/sql/sql_insert.h
+++ b/sql/sql_insert.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_INSERT_INCLUDED
#define SQL_INSERT_INCLUDED
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc
index 3612cb6cc32..2c4c68e3637 100644
--- a/sql/sql_join_cache.cc
+++ b/sql/sql_join_cache.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 */
/**
@file
diff --git a/sql/sql_join_cache.h b/sql/sql_join_cache.h
index 4ae843ebfc2..1cbc6acfd79 100644
--- a/sql/sql_join_cache.h
+++ b/sql/sql_join_cache.h
@@ -12,7 +12,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 */
/*
This file contains declarations for implementations
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 53056d220b8..6040024706f 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* A lexical scanner on a temporary buffer with a yacc interface */
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index a880b6e4283..ea074ee6426 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@defgroup Semantic_Analysis Semantic Analysis
diff --git a/sql/sql_lifo_buffer.h b/sql/sql_lifo_buffer.h
index 17024d15beb..4d2d0bd3b27 100644
--- a/sql/sql_lifo_buffer.h
+++ b/sql/sql_lifo_buffer.h
@@ -12,7 +12,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 */
/**
@defgroup Bi-directional LIFO buffers used by DS-MRR implementation
diff --git a/sql/sql_list.cc b/sql/sql_list.cc
index c63c83f0645..40cff446e0e 100644
--- a/sql/sql_list.cc
+++ b/sql/sql_list.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_IMPLEMENTATION
diff --git a/sql/sql_list.h b/sql/sql_list.h
index 47590920510..c14ebfc00f7 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 0fcc4efbccd..e2dbbdb6782 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Copy data from a textfile to table */
diff --git a/sql/sql_load.h b/sql/sql_load.h
index f767e39387b..8ff2f1ab8f3 100644
--- a/sql/sql_load.h
+++ b/sql/sql_load.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_LOAD_INCLUDED
#define SQL_LOAD_INCLUDED
diff --git a/sql/sql_locale.cc b/sql/sql_locale.cc
index a2efa5e072c..cc4bc0c175d 100644
--- a/sql/sql_locale.cc
+++ b/sql/sql_locale.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
The beginnings of locale(7) support.
diff --git a/sql/sql_locale.h b/sql/sql_locale.h
index ec2f3d29e15..270540ee5c3 100644
--- a/sql/sql_locale.h
+++ b/sql/sql_locale.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_LOCALE_INCLUDED
#define SQL_LOCALE_INCLUDED
diff --git a/sql/sql_manager.cc b/sql/sql_manager.cc
index 8c8aee0cb03..7fa9a78f06f 100644
--- a/sql/sql_manager.cc
+++ b/sql/sql_manager.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
* sql_manager.cc
diff --git a/sql/sql_manager.h b/sql/sql_manager.h
index 8debbe6ead9..9c6c84450ed 100644
--- a/sql/sql_manager.h
+++ b/sql/sql_manager.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_MANAGER_INCLUDED
#define SQL_MANAGER_INCLUDED
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 4a4fc91296a..d26a19ab4e3 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#define MYSQL_LEX 1
#include <my_global.h>
diff --git a/sql/sql_parse.h b/sql/sql_parse.h
index c1dcc0d3cb9..ce5953696a2 100644
--- a/sql/sql_parse.h
+++ b/sql/sql_parse.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_PARSE_INCLUDED
#define SQL_PARSE_INCLUDED
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 153c1e0ff2e..f5ad4b86a91 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/*
This file is a container for general functionality related
diff --git a/sql/sql_partition.h b/sql/sql_partition.h
index d1eb208cbd1..c66f670d0b0 100644
--- a/sql/sql_partition.h
+++ b/sql/sql_partition.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc
index 7b2a2c24eff..c2fc237dc14 100644
--- a/sql/sql_partition_admin.cc
+++ b/sql/sql_partition_admin.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "sql_parse.h" // check_one_table_access
// check_merge_table_access
diff --git a/sql/sql_partition_admin.h b/sql/sql_partition_admin.h
index 9c53744d9bc..4be9e56e359 100644
--- a/sql/sql_partition_admin.h
+++ b/sql/sql_partition_admin.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_PARTITION_ADMIN_H
#define SQL_PARTITION_ADMIN_H
diff --git a/sql/sql_plist.h b/sql/sql_plist.h
index df50cccc874..1274a5a78c0 100644
--- a/sql/sql_plist.h
+++ b/sql/sql_plist.h
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index da83eae8f0a..79f0567971a 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "sql_plugin.h" // Includes my_global.h
#include "sql_priv.h" // SHOW_MY_BOOL
diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h
index 7b89246a9f9..610fbffd7c9 100644
--- a/sql/sql_plugin.h
+++ b/sql/sql_plugin.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _sql_plugin_h
#define _sql_plugin_h
diff --git a/sql/sql_plugin_compat.h b/sql/sql_plugin_compat.h
index 5c7bb620575..876b18ee2d7 100644
--- a/sql/sql_plugin_compat.h
+++ b/sql/sql_plugin_compat.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* old plugin api structures, used for backward compatibility */
diff --git a/sql/sql_plugin_services.ic b/sql/sql_plugin_services.ic
index e7de45b5ee2..20113444b64 100644
--- a/sql/sql_plugin_services.ic
+++ b/sql/sql_plugin_services.ic
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* support for Services */
#include <service_versions.h>
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index fa9fc6fb9f8..cc78c324a2b 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/sql_prepare.h b/sql/sql_prepare.h
index 203b37b3b26..ebadafd2d2e 100644
--- a/sql/sql_prepare.h
+++ b/sql/sql_prepare.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "sql_error.h"
diff --git a/sql/sql_priv.h b/sql/sql_priv.h
index 81dea4e41b0..e0571723330 100644
--- a/sql/sql_priv.h
+++ b/sql/sql_priv.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc
index f3b62991c5c..20d8e8102cb 100644
--- a/sql/sql_profile.cc
+++ b/sql/sql_profile.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
diff --git a/sql/sql_profile.h b/sql/sql_profile.h
index 38682f3ddec..bbbdb2f01a0 100644
--- a/sql/sql_profile.h
+++ b/sql/sql_profile.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _SQL_PROFILE_H
#define _SQL_PROFILE_H
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc
index ac66f7e9609..3665b18eee2 100644
--- a/sql/sql_reload.cc
+++ b/sql/sql_reload.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_reload.h"
diff --git a/sql/sql_reload.h b/sql/sql_reload.h
index 33ca022dc14..699912e0398 100644
--- a/sql/sql_reload.h
+++ b/sql/sql_reload.h
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
class THD;
struct TABLE_LIST;
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
index 4e576602a1a..af4a6ca3ce1 100644
--- a/sql/sql_rename.cc
+++ b/sql/sql_rename.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Atomic rename of table; RENAME TABLE t1 to t2, tmp to t1 [,...]
diff --git a/sql/sql_rename.h b/sql/sql_rename.h
index aaf09a8d030..1b9fcfb12bc 100644
--- a/sql/sql_rename.h
+++ b/sql/sql_rename.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_RENAME_INCLUDED
#define SQL_RENAME_INCLUDED
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 3bc1a019f40..edff750a9a3 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/sql_repl.h b/sql/sql_repl.h
index 8d9a127bca7..8ddfa9239f6 100644
--- a/sql/sql_repl.h
+++ b/sql/sql_repl.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_REPL_INCLUDED
#define SQL_REPL_INCLUDED
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 5e0472b4224..4dadff9d98a 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 5eea5937ea6..60c2ce55a16 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc
index ca721b9e366..36147fc47fc 100644
--- a/sql/sql_servers.cc
+++ b/sql/sql_servers.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
diff --git a/sql/sql_servers.h b/sql/sql_servers.h
index d5668f0dfcb..85e7e68e058 100644
--- a/sql/sql_servers.h
+++ b/sql/sql_servers.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "my_global.h" /* uint */
#include "slave.h" // for tables_ok(), rpl_filter
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 56103d8b654..20fee2b8656 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Function with list databases, tables or fields */
diff --git a/sql/sql_show.h b/sql/sql_show.h
index e93b855450c..ff0f6efc1be 100644
--- a/sql/sql_show.h
+++ b/sql/sql_show.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_SHOW_H
#define SQL_SHOW_H
diff --git a/sql/sql_signal.cc b/sql/sql_signal.cc
index 1b7edbee54a..bb3b99ba4f6 100644
--- a/sql/sql_signal.cc
+++ b/sql/sql_signal.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include "sql_priv.h"
diff --git a/sql/sql_signal.h b/sql/sql_signal.h
index 2a508eed5bf..b73233ef16e 100644
--- a/sql/sql_signal.h
+++ b/sql/sql_signal.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_SIGNAL_H
#define SQL_SIGNAL_H
diff --git a/sql/sql_sort.h b/sql/sql_sort.h
index 6c97ad7e9ab..43e425ec107 100644
--- a/sql/sql_sort.h
+++ b/sql/sql_sort.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "my_base.h" /* ha_rows */
#include "my_sys.h" /* qsort2_cmp */
diff --git a/sql/sql_state.c b/sql/sql_state.c
index 2bfd61d6696..dcffe49a783 100644
--- a/sql/sql_state.c
+++ b/sql/sql_state.c
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* Functions to map mysqld errno to sql_state */
diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc
index a3e446f5f20..f9387e2eda5 100644
--- a/sql/sql_statistics.cc
+++ b/sql/sql_statistics.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 */
/**
@file
diff --git a/sql/sql_statistics.h b/sql/sql_statistics.h
index 8600db8890d..296703e8c3c 100644
--- a/sql/sql_statistics.h
+++ b/sql/sql_statistics.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_STATISTICS_H
#define SQL_STATISTICS_H
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 6c84b9b21fb..177d2a77d09 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* This file is originally from the mysql distribution. Coded by monty */
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 7a1701f6ef3..a7652376bbc 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -16,7 +16,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* This file is originally from the mysql distribution. Coded by monty */
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index e2c44fa9af3..3df877792cc 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
/* drop and alter of tables */
diff --git a/sql/sql_table.h b/sql/sql_table.h
index 5abb25d1ea5..aec783d4449 100644
--- a/sql/sql_table.h
+++ b/sql/sql_table.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_TABLE_INCLUDED
#define SQL_TABLE_INCLUDED
diff --git a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc
index 8b9e14e5a18..3e241e313a5 100644
--- a/sql/sql_tablespace.cc
+++ b/sql/sql_tablespace.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* drop and alter of tablespaces */
diff --git a/sql/sql_tablespace.h b/sql/sql_tablespace.h
index ae77d15cbcb..0760935edfc 100644
--- a/sql/sql_tablespace.h
+++ b/sql/sql_tablespace.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_TABLESPACE_INCLUDED
#define SQL_TABLESPACE_INCLUDED
diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index b7b70f0f55c..db52ce0aea1 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Write some debug info */
diff --git a/sql/sql_test.h b/sql/sql_test.h
index 867582a9569..58262580a75 100644
--- a/sql/sql_test.h
+++ b/sql/sql_test.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_TEST_INCLUDED
#define SQL_TEST_INCLUDED
diff --git a/sql/sql_time.cc b/sql/sql_time.cc
index bba8c974ccb..5a251cfd733 100644
--- a/sql/sql_time.cc
+++ b/sql/sql_time.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Functions to handle date and time */
diff --git a/sql/sql_time.h b/sql/sql_time.h
index 260e6e36268..1dafb9b783b 100644
--- a/sql/sql_time.h
+++ b/sql/sql_time.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_TIME_INCLUDED
#define SQL_TIME_INCLUDED
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index a39e0845a19..daea60c26bc 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -13,7 +13,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#define MYSQL_LEX 1
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h
index 6e94f348447..e2e6e1b7acc 100644
--- a/sql/sql_trigger.h
+++ b/sql/sql_trigger.h
@@ -16,7 +16,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <mysqld_error.h>
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc
index 6252caf98b0..a00659e362b 100644
--- a/sql/sql_truncate.cc
+++ b/sql/sql_truncate.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "debug_sync.h" // DEBUG_SYNC
#include "table.h" // TABLE, FOREIGN_KEY_INFO
diff --git a/sql/sql_truncate.h b/sql/sql_truncate.h
index b8525fd6abb..7d2ff4b6050 100644
--- a/sql/sql_truncate.h
+++ b/sql/sql_truncate.h
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
class THD;
struct TABLE_LIST;
diff --git a/sql/sql_type.cc b/sql/sql_type.cc
index d172dee56b6..c1f192b0622 100644
--- a/sql/sql_type.cc
+++ b/sql/sql_type.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "sql_type.h"
#include "sql_const.h"
diff --git a/sql/sql_type.h b/sql/sql_type.h
index 8141b7ef45f..42090037ead 100644
--- a/sql/sql_type.h
+++ b/sql/sql_type.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
diff --git a/sql/sql_type_int.h b/sql/sql_type_int.h
index 7433bd5249f..74e59b08385 100644
--- a/sql/sql_type_int.h
+++ b/sql/sql_type_int.h
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_TYPE_INT_INCLUDED
#define SQL_TYPE_INT_INCLUDED
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 05698ce82cc..2a72c86707c 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* This implements 'user defined functions' */
diff --git a/sql/sql_udf.h b/sql/sql_udf.h
index d3ec1cc1f95..a683b8a7554 100644
--- a/sql/sql_udf.h
+++ b/sql/sql_udf.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* This file defines structures needed by udf functions */
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 94b8c662a06..7e4d06b03f2 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
diff --git a/sql/sql_union.h b/sql/sql_union.h
index 171f607fba7..7b65bccd40d 100644
--- a/sql/sql_union.h
+++ b/sql/sql_union.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_UNION_INCLUDED
#define SQL_UNION_INCLUDED
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 5ce9eb3c379..af83de9c408 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
diff --git a/sql/sql_update.h b/sql/sql_update.h
index 4c6f89d8468..d8cd302880f 100644
--- a/sql/sql_update.h
+++ b/sql/sql_update.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef SQL_UPDATE_INCLUDED
#define SQL_UPDATE_INCLUDED
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 0684e6ebcc5..b1c5fd1d8aa 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -12,7 +12,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 02110-1301, USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
*/
#define MYSQL_LEX 1
diff --git a/sql/sql_view.h b/sql/sql_view.h
index b9eb92198f8..9131ee09e64 100644
--- a/sql/sql_view.h
+++ b/sql/sql_view.h
@@ -16,7 +16,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
#include "sql_class.h" /* Required by sql_lex.h */
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index f45456e88d4..cc7195361c0 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* sql_yacc.yy */
diff --git a/sql/strfunc.cc b/sql/strfunc.cc
index e1b4dc8227f..b6c650bbf14 100644
--- a/sql/strfunc.cc
+++ b/sql/strfunc.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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* Some useful string utility functions used by the MySQL server */
diff --git a/sql/strfunc.h b/sql/strfunc.h
index 7b031710c76..989eb4aa24c 100644
--- a/sql/strfunc.h
+++ b/sql/strfunc.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef STRFUNC_INCLUDED
#define STRFUNC_INCLUDED
diff --git a/sql/structs.h b/sql/structs.h
index 378b8c387e0..67fb0d5dd66 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 2a793646c7f..04ecbb29b12 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic
index ffd08608e19..bef0235f1bc 100644
--- a/sql/sys_vars.ic
+++ b/sql/sys_vars.ic
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/sys_vars_shared.h b/sql/sys_vars_shared.h
index dfc020a187c..92a16d2e8d6 100644
--- a/sql/sys_vars_shared.h
+++ b/sql/sys_vars_shared.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/table.cc b/sql/table.cc
index e1c28212121..c54f09bf760 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -12,7 +12,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* Some general useful functions */
diff --git a/sql/table.h b/sql/table.h
index e72e2bb2902..444e1c5f00f 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_plist.h"
diff --git a/sql/table_cache.cc b/sql/table_cache.cc
index 8682662e924..8313fd0a9d9 100644
--- a/sql/table_cache.cc
+++ b/sql/table_cache.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/sql/table_cache.h b/sql/table_cache.h
index 2e5bb3428dc..6643f91ca54 100644
--- a/sql/table_cache.h
+++ b/sql/table_cache.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
struct Share_free_tables
diff --git a/sql/thr_malloc.cc b/sql/thr_malloc.cc
index cbed769a424..4ad99bba7b5 100644
--- a/sql/thr_malloc.cc
+++ b/sql/thr_malloc.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Mallocs for used in threads */
diff --git a/sql/thr_malloc.h b/sql/thr_malloc.h
index fc23c87c9fd..90f5a2ea8fb 100644
--- a/sql/thr_malloc.h
+++ b/sql/thr_malloc.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef THR_MALLOC_INCLUDED
#define THR_MALLOC_INCLUDED
diff --git a/sql/threadpool.h b/sql/threadpool.h
index ba17dc042c2..d41435a766c 100644
--- a/sql/threadpool.h
+++ b/sql/threadpool.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 MAX_THREAD_GROUPS 100000
diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc
index 598951da406..390f48505ef 100644
--- a/sql/threadpool_common.cc
+++ b/sql/threadpool_common.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 <my_global.h>
#include <violite.h>
diff --git a/sql/threadpool_generic.cc b/sql/threadpool_generic.cc
index 400d072df3c..434857447a4 100644
--- a/sql/threadpool_generic.cc
+++ b/sql/threadpool_generic.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 <my_global.h>
#include <violite.h>
diff --git a/sql/threadpool_win.cc b/sql/threadpool_win.cc
index 855b9b38d78..10d6e96b22f 100644
--- a/sql/threadpool_win.cc
+++ b/sql/threadpool_win.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 */
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
diff --git a/sql/transaction.cc b/sql/transaction.cc
index 0f1cd377198..7cb6e132932 100644
--- a/sql/transaction.cc
+++ b/sql/transaction.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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_IMPLEMENTATION
diff --git a/sql/transaction.h b/sql/transaction.h
index 90de11aabe3..a612b782922 100644
--- a/sql/transaction.h
+++ b/sql/transaction.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef TRANSACTION_H
#define TRANSACTION_H
diff --git a/sql/tzfile.h b/sql/tzfile.h
index 4feba612b36..aa0308645d1 100644
--- a/sql/tzfile.h
+++ b/sql/tzfile.h
@@ -15,7 +15,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
This file is based on public domain code from ftp://elsie.ncih.nist.gov/
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 1167ea18e7e..8a87985e901 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Most of the following code and structures were derived from
diff --git a/sql/tztime.h b/sql/tztime.h
index eb7d85c48b2..dde014ffe65 100644
--- a/sql/tztime.h
+++ b/sql/tztime.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef USE_PRAGMA_INTERFACE
diff --git a/sql/udf_example.c b/sql/udf_example.c
index c7e2f989829..bfd4c8c3a9f 100644
--- a/sql/udf_example.c
+++ b/sql/udf_example.c
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
** example file of UDF (user definable functions) that are dynamicly loaded
diff --git a/sql/uniques.cc b/sql/uniques.cc
index 86622b41351..ddddc75cc59 100644
--- a/sql/uniques.cc
+++ b/sql/uniques.cc
@@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Function to handle quick removal of duplicates
diff --git a/sql/unireg.cc b/sql/unireg.cc
index ff2b406350a..14c51a0de91 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -13,7 +13,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 St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
/*
diff --git a/sql/unireg.h b/sql/unireg.h
index eb555008b35..6ce638928e8 100644
--- a/sql/unireg.h
+++ b/sql/unireg.h
@@ -15,7 +15,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 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include <mysql_version.h> /* FRM_VER */
diff --git a/sql/winservice.c b/sql/winservice.c
index f817ab2b142..ceab83f50ee 100644
--- a/sql/winservice.c
+++ b/sql/winservice.c
@@ -12,7 +12,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 */
/*
Get Properties of an existing mysqld Windows service
diff --git a/sql/winservice.h b/sql/winservice.h
index fe3fe526548..f9ab3eda332 100644
--- a/sql/winservice.h
+++ b/sql/winservice.h
@@ -12,7 +12,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 */
/*
Extract properties of a windows service binary path
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc
index be6297abd09..f7bab7c5fc8 100644
--- a/sql/wsrep_applier.cc
+++ b/sql/wsrep_applier.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 02110-1301 USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */
#include "wsrep_priv.h"
#include "wsrep_binlog.h" // wsrep_dump_rbr_buf()
diff --git a/sql/wsrep_applier.h b/sql/wsrep_applier.h
index f19d2d46d0c..3cfcd556ae8 100644
--- a/sql/wsrep_applier.h
+++ b/sql/wsrep_applier.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 */
#ifndef WSREP_APPLIER_H
#define WSREP_APPLIER_H
diff --git a/sql/wsrep_binlog.cc b/sql/wsrep_binlog.cc
index 292cbe6ee25..6e4e9f50e31 100644
--- a/sql/wsrep_binlog.cc
+++ b/sql/wsrep_binlog.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 02110-1301 USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */
#include "wsrep_binlog.h"
#include "wsrep_priv.h"
diff --git a/sql/wsrep_binlog.h b/sql/wsrep_binlog.h
index 864813d5c98..c2ccacdc180 100644
--- a/sql/wsrep_binlog.h
+++ b/sql/wsrep_binlog.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 02110-1301 USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */
#ifndef WSREP_BINLOG_H
#define WSREP_BINLOG_H
diff --git a/sql/wsrep_check_opts.cc b/sql/wsrep_check_opts.cc
index 032b2d98005..6a8b7abe9e1 100644
--- a/sql/wsrep_check_opts.cc
+++ b/sql/wsrep_check_opts.cc
@@ -12,7 +12,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 "mysqld.h"
#include "sys_vars_shared.h"
diff --git a/sql/wsrep_dummy.cc b/sql/wsrep_dummy.cc
index aff75cf7790..2d0a8bcdfa9 100644
--- a/sql/wsrep_dummy.cc
+++ b/sql/wsrep_dummy.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 02110-1301 USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */
#include <my_global.h>
#include <sql_class.h>
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc
index 3603e05fd5f..c34e14b7e1f 100644
--- a/sql/wsrep_hton.cc
+++ b/sql/wsrep_hton.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 <mysqld.h>
#include "sql_base.h"
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 08efa0086a7..88ea6faf1c6 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.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 <sql_plugin.h> // SHOW_MY_BOOL
#include <mysqld.h>
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h
index 0b1e75102e8..4640766404b 100644
--- a/sql/wsrep_mysqld.h
+++ b/sql/wsrep_mysqld.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 */
#include <wsrep.h>
diff --git a/sql/wsrep_mysqld_c.h b/sql/wsrep_mysqld_c.h
index 235a871c113..603f2c29ad1 100644
--- a/sql/wsrep_mysqld_c.h
+++ b/sql/wsrep_mysqld_c.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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef WSREP_MYSQLD_C_H
#define WSREP_MYSQLD_C_H
diff --git a/sql/wsrep_notify.cc b/sql/wsrep_notify.cc
index 92c685ba485..fb04d7be7c1 100644
--- a/sql/wsrep_notify.cc
+++ b/sql/wsrep_notify.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 <mysqld.h>
#include "wsrep_priv.h"
diff --git a/sql/wsrep_priv.h b/sql/wsrep_priv.h
index 222a49cc2ab..e84ecfc5e2c 100644
--- a/sql/wsrep_priv.h
+++ b/sql/wsrep_priv.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
*/
//! @file declares symbols private to wsrep integration layer
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc
index 6ec9a589974..560db0b6c43 100644
--- a/sql/wsrep_sst.cc
+++ b/sql/wsrep_sst.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 "wsrep_sst.h"
diff --git a/sql/wsrep_sst.h b/sql/wsrep_sst.h
index cc0f1f5389d..e54cc25a456 100644
--- a/sql/wsrep_sst.h
+++ b/sql/wsrep_sst.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 02110-1301 USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */
#include <my_config.h>
diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc
index 00afbec290e..1d00a64c972 100644
--- a/sql/wsrep_thd.cc
+++ b/sql/wsrep_thd.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 02110-1301 USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */
#include "wsrep_thd.h"
diff --git a/sql/wsrep_thd.h b/sql/wsrep_thd.h
index 5900668f3fb..6ce14a4eb0e 100644
--- a/sql/wsrep_thd.h
+++ b/sql/wsrep_thd.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 02110-1301 USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */
#include <my_config.h>
diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc
index 1a358877a35..599ece4cb40 100644
--- a/sql/wsrep_utils.cc
+++ b/sql/wsrep_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
*/
//! @file some utility functions and classes not directly related to replication
diff --git a/sql/wsrep_utils.h b/sql/wsrep_utils.h
index 0afca96ea41..616a6d3f457 100644
--- a/sql/wsrep_utils.h
+++ b/sql/wsrep_utils.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 02110-1301 USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */
#ifndef WSREP_UTILS_H
#define WSREP_UTILS_H
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc
index 60b4cb6c11a..78269c56733 100644
--- a/sql/wsrep_var.cc
+++ b/sql/wsrep_var.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 "wsrep_var.h"
diff --git a/sql/wsrep_var.h b/sql/wsrep_var.h
index 7d3ff50f1d2..6258b5ab66f 100644
--- a/sql/wsrep_var.h
+++ b/sql/wsrep_var.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 02110-1301 USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */
#include <my_config.h>
diff --git a/sql/wsrep_xid.cc b/sql/wsrep_xid.cc
index 72b96cadfb0..ffb280b2032 100644
--- a/sql/wsrep_xid.cc
+++ b/sql/wsrep_xid.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
*/
//! @file some utility functions and classes not directly related to replication
diff --git a/sql/wsrep_xid.h b/sql/wsrep_xid.h
index 01b18506708..30a28b44933 100644
--- a/sql/wsrep_xid.h
+++ b/sql/wsrep_xid.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 02110-1301 USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */
#ifndef WSREP_XID_H
#define WSREP_XID_H