From 5543b75550962f07b4adcd47a6e52accec0a7d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Sat, 11 May 2019 21:29:06 +0300 Subject: [PATCH] Update FSF Address * Update wrong zip-code --- BUILD/FINISH.sh | 2 +- BUILD/SETUP.sh | 2 +- BUILD/autorun.sh | 2 +- BUILD/build_mccge.sh | 2 +- BUILD/check-cpu | 2 +- BUILD/cleanup | 2 +- BUILD/cmake_configure.sh | 2 +- BUILD/compile-alpha | 2 +- BUILD/compile-amd64-debug-max | 2 +- BUILD/compile-amd64-debug-max-no-ndb | 2 +- BUILD/compile-amd64-gcov | 2 +- BUILD/compile-amd64-gprof | 2 +- BUILD/compile-amd64-max | 2 +- BUILD/compile-amd64-max-sci | 2 +- BUILD/compile-amd64-valgrind-max | 2 +- BUILD/compile-darwin-mwcc | 2 +- BUILD/compile-dist | 2 +- BUILD/compile-hpux11-parisc2-aCC | 2 +- BUILD/compile-ia64-debug-max | 2 +- BUILD/compile-innodb | 2 +- BUILD/compile-irix-mips64-mipspro | 2 +- BUILD/compile-ndb-autotest | 2 +- BUILD/compile-pentium | 2 +- BUILD/compile-pentium-cybozu | 2 +- BUILD/compile-pentium-debug | 2 +- BUILD/compile-pentium-debug-max | 2 +- BUILD/compile-pentium-debug-max-no-embedded | 2 +- BUILD/compile-pentium-debug-max-no-ndb | 2 +- BUILD/compile-pentium-debug-openssl | 2 +- BUILD/compile-pentium-debug-yassl | 2 +- BUILD/compile-pentium-gcov | 2 +- BUILD/compile-pentium-gprof | 2 +- BUILD/compile-pentium-icc | 2 +- BUILD/compile-pentium-icc-valgrind-max | 4 ++-- BUILD/compile-pentium-icc-yassl | 2 +- BUILD/compile-pentium-max | 2 +- BUILD/compile-pentium-myodbc | 2 +- BUILD/compile-pentium-valgrind-max | 4 ++-- BUILD/compile-pentium-valgrind-max-no-ndb | 2 +- BUILD/compile-pentium64-debug | 2 +- BUILD/compile-pentium64-debug-max | 2 +- BUILD/compile-pentium64-gcov | 2 +- BUILD/compile-pentium64-gprof | 2 +- BUILD/compile-pentium64-max | 2 +- BUILD/compile-pentium64-max-sci | 2 +- BUILD/compile-pentium64-valgrind-max | 4 ++-- BUILD/compile-ppc | 2 +- BUILD/compile-ppc-debug | 2 +- BUILD/compile-ppc-debug-max | 2 +- BUILD/compile-ppc-debug-max-no-ndb | 2 +- BUILD/compile-ppc-max | 2 +- BUILD/compile-solaris-amd64-debug | 2 +- BUILD/compile-solaris-amd64-forte | 2 +- BUILD/compile-solaris-sparc | 2 +- BUILD/compile-solaris-sparc-forte | 4 ++-- CMakeLists.txt | 2 +- COPYING | 4 ++-- README | 18 +++++++++--------- client/CMakeLists.txt | 2 +- client/client_priv.h | 2 +- client/completion_hash.cc | 2 +- client/completion_hash.h | 2 +- client/echo.c | 2 +- client/get_password.c | 2 +- client/my_readline.h | 2 +- client/mysql_plugin.c | 2 +- client/mysql_upgrade.c | 2 +- client/mysqladmin.cc | 2 +- client/mysqlbinlog.cc | 2 +- client/mysqlcheck.c | 2 +- client/mysqldump.c | 2 +- client/mysqlimport.c | 2 +- client/mysqlshow.c | 2 +- client/mysqlslap.c | 2 +- client/mysqltest.cc | 2 +- client/readline.cc | 2 +- client/sql_string.cc.dontuse | 2 +- client/sql_string.h.dontuse | 2 +- cmake/abi_check.cmake | 2 +- cmake/bison.cmake | 2 +- cmake/build_configurations/mysql_release.cmake | 2 +- cmake/cat.cmake | 2 +- cmake/character_sets.cmake | 2 +- cmake/check_minimal_version.cmake | 2 +- cmake/cmake_parse_arguments.cmake | 2 +- cmake/compile_flags.cmake | 2 +- cmake/configure.pl | 2 +- cmake/cpack_source_ignore_files.cmake | 2 +- cmake/create_initial_db.cmake.in | 2 +- cmake/do_abi_check.cmake | 2 +- cmake/dtrace.cmake | 2 +- cmake/dtrace_prelink.cmake | 2 +- cmake/info_bin.cmake | 2 +- cmake/info_macros.cmake.in | 2 +- cmake/info_src.cmake | 2 +- cmake/install_layout.cmake | 2 +- cmake/install_macros.cmake | 2 +- cmake/libutils.cmake | 2 +- cmake/maintainer.cmake | 2 +- cmake/make_dist.cmake.in | 2 +- cmake/merge_archives_unix.cmake.in | 2 +- cmake/mysql_add_executable.cmake | 2 +- cmake/mysql_version.cmake | 2 +- cmake/os/AIX.cmake | 2 +- cmake/os/Cygwin.cmake | 2 +- cmake/os/Darwin.cmake | 2 +- cmake/os/FreeBSD.cmake | 2 +- cmake/os/HP-UX.cmake | 2 +- cmake/os/Linux.cmake | 2 +- cmake/os/OS400.cmake | 2 +- cmake/os/SunOS.cmake | 2 +- cmake/os/Windows.cmake | 2 +- cmake/os/WindowsCache.cmake | 2 +- cmake/package_name.cmake | 2 +- cmake/plugin.cmake | 2 +- cmake/readline.cmake | 2 +- cmake/ssl.cmake | 2 +- cmake/stack_direction.c | 2 +- cmake/tags.cmake | 2 +- cmake/versioninfo.rc.in | 2 +- cmake/zlib.cmake | 2 +- cmd-line-utils/libedit/CMakeLists.txt | 2 +- cmd-line-utils/readline/CMakeLists.txt | 2 +- cmd-line-utils/readline/COPYING | 4 ++-- cmd-line-utils/readline/ansi_stdlib.h | 2 +- cmd-line-utils/readline/bind.c | 2 +- cmd-line-utils/readline/callback.c | 2 +- cmd-line-utils/readline/chardefs.h | 2 +- cmd-line-utils/readline/compat.c | 2 +- cmd-line-utils/readline/complete.c | 2 +- cmd-line-utils/readline/configure.in | 2 +- cmd-line-utils/readline/display.c | 2 +- cmd-line-utils/readline/emacs_keymap.c | 2 +- cmd-line-utils/readline/funmap.c | 2 +- cmd-line-utils/readline/histexpand.c | 2 +- cmd-line-utils/readline/histfile.c | 2 +- cmd-line-utils/readline/histlib.h | 2 +- cmd-line-utils/readline/history.c | 2 +- cmd-line-utils/readline/history.h | 2 +- cmd-line-utils/readline/histsearch.c | 2 +- cmd-line-utils/readline/input.c | 2 +- cmd-line-utils/readline/isearch.c | 2 +- cmd-line-utils/readline/keymaps.c | 2 +- cmd-line-utils/readline/keymaps.h | 2 +- cmd-line-utils/readline/kill.c | 2 +- cmd-line-utils/readline/macro.c | 2 +- cmd-line-utils/readline/mbutil.c | 2 +- cmd-line-utils/readline/misc.c | 2 +- cmd-line-utils/readline/nls.c | 2 +- cmd-line-utils/readline/parens.c | 2 +- cmd-line-utils/readline/posixdir.h | 2 +- cmd-line-utils/readline/posixjmp.h | 2 +- cmd-line-utils/readline/posixstat.h | 2 +- cmd-line-utils/readline/readline.c | 2 +- cmd-line-utils/readline/readline.h | 2 +- cmd-line-utils/readline/rlconf.h | 2 +- cmd-line-utils/readline/rldefs.h | 2 +- cmd-line-utils/readline/rlmbutil.h | 2 +- cmd-line-utils/readline/rlprivate.h | 2 +- cmd-line-utils/readline/rlshell.h | 2 +- cmd-line-utils/readline/rlstdc.h | 2 +- cmd-line-utils/readline/rltty.c | 2 +- cmd-line-utils/readline/rltty.h | 2 +- cmd-line-utils/readline/rltypedefs.h | 2 +- cmd-line-utils/readline/rlwinsize.h | 2 +- cmd-line-utils/readline/savestring.c | 2 +- cmd-line-utils/readline/search.c | 2 +- cmd-line-utils/readline/shell.c | 2 +- cmd-line-utils/readline/signals.c | 2 +- cmd-line-utils/readline/tcap.h | 2 +- cmd-line-utils/readline/terminal.c | 2 +- cmd-line-utils/readline/text.c | 2 +- cmd-line-utils/readline/tilde.c | 2 +- cmd-line-utils/readline/tilde.h | 2 +- cmd-line-utils/readline/undo.c | 2 +- cmd-line-utils/readline/util.c | 2 +- cmd-line-utils/readline/vi_keymap.c | 2 +- cmd-line-utils/readline/vi_mode.c | 2 +- cmd-line-utils/readline/xmalloc.c | 2 +- cmd-line-utils/readline/xmalloc.h | 2 +- config.h.cmake | 2 +- configure.cmake | 2 +- dbug/CMakeLists.txt | 2 +- dbug/dbug_add_tags.pl | 2 +- debian/copyright | 2 +- extra/CMakeLists.txt | 2 +- extra/charset2html.c | 2 +- extra/comp_err.c | 2 +- extra/innochecksum.c | 2 +- extra/my_print_defaults.c | 2 +- extra/mysql_waitpid.c | 2 +- extra/perror.c | 2 +- extra/replace.c | 2 +- extra/resolve_stack_dump.c | 2 +- extra/resolveip.c | 2 +- extra/yassl/CMakeLists.txt | 2 +- extra/yassl/COPYING | 4 ++-- extra/yassl/examples/client/client.cpp | 2 +- extra/yassl/examples/echoclient/echoclient.cpp | 2 +- extra/yassl/examples/echoserver/echoserver.cpp | 2 +- extra/yassl/examples/server/server.cpp | 2 +- extra/yassl/include/buffer.hpp | 2 +- extra/yassl/include/cert_wrapper.hpp | 2 +- extra/yassl/include/crypto_wrapper.hpp | 2 +- extra/yassl/include/factory.hpp | 2 +- extra/yassl/include/handshake.hpp | 2 +- extra/yassl/include/lock.hpp | 2 +- extra/yassl/include/log.hpp | 2 +- extra/yassl/include/openssl/crypto.h | 2 +- extra/yassl/include/openssl/des.h | 2 +- extra/yassl/include/openssl/des_old.h | 2 +- extra/yassl/include/openssl/engine.h | 2 +- extra/yassl/include/openssl/err.h | 2 +- extra/yassl/include/openssl/evp.h | 2 +- .../include/openssl/generate_prefix_files.pl | 2 +- extra/yassl/include/openssl/hmac.h | 2 +- extra/yassl/include/openssl/lhash.h | 2 +- extra/yassl/include/openssl/md4.h | 2 +- extra/yassl/include/openssl/md5.h | 2 +- extra/yassl/include/openssl/objects.h | 2 +- extra/yassl/include/openssl/opensslv.h | 2 +- extra/yassl/include/openssl/pem.h | 2 +- extra/yassl/include/openssl/pkcs12.h | 2 +- extra/yassl/include/openssl/prefix_crypto.h | 2 +- extra/yassl/include/openssl/prefix_ssl.h | 2 +- extra/yassl/include/openssl/rand.h | 2 +- extra/yassl/include/openssl/rsa.h | 2 +- extra/yassl/include/openssl/sha.h | 2 +- extra/yassl/include/openssl/ssl.h | 2 +- extra/yassl/include/openssl/x509.h | 2 +- extra/yassl/include/openssl/x509v3.h | 2 +- extra/yassl/include/socket_wrapper.hpp | 2 +- extra/yassl/include/timer.hpp | 2 +- extra/yassl/include/yassl.hpp | 2 +- extra/yassl/include/yassl_error.hpp | 2 +- extra/yassl/include/yassl_imp.hpp | 2 +- extra/yassl/include/yassl_int.hpp | 2 +- extra/yassl/include/yassl_types.hpp | 2 +- extra/yassl/src/buffer.cpp | 2 +- extra/yassl/src/cert_wrapper.cpp | 2 +- extra/yassl/src/crypto_wrapper.cpp | 2 +- extra/yassl/src/handshake.cpp | 2 +- extra/yassl/src/lock.cpp | 2 +- extra/yassl/src/log.cpp | 2 +- extra/yassl/src/make.bat | 2 +- extra/yassl/src/socket_wrapper.cpp | 2 +- extra/yassl/src/ssl.cpp | 2 +- extra/yassl/src/template_instnt.cpp | 2 +- extra/yassl/src/timer.cpp | 2 +- extra/yassl/src/yassl.cpp | 2 +- extra/yassl/src/yassl_error.cpp | 2 +- extra/yassl/src/yassl_imp.cpp | 2 +- extra/yassl/src/yassl_int.cpp | 2 +- extra/yassl/taocrypt/CMakeLists.txt | 2 +- extra/yassl/taocrypt/COPYING | 4 ++-- extra/yassl/taocrypt/benchmark/benchmark.cpp | 2 +- extra/yassl/taocrypt/benchmark/make.bat | 2 +- extra/yassl/taocrypt/include/aes.hpp | 2 +- extra/yassl/taocrypt/include/algebra.hpp | 2 +- extra/yassl/taocrypt/include/arc4.hpp | 2 +- extra/yassl/taocrypt/include/asn.hpp | 2 +- extra/yassl/taocrypt/include/block.hpp | 2 +- extra/yassl/taocrypt/include/blowfish.hpp | 2 +- extra/yassl/taocrypt/include/coding.hpp | 2 +- extra/yassl/taocrypt/include/des.hpp | 2 +- extra/yassl/taocrypt/include/dh.hpp | 2 +- extra/yassl/taocrypt/include/dsa.hpp | 2 +- extra/yassl/taocrypt/include/error.hpp | 2 +- extra/yassl/taocrypt/include/file.hpp | 2 +- extra/yassl/taocrypt/include/hash.hpp | 2 +- extra/yassl/taocrypt/include/hc128.hpp | 2 +- extra/yassl/taocrypt/include/hmac.hpp | 2 +- extra/yassl/taocrypt/include/integer.hpp | 2 +- extra/yassl/taocrypt/include/kernelc.hpp | 2 +- extra/yassl/taocrypt/include/md2.hpp | 2 +- extra/yassl/taocrypt/include/md4.hpp | 2 +- extra/yassl/taocrypt/include/md5.hpp | 2 +- extra/yassl/taocrypt/include/misc.hpp | 2 +- extra/yassl/taocrypt/include/modarith.hpp | 2 +- extra/yassl/taocrypt/include/modes.hpp | 2 +- extra/yassl/taocrypt/include/pwdbased.hpp | 2 +- extra/yassl/taocrypt/include/rabbit.hpp | 2 +- extra/yassl/taocrypt/include/random.hpp | 2 +- extra/yassl/taocrypt/include/ripemd.hpp | 2 +- extra/yassl/taocrypt/include/rsa.hpp | 2 +- extra/yassl/taocrypt/include/runtime.hpp | 2 +- extra/yassl/taocrypt/include/sha.hpp | 2 +- extra/yassl/taocrypt/include/twofish.hpp | 2 +- extra/yassl/taocrypt/include/type_traits.hpp | 2 +- extra/yassl/taocrypt/include/types.hpp | 2 +- extra/yassl/taocrypt/mySTL/algorithm.hpp | 2 +- extra/yassl/taocrypt/mySTL/helpers.hpp | 2 +- extra/yassl/taocrypt/mySTL/list.hpp | 2 +- extra/yassl/taocrypt/mySTL/memory.hpp | 2 +- extra/yassl/taocrypt/mySTL/memory_array.hpp | 2 +- extra/yassl/taocrypt/mySTL/pair.hpp | 2 +- extra/yassl/taocrypt/mySTL/stdexcept.hpp | 2 +- extra/yassl/taocrypt/mySTL/vector.hpp | 2 +- extra/yassl/taocrypt/src/aes.cpp | 2 +- extra/yassl/taocrypt/src/aestables.cpp | 2 +- extra/yassl/taocrypt/src/algebra.cpp | 2 +- extra/yassl/taocrypt/src/arc4.cpp | 2 +- extra/yassl/taocrypt/src/asn.cpp | 2 +- extra/yassl/taocrypt/src/bftables.cpp | 2 +- extra/yassl/taocrypt/src/blowfish.cpp | 2 +- extra/yassl/taocrypt/src/coding.cpp | 2 +- extra/yassl/taocrypt/src/des.cpp | 2 +- extra/yassl/taocrypt/src/dh.cpp | 2 +- extra/yassl/taocrypt/src/dsa.cpp | 2 +- extra/yassl/taocrypt/src/file.cpp | 2 +- extra/yassl/taocrypt/src/hash.cpp | 2 +- extra/yassl/taocrypt/src/hc128.cpp | 2 +- extra/yassl/taocrypt/src/integer.cpp | 2 +- extra/yassl/taocrypt/src/make.bat | 2 +- extra/yassl/taocrypt/src/md2.cpp | 2 +- extra/yassl/taocrypt/src/md4.cpp | 2 +- extra/yassl/taocrypt/src/md5.cpp | 2 +- extra/yassl/taocrypt/src/misc.cpp | 2 +- extra/yassl/taocrypt/src/rabbit.cpp | 2 +- extra/yassl/taocrypt/src/random.cpp | 2 +- extra/yassl/taocrypt/src/ripemd.cpp | 2 +- extra/yassl/taocrypt/src/rsa.cpp | 2 +- extra/yassl/taocrypt/src/sha.cpp | 2 +- extra/yassl/taocrypt/src/template_instnt.cpp | 2 +- extra/yassl/taocrypt/src/tftables.cpp | 2 +- extra/yassl/taocrypt/src/twofish.cpp | 2 +- extra/yassl/taocrypt/test/make.bat | 2 +- extra/yassl/taocrypt/test/memory.cpp | 2 +- extra/yassl/taocrypt/test/test.cpp | 2 +- extra/yassl/testsuite/make.bat | 2 +- extra/yassl/testsuite/test.hpp | 2 +- extra/yassl/testsuite/testsuite.cpp | 2 +- include/CMakeLists.txt | 2 +- include/atomic/gcc_builtins.h | 2 +- include/atomic/generic-msvc.h | 2 +- include/atomic/nolock.h | 2 +- include/atomic/rwlock.h | 2 +- include/atomic/solaris.h | 2 +- include/atomic/x86-gcc.h | 2 +- include/base64.h | 2 +- include/decimal.h | 2 +- include/errmsg.h | 2 +- include/ft_global.h | 2 +- include/hash.h | 2 +- include/heap.h | 2 +- include/keycache.h | 2 +- include/lf.h | 2 +- include/m_ctype.h | 2 +- include/m_string.h | 2 +- include/my_aes.h | 2 +- include/my_alarm.h | 2 +- include/my_alloc.h | 2 +- include/my_atomic.h | 2 +- include/my_attribute.h | 2 +- include/my_bit.h | 2 +- include/my_bitmap.h | 2 +- include/my_check_opt.h | 2 +- include/my_compare.h | 2 +- include/my_compiler.h | 2 +- include/my_dbug.h | 2 +- include/my_dir.h | 2 +- include/my_getopt.h | 2 +- include/my_global.h | 2 +- include/my_libwrap.h | 2 +- include/my_list.h | 2 +- include/my_md5.h | 2 +- include/my_net.h | 2 +- include/my_nosys.h | 2 +- include/my_pthread.h | 2 +- include/my_rdtsc.h | 2 +- include/my_stacktrace.h | 2 +- include/my_sys.h | 2 +- include/my_time.h | 2 +- include/my_tree.h | 2 +- include/my_uctype.h | 2 +- include/my_user.h | 2 +- include/my_xml.h | 2 +- include/myisam.h | 2 +- include/myisammrg.h | 2 +- include/myisampack.h | 2 +- include/mysql.h | 2 +- include/mysql/client_plugin.h | 2 +- include/mysql/plugin.h | 2 +- include/mysql/plugin_audit.h | 2 +- include/mysql/plugin_auth.h | 2 +- include/mysql/plugin_auth_common.h | 2 +- include/mysql/plugin_ftparser.h | 2 +- include/mysql/service_debug_sync.h | 2 +- include/mysql/service_kill_statement.h | 2 +- include/mysql/service_my_snprintf.h | 2 +- include/mysql/service_thd_alloc.h | 2 +- include/mysql/service_thd_wait.h | 2 +- include/mysql/service_thread_scheduler.h | 2 +- include/mysql/services.h | 2 +- include/mysql_com.h | 2 +- include/mysql_embed.h | 2 +- include/mysql_time.h | 2 +- include/mysys_err.h | 2 +- include/password.h | 2 +- include/probes_mysql.d.base | 2 +- include/probes_mysql.h | 2 +- include/rijndael.h | 2 +- include/service_versions.h | 2 +- include/sha1.h | 2 +- include/sha2.h | 2 +- include/sql_common.h | 2 +- include/sslopt-case.h | 2 +- include/sslopt-longopts.h | 2 +- include/sslopt-vars.h | 2 +- include/t_ctype.h | 2 +- include/thr_alarm.h | 2 +- include/thr_lock.h | 2 +- include/thread_pool_priv.h | 2 +- include/typelib.h | 2 +- include/welcome_copyright_notice.h | 2 +- libmysql/CMakeLists.txt | 2 +- libmysql/client_settings.h | 2 +- libmysql/conf_to_src.c | 2 +- libmysql/errmsg.c | 2 +- libmysql/get_password.c | 2 +- libmysql/libmysql.c | 2 +- libmysqld/CMakeLists.txt | 2 +- libmysqld/emb_qcache.cc | 2 +- libmysqld/emb_qcache.h | 2 +- libmysqld/embedded_priv.h | 2 +- libmysqld/examples/CMakeLists.txt | 2 +- .../examples/builder-sample/emb_sample.bpr | 2 +- .../examples/builder-sample/emb_sample.cpp | 2 +- .../examples/builder-sample/emb_samples.cpp | 2 +- .../examples/builder-sample/emb_samples.h | 2 +- libmysqld/examples/test-run | 2 +- libmysqld/libmysqld.c | 2 +- libservices/CMakeLists.txt | 2 +- libservices/debug_sync_service.c | 2 +- libservices/kill_statement_service.c | 2 +- libservices/my_snprintf_service.c | 2 +- libservices/my_thread_scheduler_service.c | 2 +- libservices/thd_alloc_service.c | 2 +- libservices/thd_wait_service.c | 2 +- man/CMakeLists.txt | 2 +- man/comp_err.1 | 2 +- man/innochecksum.1 | 2 +- man/make_win_bin_dist.1 | 2 +- man/msql2mysql.1 | 2 +- man/my_print_defaults.1 | 2 +- man/myisam_ftdump.1 | 2 +- man/myisamchk.1 | 2 +- man/myisamlog.1 | 2 +- man/myisampack.1 | 2 +- man/mysql-stress-test.pl.1 | 2 +- man/mysql-test-run.pl.1 | 2 +- man/mysql.1 | 2 +- man/mysql.server.1 | 2 +- man/mysql_client_test.1 | 2 +- man/mysql_config.1 | 2 +- man/mysql_convert_table_format.1 | 2 +- man/mysql_find_rows.1 | 2 +- man/mysql_fix_extensions.1 | 2 +- man/mysql_install_db.1 | 2 +- man/mysql_plugin.1 | 2 +- man/mysql_secure_installation.1 | 2 +- man/mysql_setpermission.1 | 2 +- man/mysql_tzinfo_to_sql.1 | 2 +- man/mysql_upgrade.1 | 2 +- man/mysql_waitpid.1 | 2 +- man/mysql_zap.1 | 2 +- man/mysqlaccess.1 | 2 +- man/mysqladmin.1 | 2 +- man/mysqlbinlog.1 | 2 +- man/mysqlbug.1 | 2 +- man/mysqlcheck.1 | 2 +- man/mysqld.8 | 2 +- man/mysqld_multi.1 | 2 +- man/mysqld_safe.1 | 2 +- man/mysqldump.1 | 2 +- man/mysqldumpslow.1 | 2 +- man/mysqlhotcopy.1 | 2 +- man/mysqlimport.1 | 2 +- man/mysqlshow.1 | 2 +- man/mysqlslap.1 | 2 +- man/mysqltest.1 | 2 +- man/ndbd.8 | 2 +- man/ndbd_redo_log_reader.1 | 2 +- man/ndbmtd.8 | 2 +- man/perror.1 | 2 +- man/replace.1 | 2 +- man/resolve_stack_dump.1 | 2 +- man/resolveip.1 | 2 +- mysql-test/CMakeLists.txt | 2 +- mysql-test/include/default_my.cnf | 2 +- mysql-test/include/default_mysqld.cnf | 2 +- mysql-test/include/have_perfschema.inc | 2 +- mysql-test/include/mtr_check.sql | 2 +- mysql-test/include/mtr_warnings.sql | 2 +- mysql-test/include/set_binlog_format_mixed.sql | 2 +- mysql-test/include/set_binlog_format_row.sql | 2 +- .../include/set_binlog_format_statement.sql | 2 +- mysql-test/lib/My/Config.pm | 2 +- mysql-test/lib/My/ConfigFactory.pm | 2 +- mysql-test/lib/My/CoreDump.pm | 2 +- mysql-test/lib/My/File/Path.pm | 2 +- mysql-test/lib/My/Find.pm | 2 +- mysql-test/lib/My/Handles.pm | 2 +- mysql-test/lib/My/Options.pm | 2 +- mysql-test/lib/My/Platform.pm | 2 +- mysql-test/lib/My/SafeProcess.pm | 2 +- mysql-test/lib/My/SafeProcess/Base.pm | 2 +- mysql-test/lib/My/SafeProcess/CMakeLists.txt | 2 +- mysql-test/lib/My/SafeProcess/safe_kill_win.cc | 2 +- mysql-test/lib/My/SafeProcess/safe_process.cc | 2 +- .../lib/My/SafeProcess/safe_process_win.cc | 2 +- mysql-test/lib/My/SysInfo.pm | 2 +- mysql-test/lib/My/Test.pm | 2 +- mysql-test/lib/mtr_cases.pm | 2 +- mysql-test/lib/mtr_gcov.pl | 2 +- mysql-test/lib/mtr_gprof.pl | 2 +- mysql-test/lib/mtr_io.pl | 2 +- mysql-test/lib/mtr_match.pm | 2 +- mysql-test/lib/mtr_misc.pl | 2 +- mysql-test/lib/mtr_process.pl | 2 +- mysql-test/lib/mtr_report.pm | 2 +- mysql-test/lib/mtr_results.pm | 2 +- mysql-test/lib/mtr_stress.pl | 2 +- mysql-test/lib/mtr_unique.pm | 2 +- mysql-test/lib/t/Base.t | 2 +- mysql-test/lib/t/Find.t | 2 +- mysql-test/lib/t/Options.t | 2 +- mysql-test/lib/t/Platform.t | 2 +- mysql-test/lib/t/SafeProcess.t | 2 +- mysql-test/lib/t/SafeProcessStress.pl | 2 +- mysql-test/lib/t/copytree.t | 2 +- mysql-test/lib/t/dummyd.pl | 2 +- mysql-test/lib/t/rmtree.t | 2 +- mysql-test/lib/t/testMyConfig.t | 2 +- mysql-test/lib/t/testMyConfigFactory.t | 2 +- mysql-test/lib/t/test_child.pl | 2 +- mysql-test/lib/v1/My/Config.pm | 2 +- mysql-test/lib/v1/mtr_cases.pl | 2 +- mysql-test/lib/v1/mtr_gcov.pl | 2 +- mysql-test/lib/v1/mtr_gprof.pl | 2 +- mysql-test/lib/v1/mtr_im.pl | 2 +- mysql-test/lib/v1/mtr_io.pl | 2 +- mysql-test/lib/v1/mtr_match.pl | 2 +- mysql-test/lib/v1/mtr_misc.pl | 2 +- mysql-test/lib/v1/mtr_process.pl | 2 +- mysql-test/lib/v1/mtr_report.pl | 2 +- mysql-test/lib/v1/mtr_stress.pl | 2 +- mysql-test/lib/v1/mtr_timer.pl | 2 +- mysql-test/lib/v1/mtr_unique.pl | 2 +- mysql-test/lib/v1/mysql-test-run.pl | 2 +- mysql-test/mysql-stress-test.pl | 2 +- mysql-test/mysql-test-run.pl | 2 +- mysql-test/purify.supp | 2 +- mysql-test/std_data/checkDBI_DBD-mysql.pl | 2 +- mysql-test/std_data/latin1.xml | 2 +- mysql-test/suite/perfschema_stress/README | 2 +- mysql-test/suite/rpl/extension/checksum.pl | 2 +- mysql-test/valgrind.supp | 2 +- mysys/CMakeLists.txt | 2 +- mysys/array.c | 2 +- mysys/base64.c | 2 +- mysys/charset-def.c | 2 +- mysys/charset.c | 2 +- mysys/checksum.c | 2 +- mysys/default.c | 2 +- mysys/errors.c | 2 +- mysys/hash.c | 2 +- mysys/lf_alloc-pin.c | 2 +- mysys/lf_dynarray.c | 2 +- mysys/lf_hash.c | 2 +- mysys/list.c | 2 +- mysys/md5.c | 2 +- mysys/mf_arr_appstr.c | 2 +- mysys/mf_cache.c | 2 +- mysys/mf_dirname.c | 2 +- mysys/mf_fn_ext.c | 2 +- mysys/mf_format.c | 2 +- mysys/mf_getdate.c | 2 +- mysys/mf_iocache.c | 2 +- mysys/mf_iocache2.c | 2 +- mysys/mf_keycache.c | 2 +- mysys/mf_keycaches.c | 2 +- mysys/mf_loadpath.c | 2 +- mysys/mf_pack.c | 2 +- mysys/mf_path.c | 2 +- mysys/mf_qsort.c | 2 +- mysys/mf_qsort2.c | 2 +- mysys/mf_radix.c | 2 +- mysys/mf_same.c | 2 +- mysys/mf_sort.c | 2 +- mysys/mf_soundex.c | 2 +- mysys/mf_tempdir.c | 2 +- mysys/mf_tempfile.c | 2 +- mysys/mf_unixpath.c | 2 +- mysys/mf_wcomp.c | 2 +- mysys/mulalloc.c | 2 +- mysys/my_access.c | 2 +- mysys/my_addr_resolve.c | 2 +- mysys/my_aes.c | 2 +- mysys/my_alarm.c | 2 +- mysys/my_alloc.c | 2 +- mysys/my_atomic.c | 2 +- mysys/my_basename.c | 2 +- mysys/my_bit.c | 2 +- mysys/my_bitmap.c | 2 +- mysys/my_chsize.c | 2 +- mysys/my_compare.c | 2 +- mysys/my_compress.c | 2 +- mysys/my_conio.c | 2 +- mysys/my_copy.c | 2 +- mysys/my_crc32.c | 2 +- mysys/my_create.c | 2 +- mysys/my_delete.c | 2 +- mysys/my_div.c | 2 +- mysys/my_error.c | 2 +- mysys/my_file.c | 2 +- mysys/my_fopen.c | 2 +- mysys/my_fstream.c | 2 +- mysys/my_gethwaddr.c | 2 +- mysys/my_getncpus.c | 2 +- mysys/my_getopt.c | 2 +- mysys/my_getpagesize.c | 2 +- mysys/my_getsystime.c | 2 +- mysys/my_getwd.c | 2 +- mysys/my_init.c | 2 +- mysys/my_largepage.c | 2 +- mysys/my_lib.c | 2 +- mysys/my_libwrap.c | 2 +- mysys/my_lock.c | 2 +- mysys/my_lockmem.c | 2 +- mysys/my_malloc.c | 2 +- mysys/my_memmem.c | 2 +- mysys/my_mess.c | 2 +- mysys/my_mkdir.c | 2 +- mysys/my_mmap.c | 2 +- mysys/my_new.cc | 2 +- mysys/my_once.c | 2 +- mysys/my_open.c | 2 +- mysys/my_pread.c | 2 +- mysys/my_pthread.c | 2 +- mysys/my_quick.c | 2 +- mysys/my_rdtsc.c | 2 +- mysys/my_read.c | 2 +- mysys/my_redel.c | 2 +- mysys/my_rename.c | 2 +- mysys/my_seek.c | 2 +- mysys/my_sleep.c | 2 +- mysys/my_static.c | 2 +- mysys/my_static.h | 2 +- mysys/my_symlink.c | 2 +- mysys/my_symlink2.c | 2 +- mysys/my_sync.c | 2 +- mysys/my_thr_init.c | 2 +- mysys/my_timer_cycles.il | 2 +- mysys/my_wincond.c | 2 +- mysys/my_windac.c | 2 +- mysys/my_winerr.c | 2 +- mysys/my_winfile.c | 2 +- mysys/my_winthread.c | 2 +- mysys/my_write.c | 2 +- mysys/mysys_priv.h | 2 +- mysys/ptr_cmp.c | 2 +- mysys/rijndael.c | 2 +- mysys/safemalloc.c | 2 +- mysys/sha1.c | 2 +- mysys/stacktrace.c | 2 +- mysys/string.c | 2 +- mysys/test_charset.c | 2 +- mysys/test_dir.c | 2 +- mysys/test_xml.c | 2 +- mysys/testhash.c | 2 +- mysys/thr_alarm.c | 2 +- mysys/thr_lock.c | 2 +- mysys/thr_mutex.c | 2 +- mysys/thr_rwlock.c | 2 +- mysys/tree.c | 2 +- mysys/typelib.c | 2 +- packaging/WiX/CMakeLists.txt | 2 +- packaging/WiX/CPackWixConfig.cmake | 2 +- packaging/WiX/ca/CMakeLists.txt | 2 +- packaging/WiX/ca/CustomAction.cpp | 2 +- packaging/WiX/create_msi.cmake.in | 2 +- packaging/WiX/custom_ui.wxs | 2 +- packaging/WiX/extra.wxs.in | 2 +- packaging/WiX/mysql_server.wxs.in | 2 +- packaging/rpm-oel/CMakeLists.txt | 2 +- packaging/rpm-oel/mysql.spec.in | 2 +- packaging/solaris/CMakeLists.txt | 2 +- packaging/solaris/postinstall-solaris.sh | 2 +- plugin/audit_null/CMakeLists.txt | 2 +- plugin/audit_null/audit_null.c | 2 +- plugin/auth_dialog/CMakeLists.txt | 2 +- plugin/auth_dialog/dialog.c | 2 +- plugin/auth_examples/CMakeLists.txt | 2 +- plugin/auth_examples/auth_0x0100.c | 2 +- plugin/auth_examples/dialog_examples.c | 2 +- plugin/auth_examples/qa_auth_client.c | 2 +- plugin/auth_examples/qa_auth_interface.c | 2 +- plugin/auth_examples/qa_auth_server.c | 2 +- plugin/auth_examples/test_plugin.c | 2 +- plugin/auth_socket/CMakeLists.txt | 2 +- plugin/auth_socket/auth_socket.c | 2 +- plugin/daemon_example/CMakeLists.txt | 2 +- plugin/daemon_example/daemon_example.cc | 2 +- plugin/fulltext/CMakeLists.txt | 2 +- plugin/fulltext/plugin_example.c | 2 +- plugin/semisync/CMakeLists.txt | 2 +- plugin/semisync/semisync.cc | 2 +- plugin/semisync/semisync.h | 2 +- plugin/semisync/semisync_master.cc | 2 +- plugin/semisync/semisync_master.h | 2 +- plugin/semisync/semisync_master_plugin.cc | 2 +- plugin/semisync/semisync_slave.cc | 2 +- plugin/semisync/semisync_slave.h | 2 +- plugin/semisync/semisync_slave_plugin.cc | 2 +- plugin/server_audit/COPYING | 4 ++-- plugin/server_audit/plugin_audit_v4.h | 2 +- plugin/sql_errlog/CMakeLists.txt | 2 +- plugin/win_auth_client/CMakeLists.txt | 2 +- plugin/win_auth_client/common.cc | 2 +- plugin/win_auth_client/common.h | 2 +- plugin/win_auth_client/handshake.cc | 2 +- plugin/win_auth_client/handshake.h | 2 +- plugin/win_auth_client/handshake_client.cc | 2 +- plugin/win_auth_client/log_client.cc | 2 +- plugin/win_auth_client/plugin_client.cc | 2 +- regex/CMakeLists.txt | 2 +- scripts/CMakeLists.txt | 2 +- scripts/comp_sql.c | 2 +- scripts/fill_help_tables.sql | 2 +- scripts/make_binary_distribution.sh | 2 +- scripts/make_win_bin_dist | 2 +- scripts/msql2mysql.sh | 2 +- scripts/mysql_config.pl.in | 2 +- scripts/mysql_config.sh | 2 +- scripts/mysql_convert_table_format.sh | 2 +- scripts/mysql_find_rows.sh | 2 +- scripts/mysql_fix_extensions.sh | 2 +- scripts/mysql_install_db.pl.in | 2 +- scripts/mysql_install_db.sh | 2 +- scripts/mysql_secure_installation.pl.in | 2 +- scripts/mysql_secure_installation.sh | 2 +- scripts/mysql_setpermission.sh | 2 +- scripts/mysql_system_tables.sql | 2 +- scripts/mysql_system_tables_data.sql | 2 +- scripts/mysql_system_tables_fix.sql | 2 +- scripts/mysql_test_data_timezone.sql | 2 +- scripts/mysql_zap.sh | 2 +- scripts/mysqlaccess.sh | 2 +- scripts/mysqlbug.sh | 2 +- scripts/mysqld_multi.sh | 2 +- scripts/mysqldumpslow.sh | 2 +- scripts/mysqlhotcopy.sh | 2 +- sql-bench/CMakeLists.txt | 2 +- sql-bench/as3ap.sh | 2 +- sql-bench/bench-count-distinct.sh | 2 +- sql-bench/bench-init.pl.sh | 2 +- sql-bench/compare-results.sh | 2 +- sql-bench/copy-db.sh | 2 +- sql-bench/crash-me.sh | 2 +- sql-bench/run-all-tests.sh | 2 +- sql-bench/server-cfg.sh | 2 +- sql-bench/test-ATIS.sh | 2 +- sql-bench/test-alter-table.sh | 2 +- sql-bench/test-big-tables.sh | 2 +- sql-bench/test-connect.sh | 2 +- sql-bench/test-create.sh | 2 +- sql-bench/test-insert.sh | 2 +- sql-bench/test-select.sh | 2 +- sql-bench/test-transactions.sh | 2 +- sql-bench/test-wisconsin.sh | 2 +- sql-common/client.c | 2 +- sql-common/client_plugin.c | 2 +- sql-common/my_time.c | 2 +- sql-common/my_user.c | 2 +- sql-common/pack.c | 2 +- sql/CMakeLists.txt | 2 +- sql/authors.h | 2 +- sql/client_settings.h | 2 +- sql/contributors.h | 2 +- sql/custom_conf.h | 2 +- sql/datadict.cc | 2 +- sql/datadict.h | 2 +- sql/debug_sync.cc | 2 +- sql/debug_sync.h | 2 +- sql/derror.cc | 2 +- sql/derror.h | 2 +- sql/des_key_file.cc | 2 +- sql/des_key_file.h | 2 +- sql/discover.cc | 2 +- sql/discover.h | 2 +- sql/event_data_objects.cc | 2 +- sql/event_data_objects.h | 2 +- sql/event_db_repository.cc | 2 +- sql/event_db_repository.h | 2 +- sql/event_parse_data.cc | 2 +- sql/event_parse_data.h | 2 +- sql/event_queue.cc | 2 +- sql/event_queue.h | 2 +- sql/event_scheduler.cc | 2 +- sql/event_scheduler.h | 2 +- sql/events.cc | 2 +- sql/events.h | 2 +- sql/examples/CMakeLists.txt | 2 +- sql/field.cc | 2 +- sql/field.h | 2 +- sql/field_conv.cc | 2 +- sql/filesort.cc | 2 +- sql/filesort.h | 2 +- sql/frm_crypt.cc | 2 +- sql/frm_crypt.h | 2 +- sql/gen_lex_hash.cc | 2 +- sql/gstream.cc | 2 +- sql/gstream.h | 2 +- sql/ha_ndbcluster.cc | 2 +- sql/ha_ndbcluster.h | 2 +- sql/ha_ndbcluster_binlog.cc | 2 +- sql/ha_ndbcluster_binlog.h | 2 +- sql/ha_ndbcluster_cond.cc | 2 +- sql/ha_ndbcluster_cond.h | 2 +- sql/ha_ndbcluster_tables.h | 2 +- sql/ha_partition.cc | 2 +- sql/ha_partition.h | 2 +- sql/handler.h | 2 +- sql/hash_filo.cc | 2 +- sql/hash_filo.h | 2 +- sql/hostname.cc | 2 +- sql/hostname.h | 2 +- sql/init.cc | 2 +- sql/init.h | 2 +- sql/innodb_priv.h | 2 +- sql/item.cc | 2 +- sql/item.h | 2 +- sql/item_buff.cc | 2 +- sql/item_cmpfunc.cc | 2 +- sql/item_cmpfunc.h | 2 +- sql/item_create.cc | 2 +- sql/item_create.h | 2 +- sql/item_func.cc | 2 +- sql/item_func.h | 2 +- sql/item_geofunc.cc | 2 +- sql/item_geofunc.h | 2 +- sql/item_row.cc | 2 +- sql/item_row.h | 2 +- sql/item_strfunc.cc | 2 +- sql/item_strfunc.h | 2 +- sql/item_subselect.cc | 2 +- sql/item_subselect.h | 2 +- sql/item_sum.cc | 2 +- sql/item_sum.h | 2 +- sql/item_timefunc.cc | 2 +- sql/item_timefunc.h | 2 +- sql/item_xmlfunc.cc | 2 +- sql/item_xmlfunc.h | 2 +- sql/key.cc | 2 +- sql/key.h | 2 +- sql/keycaches.cc | 2 +- sql/keycaches.h | 2 +- sql/lex.h | 2 +- sql/lex_symbol.h | 2 +- sql/lock.cc | 2 +- sql/lock.h | 2 +- sql/log.cc | 2 +- sql/log.h | 2 +- sql/log_event.cc | 2 +- sql/log_event.h | 2 +- sql/log_event_old.cc | 2 +- sql/log_event_old.h | 2 +- sql/main.cc | 2 +- sql/mdl.cc | 2 +- sql/mdl.h | 2 +- sql/mem_root_array.h | 2 +- sql/message.h | 2 +- sql/mf_iocache.cc | 2 +- sql/my_decimal.cc | 2 +- sql/my_decimal.h | 2 +- sql/mysqld.cc | 2 +- sql/mysqld.h | 2 +- sql/mysqld_suffix.h | 2 +- sql/net_serv.cc | 2 +- sql/opt_range.cc | 2 +- sql/opt_range.h | 2 +- sql/opt_sum.cc | 2 +- sql/parse_file.cc | 2 +- sql/parse_file.h | 2 +- sql/partition_element.h | 2 +- sql/partition_info.cc | 2 +- sql/partition_info.h | 2 +- sql/password.c | 2 +- sql/procedure.cc | 2 +- sql/procedure.h | 2 +- sql/protocol.cc | 2 +- sql/protocol.h | 2 +- sql/records.cc | 2 +- sql/records.h | 2 +- sql/repl_failsafe.cc | 2 +- sql/repl_failsafe.h | 2 +- sql/replication.h | 2 +- sql/rpl_constants.h | 2 +- sql/rpl_filter.cc | 2 +- sql/rpl_filter.h | 2 +- sql/rpl_handler.cc | 2 +- sql/rpl_handler.h | 2 +- sql/rpl_injector.cc | 2 +- sql/rpl_injector.h | 2 +- sql/rpl_mi.cc | 2 +- sql/rpl_mi.h | 2 +- sql/rpl_record.cc | 2 +- sql/rpl_record.h | 2 +- sql/rpl_record_old.cc | 2 +- sql/rpl_record_old.h | 2 +- sql/rpl_reporting.cc | 2 +- sql/rpl_reporting.h | 2 +- sql/rpl_rli.cc | 2 +- sql/rpl_rli.h | 2 +- sql/rpl_tblmap.cc | 2 +- sql/rpl_tblmap.h | 2 +- sql/rpl_utility.cc | 2 +- sql/rpl_utility.h | 2 +- sql/scheduler.cc | 2 +- sql/scheduler.h | 2 +- sql/set_var.cc | 2 +- sql/set_var.h | 2 +- sql/sha2.cc | 2 +- sql/share/CMakeLists.txt | 2 +- sql/share/charsets/Index.xml | 2 +- sql/share/charsets/armscii8.xml | 2 +- sql/share/charsets/ascii.xml | 2 +- sql/share/charsets/cp1250.xml | 2 +- sql/share/charsets/cp1251.xml | 2 +- sql/share/charsets/cp1256.xml | 2 +- sql/share/charsets/cp1257.xml | 2 +- sql/share/charsets/cp850.xml | 2 +- sql/share/charsets/cp852.xml | 2 +- sql/share/charsets/cp866.xml | 2 +- sql/share/charsets/dec8.xml | 2 +- sql/share/charsets/geostd8.xml | 2 +- sql/share/charsets/greek.xml | 2 +- sql/share/charsets/hebrew.xml | 2 +- sql/share/charsets/hp8.xml | 2 +- sql/share/charsets/keybcs2.xml | 2 +- sql/share/charsets/koi8r.xml | 2 +- sql/share/charsets/koi8u.xml | 2 +- sql/share/charsets/languages.html | 2 +- sql/share/charsets/latin1.xml | 2 +- sql/share/charsets/latin2.xml | 2 +- sql/share/charsets/latin5.xml | 2 +- sql/share/charsets/latin7.xml | 2 +- sql/share/charsets/macce.xml | 2 +- sql/share/charsets/macroman.xml | 2 +- sql/share/charsets/swe7.xml | 2 +- sql/signal_handler.cc | 2 +- sql/slave.cc | 2 +- sql/slave.h | 2 +- sql/sp.cc | 2 +- sql/sp.h | 2 +- sql/sp_cache.cc | 2 +- sql/sp_cache.h | 2 +- sql/sp_head.cc | 2 +- sql/sp_head.h | 2 +- sql/sp_pcontext.cc | 2 +- sql/sp_pcontext.h | 2 +- sql/sp_rcontext.cc | 2 +- sql/sp_rcontext.h | 2 +- sql/spatial.cc | 2 +- sql/spatial.h | 2 +- sql/sql_acl.cc | 2 +- sql/sql_acl.h | 2 +- sql/sql_admin.cc | 2 +- sql/sql_admin.h | 2 +- sql/sql_alter.cc | 2 +- sql/sql_alter.h | 2 +- sql/sql_analyse.cc | 2 +- sql/sql_analyse.h | 2 +- sql/sql_array.h | 2 +- sql/sql_audit.cc | 2 +- sql/sql_audit.h | 2 +- sql/sql_base.cc | 2 +- sql/sql_base.h | 2 +- sql/sql_binlog.cc | 2 +- sql/sql_binlog.h | 2 +- sql/sql_bitmap.h | 2 +- sql/sql_builtin.cc.in | 2 +- sql/sql_cache.cc | 2 +- sql/sql_cache.h | 2 +- sql/sql_callback.h | 2 +- sql/sql_class.cc | 2 +- sql/sql_class.h | 2 +- sql/sql_client.cc | 2 +- sql/sql_connect.cc | 2 +- sql/sql_connect.h | 2 +- sql/sql_const.h | 2 +- sql/sql_crypt.cc | 2 +- sql/sql_crypt.h | 2 +- sql/sql_cursor.cc | 2 +- sql/sql_cursor.h | 2 +- sql/sql_db.cc | 2 +- sql/sql_db.h | 2 +- sql/sql_delete.cc | 2 +- sql/sql_delete.h | 2 +- sql/sql_derived.cc | 2 +- sql/sql_derived.h | 2 +- sql/sql_do.cc | 2 +- sql/sql_do.h | 2 +- sql/sql_error.cc | 2 +- sql/sql_error.h | 2 +- sql/sql_handler.cc | 2 +- sql/sql_handler.h | 2 +- sql/sql_help.cc | 2 +- sql/sql_help.h | 2 +- sql/sql_hset.h | 2 +- sql/sql_insert.cc | 2 +- sql/sql_insert.h | 2 +- sql/sql_lex.cc | 2 +- sql/sql_lex.h | 2 +- sql/sql_list.cc | 2 +- sql/sql_list.h | 2 +- sql/sql_load.cc | 2 +- sql/sql_load.h | 2 +- sql/sql_locale.cc | 2 +- sql/sql_locale.h | 2 +- sql/sql_manager.cc | 2 +- sql/sql_manager.h | 2 +- sql/sql_parse.cc | 2 +- sql/sql_parse.h | 2 +- sql/sql_partition.cc | 2 +- sql/sql_partition.h | 2 +- sql/sql_partition_admin.cc | 2 +- sql/sql_partition_admin.h | 2 +- sql/sql_plist.h | 2 +- sql/sql_plugin.cc | 2 +- sql/sql_plugin.h | 2 +- sql/sql_plugin_compat.h | 2 +- sql/sql_plugin_services.h | 2 +- sql/sql_prepare.cc | 2 +- sql/sql_prepare.h | 2 +- sql/sql_priv.h | 2 +- sql/sql_profile.cc | 2 +- sql/sql_profile.h | 2 +- sql/sql_reload.cc | 2 +- sql/sql_reload.h | 2 +- sql/sql_rename.cc | 2 +- sql/sql_rename.h | 2 +- sql/sql_repl.cc | 2 +- sql/sql_repl.h | 2 +- sql/sql_select.cc | 2 +- sql/sql_select.h | 2 +- sql/sql_servers.cc | 2 +- sql/sql_servers.h | 2 +- sql/sql_show.cc | 2 +- sql/sql_show.h | 2 +- sql/sql_signal.cc | 2 +- sql/sql_signal.h | 2 +- sql/sql_sort.h | 2 +- sql/sql_state.c | 2 +- sql/sql_string.cc | 2 +- sql/sql_string.h | 2 +- sql/sql_table.cc | 2 +- sql/sql_table.h | 2 +- sql/sql_tablespace.cc | 2 +- sql/sql_tablespace.h | 2 +- sql/sql_test.cc | 2 +- sql/sql_test.h | 2 +- sql/sql_time.cc | 2 +- sql/sql_time.h | 2 +- sql/sql_trigger.cc | 2 +- sql/sql_trigger.h | 2 +- sql/sql_truncate.cc | 2 +- sql/sql_truncate.h | 2 +- sql/sql_type_int.h | 2 +- sql/sql_udf.cc | 2 +- sql/sql_udf.h | 2 +- sql/sql_union.cc | 2 +- sql/sql_union.h | 2 +- sql/sql_update.cc | 2 +- sql/sql_update.h | 2 +- sql/sql_view.cc | 2 +- sql/sql_view.h | 2 +- sql/sql_yacc.yy | 2 +- sql/strfunc.cc | 2 +- sql/strfunc.h | 2 +- sql/structs.h | 2 +- sql/sys_vars.cc | 2 +- sql/sys_vars.h | 2 +- sql/sys_vars_shared.h | 2 +- sql/table.cc | 2 +- sql/table.h | 2 +- sql/thr_malloc.cc | 2 +- sql/thr_malloc.h | 2 +- sql/transaction.cc | 2 +- sql/transaction.h | 2 +- sql/tzfile.h | 2 +- sql/tztime.cc | 2 +- sql/tztime.h | 2 +- sql/udf_example.c | 2 +- sql/uniques.cc | 2 +- sql/unireg.cc | 2 +- sql/unireg.h | 2 +- storage/archive/CMakeLists.txt | 2 +- storage/archive/archive_reader.c | 2 +- storage/archive/archive_test.c | 2 +- storage/archive/ha_archive.cc | 2 +- storage/archive/ha_archive.h | 2 +- storage/blackhole/CMakeLists.txt | 2 +- storage/blackhole/ha_blackhole.cc | 2 +- storage/blackhole/ha_blackhole.h | 2 +- storage/csv/CMakeLists.txt | 2 +- storage/csv/ha_tina.cc | 2 +- storage/csv/ha_tina.h | 2 +- storage/csv/transparent_file.cc | 2 +- storage/csv/transparent_file.h | 2 +- storage/example/CMakeLists.txt | 2 +- storage/example/ha_example.cc | 2 +- storage/example/ha_example.h | 2 +- storage/federated/CMakeLists.txt | 2 +- storage/federated/ha_federated.cc | 2 +- storage/federated/ha_federated.h | 2 +- storage/heap/CMakeLists.txt | 2 +- storage/heap/_check.c | 2 +- storage/heap/_rectest.c | 2 +- storage/heap/ha_heap.cc | 2 +- storage/heap/ha_heap.h | 2 +- storage/heap/heapdef.h | 2 +- storage/heap/hp_block.c | 2 +- storage/heap/hp_clear.c | 2 +- storage/heap/hp_close.c | 2 +- storage/heap/hp_create.c | 2 +- storage/heap/hp_delete.c | 2 +- storage/heap/hp_extra.c | 2 +- storage/heap/hp_hash.c | 2 +- storage/heap/hp_info.c | 2 +- storage/heap/hp_open.c | 2 +- storage/heap/hp_panic.c | 2 +- storage/heap/hp_rename.c | 2 +- storage/heap/hp_rfirst.c | 2 +- storage/heap/hp_rkey.c | 2 +- storage/heap/hp_rlast.c | 2 +- storage/heap/hp_rnext.c | 2 +- storage/heap/hp_rprev.c | 2 +- storage/heap/hp_rrnd.c | 2 +- storage/heap/hp_rsame.c | 2 +- storage/heap/hp_scan.c | 2 +- storage/heap/hp_static.c | 2 +- storage/heap/hp_test1.c | 2 +- storage/heap/hp_test2.c | 2 +- storage/heap/hp_update.c | 2 +- storage/heap/hp_write.c | 2 +- storage/innobase/CMakeLists.txt | 2 +- storage/innobase/btr/btr0pcur.c | 2 +- storage/innobase/btr/btr0sea.c | 2 +- storage/innobase/buf/buf0buddy.c | 2 +- storage/innobase/buf/buf0buf.c | 2 +- storage/innobase/buf/buf0flu.c | 2 +- storage/innobase/buf/buf0lru.c | 2 +- storage/innobase/buf/buf0rea.c | 2 +- storage/innobase/compile-innodb | 2 +- storage/innobase/data/data0data.c | 2 +- storage/innobase/data/data0type.c | 2 +- storage/innobase/dict/dict0boot.c | 2 +- storage/innobase/dict/dict0crea.c | 2 +- storage/innobase/dict/dict0load.c | 2 +- storage/innobase/dict/dict0mem.c | 2 +- storage/innobase/eval/eval0eval.c | 2 +- storage/innobase/eval/eval0proc.c | 2 +- storage/innobase/fil/fil0fil.c | 2 +- storage/innobase/fut/fut0fut.c | 2 +- storage/innobase/fut/fut0lst.c | 2 +- storage/innobase/ha/ha0ha.c | 2 +- storage/innobase/ha/ha0storage.c | 2 +- storage/innobase/ha/hash0hash.c | 2 +- storage/innobase/handler/ha_innodb.h | 2 +- storage/innobase/handler/i_s.cc | 2 +- storage/innobase/handler/i_s.h | 2 +- storage/innobase/include/btr0btr.ic | 2 +- storage/innobase/include/btr0pcur.h | 2 +- storage/innobase/include/btr0pcur.ic | 2 +- storage/innobase/include/btr0sea.h | 2 +- storage/innobase/include/btr0sea.ic | 2 +- storage/innobase/include/btr0types.h | 2 +- storage/innobase/include/buf0buddy.h | 2 +- storage/innobase/include/buf0buddy.ic | 2 +- storage/innobase/include/buf0flu.h | 2 +- storage/innobase/include/buf0flu.ic | 2 +- storage/innobase/include/buf0lru.h | 2 +- storage/innobase/include/buf0lru.ic | 2 +- storage/innobase/include/buf0rea.h | 2 +- storage/innobase/include/buf0types.h | 2 +- storage/innobase/include/data0data.h | 2 +- storage/innobase/include/data0data.ic | 2 +- storage/innobase/include/data0type.h | 2 +- storage/innobase/include/data0type.ic | 2 +- storage/innobase/include/data0types.h | 2 +- storage/innobase/include/dict0boot.h | 2 +- storage/innobase/include/dict0boot.ic | 2 +- storage/innobase/include/dict0crea.h | 2 +- storage/innobase/include/dict0crea.ic | 2 +- storage/innobase/include/dict0load.h | 2 +- storage/innobase/include/dict0load.ic | 2 +- storage/innobase/include/dict0mem.ic | 2 +- storage/innobase/include/dict0types.h | 2 +- storage/innobase/include/eval0eval.h | 2 +- storage/innobase/include/eval0eval.ic | 2 +- storage/innobase/include/eval0proc.h | 2 +- storage/innobase/include/eval0proc.ic | 2 +- storage/innobase/include/fil0fil.h | 2 +- storage/innobase/include/fsp0types.h | 2 +- storage/innobase/include/fut0fut.h | 2 +- storage/innobase/include/fut0fut.ic | 2 +- storage/innobase/include/fut0lst.h | 2 +- storage/innobase/include/fut0lst.ic | 2 +- storage/innobase/include/ha0ha.h | 2 +- storage/innobase/include/ha0ha.ic | 2 +- storage/innobase/include/ha0storage.h | 2 +- storage/innobase/include/ha0storage.ic | 2 +- storage/innobase/include/ha_prototypes.h | 2 +- storage/innobase/include/handler0alter.h | 2 +- storage/innobase/include/hash0hash.h | 2 +- storage/innobase/include/hash0hash.ic | 2 +- storage/innobase/include/ibuf0ibuf.h | 2 +- storage/innobase/include/ibuf0ibuf.ic | 2 +- storage/innobase/include/ibuf0types.h | 2 +- storage/innobase/include/lock0iter.h | 2 +- storage/innobase/include/lock0lock.h | 2 +- storage/innobase/include/lock0lock.ic | 2 +- storage/innobase/include/lock0priv.h | 2 +- storage/innobase/include/lock0priv.ic | 2 +- storage/innobase/include/lock0types.h | 2 +- storage/innobase/include/log0log.ic | 2 +- storage/innobase/include/log0recv.h | 2 +- storage/innobase/include/log0recv.ic | 2 +- storage/innobase/include/mach0data.h | 2 +- storage/innobase/include/mach0data.ic | 2 +- storage/innobase/include/mem0dbg.h | 2 +- storage/innobase/include/mem0dbg.ic | 2 +- storage/innobase/include/mem0mem.h | 2 +- storage/innobase/include/mem0mem.ic | 2 +- storage/innobase/include/mem0pool.h | 2 +- storage/innobase/include/mem0pool.ic | 2 +- storage/innobase/include/mtr0log.h | 2 +- storage/innobase/include/mtr0log.ic | 2 +- storage/innobase/include/mtr0types.h | 2 +- storage/innobase/include/os0file.h | 2 +- storage/innobase/include/os0file.ic | 2 +- storage/innobase/include/os0proc.h | 2 +- storage/innobase/include/os0proc.ic | 2 +- storage/innobase/include/os0sync.h | 2 +- storage/innobase/include/os0sync.ic | 2 +- storage/innobase/include/os0thread.h | 2 +- storage/innobase/include/os0thread.ic | 2 +- storage/innobase/include/page0cur.h | 2 +- storage/innobase/include/page0cur.ic | 2 +- storage/innobase/include/page0types.h | 2 +- storage/innobase/include/page0zip.h | 2 +- storage/innobase/include/page0zip.ic | 2 +- storage/innobase/include/pars0grm.h | 2 +- storage/innobase/include/pars0opt.h | 2 +- storage/innobase/include/pars0opt.ic | 2 +- storage/innobase/include/pars0pars.h | 2 +- storage/innobase/include/pars0pars.ic | 2 +- storage/innobase/include/pars0sym.h | 2 +- storage/innobase/include/pars0sym.ic | 2 +- storage/innobase/include/pars0types.h | 2 +- storage/innobase/include/que0que.h | 2 +- storage/innobase/include/que0que.ic | 2 +- storage/innobase/include/que0types.h | 2 +- storage/innobase/include/read0read.h | 2 +- storage/innobase/include/read0read.ic | 2 +- storage/innobase/include/read0types.h | 2 +- storage/innobase/include/rem0cmp.h | 2 +- storage/innobase/include/rem0cmp.ic | 2 +- storage/innobase/include/rem0rec.h | 2 +- storage/innobase/include/rem0rec.ic | 2 +- storage/innobase/include/rem0types.h | 2 +- storage/innobase/include/row0ext.h | 2 +- storage/innobase/include/row0ext.ic | 2 +- storage/innobase/include/row0ins.h | 2 +- storage/innobase/include/row0ins.ic | 2 +- storage/innobase/include/row0merge.h | 2 +- storage/innobase/include/row0mysql.h | 2 +- storage/innobase/include/row0mysql.ic | 2 +- storage/innobase/include/row0purge.h | 2 +- storage/innobase/include/row0purge.ic | 2 +- storage/innobase/include/row0row.h | 2 +- storage/innobase/include/row0row.ic | 2 +- storage/innobase/include/row0sel.h | 2 +- storage/innobase/include/row0sel.ic | 2 +- storage/innobase/include/row0types.h | 2 +- storage/innobase/include/row0uins.h | 2 +- storage/innobase/include/row0uins.ic | 2 +- storage/innobase/include/row0umod.h | 2 +- storage/innobase/include/row0umod.ic | 2 +- storage/innobase/include/row0undo.h | 2 +- storage/innobase/include/row0undo.ic | 2 +- storage/innobase/include/row0upd.h | 2 +- storage/innobase/include/row0upd.ic | 2 +- storage/innobase/include/row0vers.h | 2 +- storage/innobase/include/row0vers.ic | 2 +- storage/innobase/include/srv0srv.h | 2 +- storage/innobase/include/srv0srv.ic | 2 +- storage/innobase/include/srv0start.h | 2 +- storage/innobase/include/sync0arr.h | 2 +- storage/innobase/include/sync0arr.ic | 2 +- storage/innobase/include/sync0rw.h | 2 +- storage/innobase/include/sync0rw.ic | 2 +- storage/innobase/include/sync0sync.ic | 2 +- storage/innobase/include/sync0types.h | 2 +- storage/innobase/include/trx0i_s.h | 2 +- storage/innobase/include/trx0purge.h | 2 +- storage/innobase/include/trx0purge.ic | 2 +- storage/innobase/include/trx0rec.h | 2 +- storage/innobase/include/trx0roll.h | 2 +- storage/innobase/include/trx0roll.ic | 2 +- storage/innobase/include/trx0rseg.h | 2 +- storage/innobase/include/trx0rseg.ic | 2 +- storage/innobase/include/trx0sys.h | 2 +- storage/innobase/include/trx0sys.ic | 2 +- storage/innobase/include/trx0trx.h | 2 +- storage/innobase/include/trx0trx.ic | 2 +- storage/innobase/include/trx0types.h | 2 +- storage/innobase/include/trx0undo.ic | 2 +- storage/innobase/include/trx0xa.h | 2 +- storage/innobase/include/univ.i | 2 +- storage/innobase/include/usr0sess.h | 2 +- storage/innobase/include/usr0sess.ic | 2 +- storage/innobase/include/usr0types.h | 2 +- storage/innobase/include/ut0bh.h | 2 +- storage/innobase/include/ut0bh.ic | 2 +- storage/innobase/include/ut0byte.h | 2 +- storage/innobase/include/ut0byte.ic | 2 +- storage/innobase/include/ut0dbg.h | 2 +- storage/innobase/include/ut0list.h | 2 +- storage/innobase/include/ut0list.ic | 2 +- storage/innobase/include/ut0lst.h | 2 +- storage/innobase/include/ut0mem.h | 2 +- storage/innobase/include/ut0mem.ic | 2 +- storage/innobase/include/ut0rbt.h | 2 +- storage/innobase/include/ut0rnd.h | 2 +- storage/innobase/include/ut0rnd.ic | 2 +- storage/innobase/include/ut0sort.h | 2 +- storage/innobase/include/ut0ut.h | 2 +- storage/innobase/include/ut0ut.ic | 2 +- storage/innobase/include/ut0vec.h | 2 +- storage/innobase/include/ut0vec.ic | 2 +- storage/innobase/include/ut0wqueue.h | 2 +- storage/innobase/lock/lock0iter.c | 2 +- storage/innobase/lock/lock0lock.c | 2 +- storage/innobase/log/log0recv.c | 2 +- storage/innobase/mach/mach0data.c | 2 +- storage/innobase/mem/mem0dbg.c | 2 +- storage/innobase/mem/mem0mem.c | 2 +- storage/innobase/mem/mem0pool.c | 2 +- storage/innobase/mtr/mtr0log.c | 2 +- storage/innobase/os/os0file.c | 2 +- storage/innobase/os/os0proc.c | 2 +- storage/innobase/os/os0sync.c | 2 +- storage/innobase/os/os0thread.c | 2 +- storage/innobase/page/page0zip.c | 2 +- storage/innobase/pars/lexyy.c | 2 +- storage/innobase/pars/make_bison.sh | 2 +- storage/innobase/pars/make_flex.sh | 2 +- storage/innobase/pars/pars0grm.c | 2 +- storage/innobase/pars/pars0grm.y | 2 +- storage/innobase/pars/pars0lex.l | 2 +- storage/innobase/pars/pars0opt.c | 2 +- storage/innobase/pars/pars0pars.c | 2 +- storage/innobase/pars/pars0sym.c | 2 +- storage/innobase/que/que0que.c | 2 +- storage/innobase/read/read0read.c | 2 +- storage/innobase/rem/rem0cmp.c | 2 +- storage/innobase/rem/rem0rec.c | 2 +- storage/innobase/row/row0ext.c | 2 +- storage/innobase/row/row0merge.c | 2 +- storage/innobase/row/row0sel.c | 2 +- storage/innobase/row/row0uins.c | 2 +- storage/innobase/row/row0umod.c | 2 +- storage/innobase/row/row0undo.c | 2 +- storage/innobase/row/row0vers.c | 2 +- storage/innobase/srv/srv0srv.c | 2 +- storage/innobase/srv/srv0start.c | 2 +- storage/innobase/sync/sync0arr.c | 2 +- storage/innobase/trx/trx0i_s.c | 2 +- storage/innobase/trx/trx0purge.c | 2 +- storage/innobase/trx/trx0roll.c | 2 +- storage/innobase/trx/trx0rseg.c | 2 +- storage/innobase/trx/trx0trx.c | 2 +- storage/innobase/usr/usr0sess.c | 2 +- storage/innobase/ut/ut0bh.c | 2 +- storage/innobase/ut/ut0byte.c | 2 +- storage/innobase/ut/ut0dbg.c | 2 +- storage/innobase/ut/ut0list.c | 2 +- storage/innobase/ut/ut0mem.c | 2 +- storage/innobase/ut/ut0rbt.c | 2 +- storage/innobase/ut/ut0rnd.c | 2 +- storage/innobase/ut/ut0vec.c | 2 +- storage/innobase/ut/ut0wqueue.c | 2 +- storage/maria/CMakeLists.txt | 2 +- storage/maria/unittest/CMakeLists.txt | 2 +- storage/myisam/CMakeLists.txt | 2 +- storage/myisam/ft_boolean_search.c | 2 +- storage/myisam/ft_nlq_search.c | 2 +- storage/myisam/ft_parser.c | 2 +- storage/myisam/ft_static.c | 2 +- storage/myisam/ft_stopwords.c | 2 +- storage/myisam/ft_update.c | 2 +- storage/myisam/ftbench/Ecompare.pl | 2 +- storage/myisam/ftbench/Ecreate.pl | 2 +- storage/myisam/ftbench/Ereport.pl | 2 +- storage/myisam/ftbench/ft-test-run.sh | 2 +- storage/myisam/ftdefs.h | 2 +- storage/myisam/fulltext.h | 2 +- storage/myisam/ha_myisam.cc | 2 +- storage/myisam/ha_myisam.h | 2 +- storage/myisam/mi_cache.c | 2 +- storage/myisam/mi_changed.c | 2 +- storage/myisam/mi_check.c | 2 +- storage/myisam/mi_checksum.c | 2 +- storage/myisam/mi_close.c | 2 +- storage/myisam/mi_create.c | 2 +- storage/myisam/mi_dbug.c | 2 +- storage/myisam/mi_delete.c | 2 +- storage/myisam/mi_delete_all.c | 2 +- storage/myisam/mi_delete_table.c | 2 +- storage/myisam/mi_dynrec.c | 2 +- storage/myisam/mi_extra.c | 2 +- storage/myisam/mi_extrafunc.h | 2 +- storage/myisam/mi_info.c | 2 +- storage/myisam/mi_key.c | 2 +- storage/myisam/mi_keycache.c | 2 +- storage/myisam/mi_locking.c | 2 +- storage/myisam/mi_log.c | 2 +- storage/myisam/mi_open.c | 2 +- storage/myisam/mi_packrec.c | 2 +- storage/myisam/mi_page.c | 2 +- storage/myisam/mi_panic.c | 2 +- storage/myisam/mi_preload.c | 2 +- storage/myisam/mi_range.c | 2 +- storage/myisam/mi_rename.c | 2 +- storage/myisam/mi_rfirst.c | 2 +- storage/myisam/mi_rkey.c | 2 +- storage/myisam/mi_rlast.c | 2 +- storage/myisam/mi_rnext.c | 2 +- storage/myisam/mi_rnext_same.c | 2 +- storage/myisam/mi_rprev.c | 2 +- storage/myisam/mi_rrnd.c | 2 +- storage/myisam/mi_rsame.c | 2 +- storage/myisam/mi_rsamepos.c | 2 +- storage/myisam/mi_scan.c | 2 +- storage/myisam/mi_search.c | 2 +- storage/myisam/mi_static.c | 2 +- storage/myisam/mi_statrec.c | 2 +- storage/myisam/mi_test1.c | 2 +- storage/myisam/mi_test2.c | 2 +- storage/myisam/mi_test3.c | 2 +- storage/myisam/mi_test_all.sh | 2 +- storage/myisam/mi_unique.c | 2 +- storage/myisam/mi_update.c | 2 +- storage/myisam/mi_write.c | 2 +- storage/myisam/myisam_ftdump.c | 2 +- storage/myisam/myisamchk.c | 2 +- storage/myisam/myisamdef.h | 2 +- storage/myisam/myisamlog.c | 2 +- storage/myisam/myisampack.c | 2 +- storage/myisam/rt_index.c | 2 +- storage/myisam/rt_index.h | 2 +- storage/myisam/rt_key.c | 2 +- storage/myisam/rt_key.h | 2 +- storage/myisam/rt_mbr.c | 2 +- storage/myisam/rt_mbr.h | 2 +- storage/myisam/rt_split.c | 2 +- storage/myisam/rt_test.c | 2 +- storage/myisam/sort.c | 2 +- storage/myisam/sp_defs.h | 2 +- storage/myisam/sp_key.c | 2 +- storage/myisam/sp_test.c | 2 +- storage/myisammrg/CMakeLists.txt | 2 +- storage/myisammrg/ha_myisammrg.cc | 2 +- storage/myisammrg/ha_myisammrg.h | 2 +- storage/myisammrg/myrg_close.c | 2 +- storage/myisammrg/myrg_create.c | 2 +- storage/myisammrg/myrg_def.h | 2 +- storage/myisammrg/myrg_delete.c | 2 +- storage/myisammrg/myrg_extra.c | 2 +- storage/myisammrg/myrg_info.c | 2 +- storage/myisammrg/myrg_locking.c | 2 +- storage/myisammrg/myrg_open.c | 2 +- storage/myisammrg/myrg_panic.c | 2 +- storage/myisammrg/myrg_queue.c | 2 +- storage/myisammrg/myrg_range.c | 2 +- storage/myisammrg/myrg_records.c | 2 +- storage/myisammrg/myrg_rfirst.c | 2 +- storage/myisammrg/myrg_rkey.c | 2 +- storage/myisammrg/myrg_rlast.c | 2 +- storage/myisammrg/myrg_rnext.c | 2 +- storage/myisammrg/myrg_rnext_same.c | 2 +- storage/myisammrg/myrg_rprev.c | 2 +- storage/myisammrg/myrg_rrnd.c | 2 +- storage/myisammrg/myrg_rsame.c | 2 +- storage/myisammrg/myrg_static.c | 2 +- storage/myisammrg/myrg_update.c | 2 +- storage/myisammrg/myrg_write.c | 2 +- storage/ndb/Makefile.am | 2 +- storage/ndb/config/common.mk.am | 2 +- storage/ndb/config/make-win-dsw.sh | 2 +- storage/ndb/config/type_kernel.mk.am | 2 +- storage/ndb/config/type_mgmapiclient.mk.am | 2 +- storage/ndb/config/type_ndbapi.mk.am | 2 +- storage/ndb/config/type_ndbapiclient.mk.am | 2 +- storage/ndb/config/type_ndbapitest.mk.am | 2 +- storage/ndb/config/type_ndbapitools.mk.am | 2 +- storage/ndb/config/type_util.mk.am | 2 +- storage/ndb/config/win-includes | 2 +- storage/ndb/config/win-lib.am | 2 +- storage/ndb/config/win-libraries | 2 +- storage/ndb/config/win-name | 2 +- storage/ndb/config/win-prg.am | 2 +- storage/ndb/config/win-sources | 2 +- storage/ndb/docs/Makefile.am | 2 +- storage/ndb/docs/doxygen/Doxyfile.mgmapi | 2 +- storage/ndb/docs/doxygen/Doxyfile.ndb | 2 +- storage/ndb/docs/doxygen/Doxyfile.ndbapi | 2 +- storage/ndb/docs/doxygen/Doxyfile.odbc | 2 +- storage/ndb/docs/doxygen/postdoxy.pl | 2 +- storage/ndb/docs/doxygen/predoxy.pl | 2 +- storage/ndb/include/Makefile.am | 2 +- storage/ndb/include/debugger/DebuggerNames.hpp | 2 +- storage/ndb/include/debugger/EventLogger.hpp | 2 +- storage/ndb/include/debugger/GrepError.hpp | 2 +- .../include/debugger/SignalLoggerManager.hpp | 2 +- storage/ndb/include/editline/editline.h | 2 +- .../ndb/include/kernel/AttributeDescriptor.hpp | 2 +- storage/ndb/include/kernel/AttributeHeader.hpp | 2 +- storage/ndb/include/kernel/AttributeList.hpp | 2 +- storage/ndb/include/kernel/BlockNumbers.h | 2 +- .../ndb/include/kernel/GlobalSignalNumbers.h | 2 +- storage/ndb/include/kernel/GrepEvent.hpp | 2 +- storage/ndb/include/kernel/Interpreter.hpp | 2 +- storage/ndb/include/kernel/LogLevel.hpp | 2 +- storage/ndb/include/kernel/NodeBitmask.hpp | 2 +- storage/ndb/include/kernel/NodeInfo.hpp | 2 +- storage/ndb/include/kernel/NodeState.hpp | 2 +- storage/ndb/include/kernel/RefConvert.hpp | 2 +- .../include/kernel/kernel_config_parameters.h | 2 +- storage/ndb/include/kernel/kernel_types.h | 2 +- storage/ndb/include/kernel/ndb_limits.h | 2 +- .../ndb/include/kernel/signaldata/AbortAll.hpp | 2 +- .../ndb/include/kernel/signaldata/AccFrag.hpp | 2 +- .../ndb/include/kernel/signaldata/AccLock.hpp | 2 +- .../ndb/include/kernel/signaldata/AccScan.hpp | 2 +- .../kernel/signaldata/AccSizeAltReq.hpp | 2 +- .../include/kernel/signaldata/AllocNodeId.hpp | 2 +- .../include/kernel/signaldata/AlterIndx.hpp | 2 +- .../ndb/include/kernel/signaldata/AlterTab.hpp | 2 +- .../include/kernel/signaldata/AlterTable.hpp | 2 +- .../include/kernel/signaldata/AlterTrig.hpp | 2 +- .../include/kernel/signaldata/ApiBroadcast.hpp | 2 +- .../kernel/signaldata/ApiRegSignalData.hpp | 2 +- .../include/kernel/signaldata/ApiVersion.hpp | 2 +- .../kernel/signaldata/ArbitSignalData.hpp | 2 +- .../ndb/include/kernel/signaldata/AttrInfo.hpp | 2 +- .../kernel/signaldata/BackupContinueB.hpp | 2 +- .../include/kernel/signaldata/BackupImpl.hpp | 2 +- .../kernel/signaldata/BackupSignalData.hpp | 2 +- .../kernel/signaldata/BlockCommitOrd.hpp | 2 +- .../include/kernel/signaldata/BuildIndx.hpp | 2 +- .../kernel/signaldata/CheckNodeGroups.hpp | 2 +- .../kernel/signaldata/CloseComReqConf.hpp | 2 +- .../ndb/include/kernel/signaldata/CmInit.hpp | 2 +- .../kernel/signaldata/CmRegSignalData.hpp | 2 +- .../include/kernel/signaldata/CmvmiCfgConf.hpp | 2 +- .../kernel/signaldata/CntrMasterConf.hpp | 2 +- .../kernel/signaldata/CntrMasterReq.hpp | 2 +- .../include/kernel/signaldata/CntrStart.hpp | 2 +- .../kernel/signaldata/ConfigParamId.hpp | 2 +- .../kernel/signaldata/ContinueFragmented.hpp | 2 +- .../include/kernel/signaldata/CopyActive.hpp | 2 +- .../ndb/include/kernel/signaldata/CopyFrag.hpp | 2 +- .../include/kernel/signaldata/CopyGCIReq.hpp | 2 +- .../include/kernel/signaldata/CreateEvnt.hpp | 2 +- .../kernel/signaldata/CreateFilegroup.hpp | 2 +- .../kernel/signaldata/CreateFilegroupImpl.hpp | 2 +- .../include/kernel/signaldata/CreateFrag.hpp | 2 +- .../kernel/signaldata/CreateFragmentation.hpp | 2 +- .../include/kernel/signaldata/CreateIndx.hpp | 2 +- .../include/kernel/signaldata/CreateObj.hpp | 2 +- .../include/kernel/signaldata/CreateTab.hpp | 2 +- .../include/kernel/signaldata/CreateTable.hpp | 2 +- .../include/kernel/signaldata/CreateTrig.hpp | 2 +- .../ndb/include/kernel/signaldata/DiAddTab.hpp | 2 +- .../include/kernel/signaldata/DiGetNodes.hpp | 2 +- .../ndb/include/kernel/signaldata/DictLock.hpp | 2 +- .../include/kernel/signaldata/DictObjOp.hpp | 2 +- .../kernel/signaldata/DictSchemaInfo.hpp | 2 +- .../kernel/signaldata/DictSizeAltReq.hpp | 2 +- .../include/kernel/signaldata/DictStart.hpp | 2 +- .../include/kernel/signaldata/DictTabInfo.hpp | 2 +- .../include/kernel/signaldata/DihAddFrag.hpp | 2 +- .../include/kernel/signaldata/DihContinueB.hpp | 2 +- .../include/kernel/signaldata/DihFragCount.hpp | 2 +- .../kernel/signaldata/DihSizeAltReq.hpp | 2 +- .../include/kernel/signaldata/DihStartTab.hpp | 2 +- .../kernel/signaldata/DihSwitchReplica.hpp | 2 +- .../kernel/signaldata/DisconnectRep.hpp | 2 +- .../kernel/signaldata/DropFilegroup.hpp | 2 +- .../kernel/signaldata/DropFilegroupImpl.hpp | 2 +- .../ndb/include/kernel/signaldata/DropIndx.hpp | 2 +- .../ndb/include/kernel/signaldata/DropObj.hpp | 2 +- .../ndb/include/kernel/signaldata/DropTab.hpp | 2 +- .../include/kernel/signaldata/DropTabFile.hpp | 2 +- .../include/kernel/signaldata/DropTable.hpp | 2 +- .../ndb/include/kernel/signaldata/DropTrig.hpp | 2 +- .../include/kernel/signaldata/DumpStateOrd.hpp | 2 +- .../ndb/include/kernel/signaldata/EmptyLcp.hpp | 2 +- .../ndb/include/kernel/signaldata/EndTo.hpp | 2 +- .../include/kernel/signaldata/EventReport.hpp | 2 +- .../kernel/signaldata/EventSubscribeReq.hpp | 2 +- .../include/kernel/signaldata/ExecFragReq.hpp | 2 +- .../ndb/include/kernel/signaldata/Extent.hpp | 2 +- .../ndb/include/kernel/signaldata/FailRep.hpp | 2 +- .../include/kernel/signaldata/FireTrigOrd.hpp | 2 +- .../include/kernel/signaldata/FsAppendReq.hpp | 2 +- .../include/kernel/signaldata/FsCloseReq.hpp | 2 +- .../ndb/include/kernel/signaldata/FsConf.hpp | 2 +- .../include/kernel/signaldata/FsOpenReq.hpp | 2 +- .../kernel/signaldata/FsReadWriteReq.hpp | 2 +- .../ndb/include/kernel/signaldata/FsRef.hpp | 2 +- .../include/kernel/signaldata/FsRemoveReq.hpp | 2 +- .../ndb/include/kernel/signaldata/GCPSave.hpp | 2 +- .../include/kernel/signaldata/GetTabInfo.hpp | 2 +- .../include/kernel/signaldata/GetTableId.hpp | 2 +- .../ndb/include/kernel/signaldata/GrepImpl.hpp | 2 +- .../include/kernel/signaldata/HotSpareRep.hpp | 2 +- .../include/kernel/signaldata/IndxAttrInfo.hpp | 2 +- .../include/kernel/signaldata/IndxKeyInfo.hpp | 2 +- .../signaldata/InvalidateNodeLCPConf.hpp | 2 +- .../kernel/signaldata/InvalidateNodeLCPReq.hpp | 2 +- .../ndb/include/kernel/signaldata/KeyInfo.hpp | 2 +- storage/ndb/include/kernel/signaldata/LCP.hpp | 2 +- .../kernel/signaldata/LgmanContinueB.hpp | 2 +- .../include/kernel/signaldata/ListTables.hpp | 2 +- .../ndb/include/kernel/signaldata/LqhFrag.hpp | 2 +- .../ndb/include/kernel/signaldata/LqhKey.hpp | 2 +- .../kernel/signaldata/LqhSizeAltReq.hpp | 2 +- .../include/kernel/signaldata/LqhTransConf.hpp | 2 +- .../kernel/signaldata/ManagementServer.hpp | 2 +- .../include/kernel/signaldata/MasterGCP.hpp | 2 +- .../include/kernel/signaldata/MasterLCP.hpp | 2 +- .../kernel/signaldata/NFCompleteRep.hpp | 2 +- .../ndb/include/kernel/signaldata/NdbSttor.hpp | 2 +- .../kernel/signaldata/NdbfsContinueB.hpp | 2 +- .../ndb/include/kernel/signaldata/NextScan.hpp | 2 +- .../include/kernel/signaldata/NodeFailRep.hpp | 2 +- .../kernel/signaldata/NodeStateSignalData.hpp | 2 +- .../include/kernel/signaldata/PackedSignal.hpp | 2 +- .../kernel/signaldata/PgmanContinueB.hpp | 2 +- .../include/kernel/signaldata/PrepDropTab.hpp | 2 +- .../kernel/signaldata/PrepFailReqRef.hpp | 2 +- .../include/kernel/signaldata/ReadConfig.hpp | 2 +- .../kernel/signaldata/ReadNodesConf.hpp | 2 +- .../include/kernel/signaldata/RelTabMem.hpp | 2 +- .../ndb/include/kernel/signaldata/RepImpl.hpp | 2 +- .../kernel/signaldata/RestoreContinueB.hpp | 2 +- .../include/kernel/signaldata/RestoreImpl.hpp | 2 +- .../include/kernel/signaldata/ResumeReq.hpp | 2 +- .../ndb/include/kernel/signaldata/RouteOrd.hpp | 2 +- .../ndb/include/kernel/signaldata/ScanFrag.hpp | 2 +- .../ndb/include/kernel/signaldata/ScanTab.hpp | 2 +- .../kernel/signaldata/SetLogLevelOrd.hpp | 2 +- .../include/kernel/signaldata/SetVarReq.hpp | 2 +- .../include/kernel/signaldata/SignalData.hpp | 2 +- .../kernel/signaldata/SignalDataPrint.hpp | 2 +- .../kernel/signaldata/SignalDroppedRep.hpp | 2 +- .../include/kernel/signaldata/SrFragidConf.hpp | 2 +- .../include/kernel/signaldata/StartFragReq.hpp | 2 +- .../include/kernel/signaldata/StartInfo.hpp | 2 +- .../ndb/include/kernel/signaldata/StartMe.hpp | 2 +- .../ndb/include/kernel/signaldata/StartOrd.hpp | 2 +- .../include/kernel/signaldata/StartPerm.hpp | 2 +- .../ndb/include/kernel/signaldata/StartRec.hpp | 2 +- .../ndb/include/kernel/signaldata/StartTo.hpp | 2 +- .../ndb/include/kernel/signaldata/StopMe.hpp | 2 +- .../ndb/include/kernel/signaldata/StopPerm.hpp | 2 +- .../ndb/include/kernel/signaldata/StopReq.hpp | 2 +- .../ndb/include/kernel/signaldata/SumaImpl.hpp | 2 +- .../include/kernel/signaldata/SystemError.hpp | 2 +- .../include/kernel/signaldata/TamperOrd.hpp | 2 +- .../ndb/include/kernel/signaldata/TcCommit.hpp | 2 +- .../include/kernel/signaldata/TcContinueB.hpp | 2 +- .../ndb/include/kernel/signaldata/TcHbRep.hpp | 2 +- .../ndb/include/kernel/signaldata/TcIndx.hpp | 2 +- .../include/kernel/signaldata/TcKeyConf.hpp | 2 +- .../kernel/signaldata/TcKeyFailConf.hpp | 2 +- .../ndb/include/kernel/signaldata/TcKeyRef.hpp | 2 +- .../ndb/include/kernel/signaldata/TcKeyReq.hpp | 2 +- .../kernel/signaldata/TcRollbackRep.hpp | 2 +- .../include/kernel/signaldata/TcSizeAltReq.hpp | 2 +- .../ndb/include/kernel/signaldata/TestOrd.hpp | 2 +- .../include/kernel/signaldata/TransIdAI.hpp | 2 +- .../include/kernel/signaldata/TrigAttrInfo.hpp | 2 +- .../kernel/signaldata/TsmanContinueB.hpp | 2 +- .../include/kernel/signaldata/TupCommit.hpp | 2 +- .../ndb/include/kernel/signaldata/TupFrag.hpp | 2 +- .../ndb/include/kernel/signaldata/TupKey.hpp | 2 +- .../kernel/signaldata/TupSizeAltReq.hpp | 2 +- .../ndb/include/kernel/signaldata/TuxBound.hpp | 2 +- .../include/kernel/signaldata/TuxContinueB.hpp | 2 +- .../ndb/include/kernel/signaldata/TuxMaint.hpp | 2 +- .../kernel/signaldata/TuxSizeAltReq.hpp | 2 +- .../ndb/include/kernel/signaldata/UpdateTo.hpp | 2 +- .../kernel/signaldata/UpgradeStartup.hpp | 2 +- .../include/kernel/signaldata/UtilDelete.hpp | 2 +- .../include/kernel/signaldata/UtilExecute.hpp | 2 +- .../ndb/include/kernel/signaldata/UtilLock.hpp | 2 +- .../include/kernel/signaldata/UtilPrepare.hpp | 2 +- .../include/kernel/signaldata/UtilRelease.hpp | 2 +- .../include/kernel/signaldata/UtilSequence.hpp | 2 +- .../ndb/include/kernel/signaldata/WaitGCP.hpp | 2 +- .../ndb/include/kernel/trigger_definitions.h | 2 +- .../ndb/include/logger/ConsoleLogHandler.hpp | 2 +- storage/ndb/include/logger/FileLogHandler.hpp | 2 +- storage/ndb/include/logger/LogHandler.hpp | 2 +- storage/ndb/include/logger/Logger.hpp | 2 +- storage/ndb/include/logger/SysLogHandler.hpp | 2 +- storage/ndb/include/mgmapi/mgmapi.h | 2 +- .../include/mgmapi/mgmapi_config_parameters.h | 2 +- .../mgmapi/mgmapi_config_parameters_debug.h | 2 +- storage/ndb/include/mgmapi/mgmapi_debug.h | 2 +- storage/ndb/include/mgmapi/mgmapi_error.h | 2 +- storage/ndb/include/mgmapi/ndb_logevent.h | 2 +- storage/ndb/include/mgmapi/ndbd_exit_codes.h | 2 +- .../ndb/include/mgmcommon/ConfigRetriever.hpp | 2 +- storage/ndb/include/mgmcommon/IPCConfig.hpp | 2 +- .../include/mgmcommon/MgmtErrorReporter.hpp | 2 +- storage/ndb/include/ndb_constants.h | 2 +- storage/ndb/include/ndb_global.h.in | 2 +- storage/ndb/include/ndb_init.h | 2 +- storage/ndb/include/ndb_net.h | 2 +- storage/ndb/include/ndb_types.h.in | 2 +- storage/ndb/include/ndb_version.h.in | 2 +- storage/ndb/include/ndbapi/Ndb.hpp | 2 +- storage/ndb/include/ndbapi/NdbApi.hpp | 2 +- storage/ndb/include/ndbapi/NdbBlob.hpp | 2 +- storage/ndb/include/ndbapi/NdbDictionary.hpp | 2 +- storage/ndb/include/ndbapi/NdbError.hpp | 2 +- .../ndb/include/ndbapi/NdbEventOperation.hpp | 2 +- .../ndb/include/ndbapi/NdbIndexOperation.hpp | 2 +- .../include/ndbapi/NdbIndexScanOperation.hpp | 2 +- storage/ndb/include/ndbapi/NdbIndexStat.hpp | 2 +- storage/ndb/include/ndbapi/NdbOperation.hpp | 2 +- storage/ndb/include/ndbapi/NdbPool.hpp | 2 +- storage/ndb/include/ndbapi/NdbRecAttr.hpp | 2 +- storage/ndb/include/ndbapi/NdbReceiver.hpp | 2 +- storage/ndb/include/ndbapi/NdbScanFilter.hpp | 2 +- .../ndb/include/ndbapi/NdbScanOperation.hpp | 2 +- storage/ndb/include/ndbapi/NdbTransaction.hpp | 2 +- .../include/ndbapi/ndb_cluster_connection.hpp | 2 +- storage/ndb/include/ndbapi/ndb_opt_defaults.h | 2 +- storage/ndb/include/ndbapi/ndbapi_limits.h | 2 +- storage/ndb/include/ndbapi/ndberror.h | 2 +- storage/ndb/include/newtonapi/dba.h | 2 +- storage/ndb/include/newtonapi/defs/pcn_types.h | 2 +- storage/ndb/include/portlib/NdbCondition.h | 2 +- storage/ndb/include/portlib/NdbConfig.h | 2 +- storage/ndb/include/portlib/NdbDaemon.h | 2 +- storage/ndb/include/portlib/NdbEnv.h | 2 +- storage/ndb/include/portlib/NdbHost.h | 2 +- storage/ndb/include/portlib/NdbMain.h | 2 +- storage/ndb/include/portlib/NdbMem.h | 2 +- storage/ndb/include/portlib/NdbMutex.h | 2 +- storage/ndb/include/portlib/NdbSleep.h | 2 +- storage/ndb/include/portlib/NdbTCP.h | 2 +- storage/ndb/include/portlib/NdbThread.h | 2 +- storage/ndb/include/portlib/NdbTick.h | 2 +- storage/ndb/include/portlib/PortDefs.h | 2 +- storage/ndb/include/portlib/prefetch.h | 2 +- .../transporter/TransporterCallback.hpp | 2 +- .../transporter/TransporterDefinitions.hpp | 2 +- .../transporter/TransporterRegistry.hpp | 2 +- storage/ndb/include/util/BaseString.hpp | 2 +- storage/ndb/include/util/Bitmask.hpp | 2 +- storage/ndb/include/util/ConfigValues.hpp | 2 +- storage/ndb/include/util/File.hpp | 2 +- storage/ndb/include/util/InputStream.hpp | 2 +- storage/ndb/include/util/NdbAutoPtr.hpp | 2 +- storage/ndb/include/util/NdbOut.hpp | 2 +- storage/ndb/include/util/NdbSqlUtil.hpp | 2 +- storage/ndb/include/util/OutputStream.hpp | 2 +- storage/ndb/include/util/Parser.hpp | 2 +- storage/ndb/include/util/Properties.hpp | 2 +- storage/ndb/include/util/SimpleProperties.hpp | 2 +- .../ndb/include/util/SocketAuthenticator.hpp | 2 +- storage/ndb/include/util/SocketClient.hpp | 2 +- storage/ndb/include/util/SocketServer.hpp | 2 +- storage/ndb/include/util/UtilBuffer.hpp | 2 +- storage/ndb/include/util/Vector.hpp | 2 +- .../ndb/include/util/basestring_vsnprintf.h | 2 +- storage/ndb/include/util/md5_hash.hpp | 2 +- storage/ndb/include/util/ndb_opts.h | 2 +- storage/ndb/include/util/ndb_rand.h | 2 +- storage/ndb/include/util/random.h | 2 +- storage/ndb/include/util/socket_io.h | 2 +- storage/ndb/include/util/uucode.h | 2 +- storage/ndb/include/util/version.h | 2 +- .../ndbapi-examples/mgmapi_logevent/main.cpp | 2 +- .../ndbapi-examples/mgmapi_logevent2/main.cpp | 2 +- .../ndbapi_async/ndbapi_async.cpp | 2 +- .../ndbapi_async1/ndbapi_async1.cpp | 2 +- .../ndbapi_event/ndbapi_event.cpp | 2 +- .../ndbapi_retries/ndbapi_retries.cpp | 2 +- .../ndbapi_scan/ndbapi_scan.cpp | 2 +- .../ndbapi_simple/ndbapi_simple.cpp | 2 +- .../ndbapi_simple_dual/main.cpp | 2 +- .../ndbapi_simple_index/main.cpp | 2 +- storage/ndb/src/Makefile.am | 2 +- storage/ndb/src/common/Makefile.am | 2 +- storage/ndb/src/common/debugger/BlockNames.cpp | 2 +- .../ndb/src/common/debugger/DebuggerNames.cpp | 2 +- .../ndb/src/common/debugger/EventLogger.cpp | 2 +- storage/ndb/src/common/debugger/GrepError.cpp | 2 +- storage/ndb/src/common/debugger/Makefile.am | 2 +- .../common/debugger/SignalLoggerManager.cpp | 2 +- .../src/common/debugger/signaldata/AccLock.cpp | 2 +- .../common/debugger/signaldata/AlterIndx.cpp | 2 +- .../common/debugger/signaldata/AlterTab.cpp | 2 +- .../common/debugger/signaldata/AlterTable.cpp | 2 +- .../common/debugger/signaldata/AlterTrig.cpp | 2 +- .../common/debugger/signaldata/BackupImpl.cpp | 2 +- .../debugger/signaldata/BackupSignalData.cpp | 2 +- .../debugger/signaldata/CloseComReqConf.cpp | 2 +- .../common/debugger/signaldata/CntrStart.cpp | 2 +- .../common/debugger/signaldata/ContinueB.cpp | 2 +- .../src/common/debugger/signaldata/CopyGCI.cpp | 2 +- .../common/debugger/signaldata/CreateEvnt.cpp | 2 +- .../signaldata/CreateFragmentation.cpp | 2 +- .../common/debugger/signaldata/CreateIndx.cpp | 2 +- .../common/debugger/signaldata/CreateTrig.cpp | 2 +- .../common/debugger/signaldata/DictTabInfo.cpp | 2 +- .../debugger/signaldata/DihContinueB.cpp | 2 +- .../signaldata/DihSwitchReplicaReq.cpp | 2 +- .../debugger/signaldata/DisconnectRep.cpp | 2 +- .../common/debugger/signaldata/DropIndx.cpp | 2 +- .../src/common/debugger/signaldata/DropTab.cpp | 2 +- .../common/debugger/signaldata/DropTrig.cpp | 2 +- .../src/common/debugger/signaldata/FailRep.cpp | 2 +- .../common/debugger/signaldata/FireTrigOrd.cpp | 2 +- .../common/debugger/signaldata/FsAppendReq.cpp | 2 +- .../common/debugger/signaldata/FsCloseReq.cpp | 2 +- .../src/common/debugger/signaldata/FsConf.cpp | 2 +- .../common/debugger/signaldata/FsOpenReq.cpp | 2 +- .../debugger/signaldata/FsReadWriteReq.cpp | 2 +- .../src/common/debugger/signaldata/FsRef.cpp | 2 +- .../src/common/debugger/signaldata/GCPSave.cpp | 2 +- .../debugger/signaldata/IndxAttrInfo.cpp | 2 +- .../common/debugger/signaldata/IndxKeyInfo.cpp | 2 +- .../ndb/src/common/debugger/signaldata/LCP.cpp | 2 +- .../src/common/debugger/signaldata/LqhFrag.cpp | 2 +- .../src/common/debugger/signaldata/LqhKey.cpp | 2 +- .../common/debugger/signaldata/LqhTrans.cpp | 2 +- .../src/common/debugger/signaldata/Makefile.am | 2 +- .../common/debugger/signaldata/MasterLCP.cpp | 2 +- .../debugger/signaldata/NFCompleteRep.cpp | 2 +- .../common/debugger/signaldata/NdbSttor.cpp | 2 +- .../debugger/signaldata/NdbfsContinueB.cpp | 2 +- .../debugger/signaldata/PackedSignal.cpp | 2 +- .../common/debugger/signaldata/PrepDropTab.cpp | 2 +- .../debugger/signaldata/PrepFailReqRef.cpp | 2 +- .../debugger/signaldata/ReadNodesConf.cpp | 2 +- .../common/debugger/signaldata/ScanFrag.cpp | 2 +- .../src/common/debugger/signaldata/ScanTab.cpp | 2 +- .../debugger/signaldata/SignalDataPrint.cpp | 2 +- .../debugger/signaldata/SignalDroppedRep.cpp | 2 +- .../common/debugger/signaldata/SignalNames.cpp | 2 +- .../common/debugger/signaldata/StartRec.cpp | 2 +- .../common/debugger/signaldata/SumaImpl.cpp | 2 +- .../common/debugger/signaldata/SystemError.cpp | 2 +- .../src/common/debugger/signaldata/TcIndx.cpp | 2 +- .../common/debugger/signaldata/TcKeyConf.cpp | 2 +- .../common/debugger/signaldata/TcKeyRef.cpp | 2 +- .../common/debugger/signaldata/TcKeyReq.cpp | 2 +- .../debugger/signaldata/TcRollbackRep.cpp | 2 +- .../debugger/signaldata/TrigAttrInfo.cpp | 2 +- .../common/debugger/signaldata/TupCommit.cpp | 2 +- .../src/common/debugger/signaldata/TupKey.cpp | 2 +- .../common/debugger/signaldata/TuxMaint.cpp | 2 +- .../common/debugger/signaldata/UtilDelete.cpp | 2 +- .../common/debugger/signaldata/UtilExecute.cpp | 2 +- .../common/debugger/signaldata/UtilLock.cpp | 2 +- .../common/debugger/signaldata/UtilPrepare.cpp | 2 +- .../debugger/signaldata/UtilSequence.cpp | 2 +- .../src/common/debugger/signaldata/print.awk | 2 +- .../src/common/logger/ConsoleLogHandler.cpp | 2 +- .../ndb/src/common/logger/FileLogHandler.cpp | 2 +- storage/ndb/src/common/logger/LogHandler.cpp | 2 +- .../ndb/src/common/logger/LogHandlerList.cpp | 2 +- .../ndb/src/common/logger/LogHandlerList.hpp | 2 +- storage/ndb/src/common/logger/Logger.cpp | 2 +- storage/ndb/src/common/logger/Makefile.am | 2 +- .../ndb/src/common/logger/SysLogHandler.cpp | 2 +- .../logger/listtest/LogHandlerListUnitTest.cpp | 2 +- .../logger/listtest/LogHandlerListUnitTest.hpp | 2 +- .../logger/loggertest/LoggerUnitTest.cpp | 2 +- .../logger/loggertest/LoggerUnitTest.hpp | 2 +- .../src/common/mgmcommon/ConfigRetriever.cpp | 2 +- storage/ndb/src/common/mgmcommon/IPCConfig.cpp | 2 +- storage/ndb/src/common/mgmcommon/Makefile.am | 2 +- .../mgmcommon/printConfig/printConfig.cpp | 2 +- storage/ndb/src/common/portlib/Makefile.am | 2 +- storage/ndb/src/common/portlib/NdbCondition.c | 2 +- storage/ndb/src/common/portlib/NdbConfig.c | 2 +- storage/ndb/src/common/portlib/NdbDaemon.c | 2 +- storage/ndb/src/common/portlib/NdbEnv.c | 2 +- storage/ndb/src/common/portlib/NdbHost.c | 2 +- storage/ndb/src/common/portlib/NdbMem.c | 2 +- storage/ndb/src/common/portlib/NdbMutex.c | 2 +- .../ndb/src/common/portlib/NdbPortLibTest.cpp | 2 +- storage/ndb/src/common/portlib/NdbSleep.c | 2 +- storage/ndb/src/common/portlib/NdbTCP.cpp | 2 +- storage/ndb/src/common/portlib/NdbThread.c | 2 +- storage/ndb/src/common/portlib/NdbTick.c | 2 +- storage/ndb/src/common/portlib/memtest.c | 2 +- storage/ndb/src/common/portlib/mmstest.cpp | 2 +- storage/ndb/src/common/portlib/munmaptest.cpp | 2 +- .../src/common/portlib/win32/NdbCondition.c | 2 +- .../ndb/src/common/portlib/win32/NdbDaemon.c | 2 +- storage/ndb/src/common/portlib/win32/NdbEnv.c | 2 +- storage/ndb/src/common/portlib/win32/NdbHost.c | 2 +- storage/ndb/src/common/portlib/win32/NdbMem.c | 2 +- .../ndb/src/common/portlib/win32/NdbMutex.c | 2 +- .../ndb/src/common/portlib/win32/NdbSleep.c | 2 +- storage/ndb/src/common/portlib/win32/NdbTCP.c | 2 +- .../ndb/src/common/portlib/win32/NdbThread.c | 2 +- storage/ndb/src/common/portlib/win32/NdbTick.c | 2 +- storage/ndb/src/common/transporter/Makefile.am | 2 +- storage/ndb/src/common/transporter/Packer.cpp | 2 +- storage/ndb/src/common/transporter/Packer.hpp | 2 +- .../src/common/transporter/SCI_Transporter.cpp | 2 +- .../src/common/transporter/SCI_Transporter.hpp | 2 +- .../ndb/src/common/transporter/SHM_Buffer.hpp | 2 +- .../src/common/transporter/SHM_Transporter.cpp | 2 +- .../src/common/transporter/SHM_Transporter.hpp | 2 +- .../transporter/SHM_Transporter.unix.cpp | 2 +- .../transporter/SHM_Transporter.win32.cpp | 2 +- .../ndb/src/common/transporter/SendBuffer.cpp | 2 +- .../ndb/src/common/transporter/SendBuffer.hpp | 2 +- .../src/common/transporter/TCP_Transporter.cpp | 2 +- .../src/common/transporter/TCP_Transporter.hpp | 2 +- .../ndb/src/common/transporter/Transporter.cpp | 2 +- .../ndb/src/common/transporter/Transporter.hpp | 2 +- .../TransporterInternalDefinitions.hpp | 2 +- .../common/transporter/TransporterRegistry.cpp | 2 +- .../basictest/basicTransporterTest.cpp | 2 +- storage/ndb/src/common/transporter/buddy.cpp | 2 +- storage/ndb/src/common/transporter/buddy.hpp | 2 +- .../transporter/failoverSCI/failoverSCI.cpp | 2 +- .../perftest/perfTransporterTest.cpp | 2 +- .../transporter/priotest/prioSCI/prioSCI.cpp | 2 +- .../transporter/priotest/prioSHM/prioSHM.cpp | 2 +- .../transporter/priotest/prioTCP/prioTCP.cpp | 2 +- .../priotest/prioTransporterTest.cpp | 2 +- .../priotest/prioTransporterTest.hpp | 2 +- storage/ndb/src/common/util/BaseString.cpp | 2 +- storage/ndb/src/common/util/Bitmask.cpp | 2 +- storage/ndb/src/common/util/ConfigValues.cpp | 2 +- storage/ndb/src/common/util/File.cpp | 2 +- storage/ndb/src/common/util/InputStream.cpp | 2 +- storage/ndb/src/common/util/Makefile.am | 2 +- storage/ndb/src/common/util/NdbOut.cpp | 2 +- storage/ndb/src/common/util/NdbSqlUtil.cpp | 2 +- storage/ndb/src/common/util/OutputStream.cpp | 2 +- storage/ndb/src/common/util/Parser.cpp | 2 +- storage/ndb/src/common/util/Properties.cpp | 2 +- .../ndb/src/common/util/SimpleProperties.cpp | 2 +- .../src/common/util/SocketAuthenticator.cpp | 2 +- storage/ndb/src/common/util/SocketClient.cpp | 2 +- storage/ndb/src/common/util/SocketServer.cpp | 2 +- .../ndb/src/common/util/basestring_vsnprintf.c | 2 +- .../src/common/util/filetest/FileUnitTest.cpp | 2 +- .../src/common/util/filetest/FileUnitTest.hpp | 2 +- storage/ndb/src/common/util/md5_hash.cpp | 2 +- storage/ndb/src/common/util/ndb_init.c | 2 +- storage/ndb/src/common/util/ndb_rand.c | 2 +- storage/ndb/src/common/util/new.cpp | 2 +- storage/ndb/src/common/util/random.c | 2 +- storage/ndb/src/common/util/socket_io.cpp | 2 +- storage/ndb/src/common/util/strdup.c | 2 +- .../util/testConfigValues/testConfigValues.cpp | 2 +- .../util/testProperties/testProperties.cpp | 2 +- .../util/testSimpleProperties/sp_test.cpp | 2 +- storage/ndb/src/common/util/uucode.c | 2 +- storage/ndb/src/common/util/version.c | 2 +- storage/ndb/src/cw/Makefile.am | 2 +- storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp | 2 +- storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h | 2 +- .../ndb/src/cw/cpcc-win32/C++/NdbControls.cpp | 2 +- storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp | 2 +- storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h | 2 +- storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp | 2 +- storage/ndb/src/cw/cpcc-win32/C++/TreeView.h | 2 +- storage/ndb/src/cw/cpcc-win32/C++/resource.h | 2 +- .../ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs | 2 +- .../ndb/src/cw/cpcc-win32/csharp/Computer.cs | 2 +- .../cw/cpcc-win32/csharp/ComputerAddDialog.cs | 2 +- .../cpcc-win32/csharp/ComputerRemoveDialog.cs | 2 +- .../ndb/src/cw/cpcc-win32/csharp/Database.cs | 2 +- .../src/cw/cpcc-win32/csharp/PanelWizard.cs | 2 +- .../ndb/src/cw/cpcc-win32/csharp/Process.cs | 2 +- .../cpcc-win32/csharp/ProcessDefineDialog.cs | 2 +- .../cpcc-win32/csharp/fileaccess/FileMgmt.cs | 2 +- .../csharp/simpleparser/SimpleCPCParser.cs | 2 +- .../cpcc-win32/csharp/socketcomm/SocketComm.cs | 2 +- .../csharp/socketcomm/myTcpClient.cs | 2 +- .../cw/cpcc-win32/csharp/startDatabaseDlg.cs | 2 +- .../csharp/telnetclient/telnetClient.cs | 2 +- storage/ndb/src/cw/cpcd/APIService.cpp | 2 +- storage/ndb/src/cw/cpcd/APIService.hpp | 2 +- storage/ndb/src/cw/cpcd/CPCD.cpp | 2 +- storage/ndb/src/cw/cpcd/CPCD.hpp | 2 +- storage/ndb/src/cw/cpcd/Makefile.am | 2 +- storage/ndb/src/cw/cpcd/Monitor.cpp | 2 +- storage/ndb/src/cw/cpcd/Process.cpp | 2 +- storage/ndb/src/cw/cpcd/common.cpp | 2 +- storage/ndb/src/cw/cpcd/common.hpp | 2 +- storage/ndb/src/cw/cpcd/main.cpp | 2 +- .../cw/test/socketclient/socketClientTest.cpp | 2 +- storage/ndb/src/cw/util/ClientInterface.cpp | 2 +- storage/ndb/src/cw/util/ClientInterface.hpp | 2 +- storage/ndb/src/cw/util/SocketRegistry.cpp | 2 +- storage/ndb/src/cw/util/SocketRegistry.hpp | 2 +- storage/ndb/src/cw/util/SocketService.cpp | 2 +- storage/ndb/src/cw/util/SocketService.hpp | 2 +- storage/ndb/src/kernel/Makefile.am | 2 +- storage/ndb/src/kernel/SimBlockList.cpp | 2 +- storage/ndb/src/kernel/blocks/Makefile.am | 2 +- .../ndb/src/kernel/blocks/backup/Backup.cpp | 2 +- .../ndb/src/kernel/blocks/backup/Backup.hpp | 2 +- .../src/kernel/blocks/backup/BackupFormat.hpp | 2 +- .../src/kernel/blocks/backup/BackupInit.cpp | 2 +- .../ndb/src/kernel/blocks/backup/FsBuffer.hpp | 2 +- .../ndb/src/kernel/blocks/backup/Makefile.am | 2 +- storage/ndb/src/kernel/blocks/backup/read.cpp | 2 +- storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp | 2 +- storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp | 2 +- storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp | 2 +- .../ndb/src/kernel/blocks/dbacc/DbaccInit.cpp | 2 +- .../ndb/src/kernel/blocks/dbacc/DbaccMain.cpp | 2 +- .../ndb/src/kernel/blocks/dbdict/Dbdict.cpp | 2 +- .../ndb/src/kernel/blocks/dbdict/Dbdict.hpp | 2 +- .../ndb/src/kernel/blocks/dbdict/Makefile.am | 2 +- .../kernel/blocks/dbdict/Master_AddTable.sfl | 2 +- .../src/kernel/blocks/dbdict/SchemaFile.hpp | 2 +- .../kernel/blocks/dbdict/Slave_AddTable.sfl | 2 +- .../kernel/blocks/dbdict/printSchemaFile.cpp | 2 +- storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp | 2 +- .../ndb/src/kernel/blocks/dbdih/DbdihInit.cpp | 2 +- .../ndb/src/kernel/blocks/dbdih/DbdihMain.cpp | 2 +- .../ndb/src/kernel/blocks/dbdih/Makefile.am | 2 +- .../ndb/src/kernel/blocks/dbdih/Sysfile.hpp | 2 +- .../src/kernel/blocks/dbdih/printSysfile.cpp | 2 +- .../blocks/dbdih/printSysfile/printSysfile.cpp | 2 +- storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp | 2 +- .../ndb/src/kernel/blocks/dblqh/DblqhInit.cpp | 2 +- .../ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 2 +- .../ndb/src/kernel/blocks/dblqh/Makefile.am | 2 +- .../blocks/dblqh/redoLogReader/reader.cpp | 2 +- .../blocks/dblqh/redoLogReader/records.cpp | 2 +- .../blocks/dblqh/redoLogReader/records.hpp | 2 +- storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp | 2 +- .../ndb/src/kernel/blocks/dbtc/DbtcInit.cpp | 2 +- .../ndb/src/kernel/blocks/dbtc/DbtcMain.cpp | 2 +- .../kernel/blocks/dbtup/AttributeOffset.hpp | 2 +- storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp | 2 +- .../ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupBuffer.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupCommit.cpp | 2 +- .../ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupExecQuery.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupFixAlloc.cpp | 2 +- .../ndb/src/kernel/blocks/dbtup/DbtupGen.cpp | 2 +- .../ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp | 2 +- .../ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupPagMan.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupPageMap.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupRoutines.cpp | 2 +- .../ndb/src/kernel/blocks/dbtup/DbtupScan.cpp | 2 +- .../kernel/blocks/dbtup/DbtupStoredProcDef.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupTabDesMan.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupTrigger.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupVarAlloc.cpp | 2 +- .../ndb/src/kernel/blocks/dbtup/Makefile.am | 2 +- .../src/kernel/blocks/dbtup/Undo_buffer.cpp | 2 +- .../src/kernel/blocks/dbtup/Undo_buffer.hpp | 2 +- .../src/kernel/blocks/dbtup/test_varpage.cpp | 2 +- .../ndb/src/kernel/blocks/dbtup/tuppage.cpp | 2 +- .../ndb/src/kernel/blocks/dbtup/tuppage.hpp | 2 +- storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp | 2 +- .../src/kernel/blocks/dbtux/DbtuxSearch.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp | 2 +- .../ndb/src/kernel/blocks/dbutil/DbUtil.cpp | 2 +- .../ndb/src/kernel/blocks/dbutil/DbUtil.hpp | 2 +- storage/ndb/src/kernel/blocks/diskpage.cpp | 2 +- storage/ndb/src/kernel/blocks/diskpage.hpp | 2 +- storage/ndb/src/kernel/blocks/lgman.cpp | 2 +- storage/ndb/src/kernel/blocks/lgman.hpp | 2 +- storage/ndb/src/kernel/blocks/mutexes.hpp | 2 +- .../ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp | 2 +- .../src/kernel/blocks/ndbcntr/NdbcntrInit.cpp | 2 +- .../src/kernel/blocks/ndbcntr/NdbcntrMain.cpp | 2 +- .../kernel/blocks/ndbcntr/NdbcntrSysTable.cpp | 2 +- .../ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp | 2 +- .../ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp | 2 +- .../ndbfs/AsyncFileTest/AsyncFileTest.cpp | 2 +- .../src/kernel/blocks/ndbfs/CircularIndex.cpp | 2 +- .../src/kernel/blocks/ndbfs/CircularIndex.hpp | 2 +- .../ndb/src/kernel/blocks/ndbfs/Filename.cpp | 2 +- .../ndb/src/kernel/blocks/ndbfs/Filename.hpp | 2 +- .../src/kernel/blocks/ndbfs/MemoryChannel.cpp | 2 +- .../src/kernel/blocks/ndbfs/MemoryChannel.hpp | 2 +- .../MemoryChannelTest/MemoryChannelTest.cpp | 2 +- storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp | 2 +- storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp | 2 +- .../ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp | 2 +- storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp | 2 +- storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp | 2 +- storage/ndb/src/kernel/blocks/pgman.cpp | 2 +- storage/ndb/src/kernel/blocks/pgman.hpp | 2 +- storage/ndb/src/kernel/blocks/print_file.cpp | 2 +- storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp | 2 +- .../ndb/src/kernel/blocks/qmgr/QmgrInit.cpp | 2 +- .../ndb/src/kernel/blocks/qmgr/QmgrMain.cpp | 2 +- storage/ndb/src/kernel/blocks/qmgr/timer.hpp | 2 +- storage/ndb/src/kernel/blocks/record_types.hpp | 2 +- storage/ndb/src/kernel/blocks/restore.cpp | 2 +- storage/ndb/src/kernel/blocks/restore.hpp | 2 +- storage/ndb/src/kernel/blocks/suma/Suma.cpp | 2 +- storage/ndb/src/kernel/blocks/suma/Suma.hpp | 2 +- .../ndb/src/kernel/blocks/suma/SumaInit.cpp | 2 +- storage/ndb/src/kernel/blocks/trix/Trix.cpp | 2 +- storage/ndb/src/kernel/blocks/trix/Trix.hpp | 2 +- storage/ndb/src/kernel/blocks/tsman.cpp | 2 +- storage/ndb/src/kernel/blocks/tsman.hpp | 2 +- .../src/kernel/error/ErrorHandlingMacros.hpp | 2 +- storage/ndb/src/kernel/error/ErrorReporter.cpp | 2 +- storage/ndb/src/kernel/error/ErrorReporter.hpp | 2 +- storage/ndb/src/kernel/error/Makefile.am | 2 +- storage/ndb/src/kernel/error/TimeModule.cpp | 2 +- storage/ndb/src/kernel/error/TimeModule.hpp | 2 +- storage/ndb/src/kernel/error/ndbd_exit_codes.c | 2 +- storage/ndb/src/kernel/main.cpp | 2 +- storage/ndb/src/kernel/vm/Array.hpp | 2 +- storage/ndb/src/kernel/vm/ArrayPool.hpp | 2 +- storage/ndb/src/kernel/vm/CArray.hpp | 2 +- storage/ndb/src/kernel/vm/Callback.hpp | 2 +- .../ndb/src/kernel/vm/ClusterConfiguration.cpp | 2 +- .../ndb/src/kernel/vm/ClusterConfiguration.hpp | 2 +- storage/ndb/src/kernel/vm/Configuration.cpp | 2 +- storage/ndb/src/kernel/vm/Configuration.hpp | 2 +- storage/ndb/src/kernel/vm/DLCFifoList.hpp | 2 +- storage/ndb/src/kernel/vm/DLCHashTable.hpp | 2 +- storage/ndb/src/kernel/vm/DLFifoList.hpp | 2 +- storage/ndb/src/kernel/vm/DLHashTable.hpp | 2 +- storage/ndb/src/kernel/vm/DLHashTable2.hpp | 2 +- storage/ndb/src/kernel/vm/DLList.hpp | 2 +- storage/ndb/src/kernel/vm/DataBuffer.hpp | 2 +- storage/ndb/src/kernel/vm/DynArr256.cpp | 2 +- storage/ndb/src/kernel/vm/DynArr256.hpp | 2 +- storage/ndb/src/kernel/vm/Emulator.cpp | 2 +- storage/ndb/src/kernel/vm/Emulator.hpp | 2 +- storage/ndb/src/kernel/vm/FastScheduler.cpp | 2 +- storage/ndb/src/kernel/vm/FastScheduler.hpp | 2 +- storage/ndb/src/kernel/vm/GlobalData.hpp | 2 +- storage/ndb/src/kernel/vm/KeyDescriptor.hpp | 2 +- storage/ndb/src/kernel/vm/KeyTable.hpp | 2 +- storage/ndb/src/kernel/vm/KeyTable2.hpp | 2 +- storage/ndb/src/kernel/vm/KeyTable2Ref.hpp | 2 +- storage/ndb/src/kernel/vm/LinearPool.hpp | 2 +- storage/ndb/src/kernel/vm/LongSignal.hpp | 2 +- storage/ndb/src/kernel/vm/Makefile.am | 2 +- storage/ndb/src/kernel/vm/Mutex.cpp | 2 +- storage/ndb/src/kernel/vm/Mutex.hpp | 2 +- storage/ndb/src/kernel/vm/NdbdSuperPool.cpp | 2 +- storage/ndb/src/kernel/vm/NdbdSuperPool.hpp | 2 +- storage/ndb/src/kernel/vm/Pool.cpp | 2 +- storage/ndb/src/kernel/vm/Pool.hpp | 2 +- storage/ndb/src/kernel/vm/Prio.hpp | 2 +- storage/ndb/src/kernel/vm/RWPool.cpp | 2 +- storage/ndb/src/kernel/vm/RWPool.hpp | 2 +- storage/ndb/src/kernel/vm/RequestTracker.hpp | 2 +- storage/ndb/src/kernel/vm/Rope.cpp | 2 +- storage/ndb/src/kernel/vm/Rope.hpp | 2 +- storage/ndb/src/kernel/vm/SLFifoList.hpp | 2 +- storage/ndb/src/kernel/vm/SLList.hpp | 2 +- storage/ndb/src/kernel/vm/SafeCounter.cpp | 2 +- storage/ndb/src/kernel/vm/SafeCounter.hpp | 2 +- storage/ndb/src/kernel/vm/SectionReader.cpp | 2 +- storage/ndb/src/kernel/vm/SectionReader.hpp | 2 +- storage/ndb/src/kernel/vm/SignalCounter.hpp | 2 +- storage/ndb/src/kernel/vm/SimBlockList.hpp | 2 +- .../src/kernel/vm/SimplePropertiesSection.cpp | 2 +- storage/ndb/src/kernel/vm/SimulatedBlock.cpp | 2 +- storage/ndb/src/kernel/vm/SimulatedBlock.hpp | 2 +- storage/ndb/src/kernel/vm/SuperPool.cpp | 2 +- storage/ndb/src/kernel/vm/SuperPool.hpp | 2 +- storage/ndb/src/kernel/vm/ThreadConfig.cpp | 2 +- storage/ndb/src/kernel/vm/ThreadConfig.hpp | 2 +- storage/ndb/src/kernel/vm/TimeQueue.cpp | 2 +- storage/ndb/src/kernel/vm/TimeQueue.hpp | 2 +- .../ndb/src/kernel/vm/TransporterCallback.cpp | 2 +- storage/ndb/src/kernel/vm/VMSignal.cpp | 2 +- storage/ndb/src/kernel/vm/VMSignal.hpp | 2 +- storage/ndb/src/kernel/vm/WOPool.cpp | 2 +- storage/ndb/src/kernel/vm/WOPool.hpp | 2 +- storage/ndb/src/kernel/vm/WaitQueue.hpp | 2 +- storage/ndb/src/kernel/vm/WatchDog.cpp | 2 +- storage/ndb/src/kernel/vm/WatchDog.hpp | 2 +- .../src/kernel/vm/al_test/arrayListTest.cpp | 2 +- .../src/kernel/vm/al_test/arrayPoolTest.cpp | 2 +- storage/ndb/src/kernel/vm/al_test/main.cpp | 2 +- storage/ndb/src/kernel/vm/bench_pool.cpp | 2 +- storage/ndb/src/kernel/vm/ndbd_malloc.cpp | 2 +- storage/ndb/src/kernel/vm/ndbd_malloc.hpp | 2 +- storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp | 2 +- storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp | 2 +- storage/ndb/src/kernel/vm/pc.hpp | 2 +- storage/ndb/src/kernel/vm/testCopy/rr.cpp | 2 +- .../ndb/src/kernel/vm/testCopy/testCopy.cpp | 2 +- .../vm/testDataBuffer/testDataBuffer.cpp | 2 +- .../src/kernel/vm/testLongSig/testLongSig.cpp | 2 +- .../vm/testSimplePropertiesSection/test.cpp | 2 +- storage/ndb/src/kernel/vm/testSuperPool.cpp | 2 +- storage/ndb/src/libndb.ver.in | 2 +- storage/ndb/src/mgmapi/LocalConfig.cpp | 2 +- storage/ndb/src/mgmapi/LocalConfig.hpp | 2 +- storage/ndb/src/mgmapi/Makefile.am | 2 +- storage/ndb/src/mgmapi/mgmapi.cpp | 2 +- .../ndb/src/mgmapi/mgmapi_configuration.cpp | 2 +- .../ndb/src/mgmapi/mgmapi_configuration.hpp | 2 +- storage/ndb/src/mgmapi/mgmapi_internal.h | 2 +- storage/ndb/src/mgmapi/ndb_logevent.cpp | 2 +- storage/ndb/src/mgmapi/ndb_logevent.hpp | 2 +- storage/ndb/src/mgmapi/test/keso.c | 2 +- storage/ndb/src/mgmapi/test/mgmSrvApi.cpp | 2 +- .../ndb/src/mgmclient/CommandInterpreter.cpp | 2 +- storage/ndb/src/mgmclient/Makefile.am | 2 +- storage/ndb/src/mgmclient/main.cpp | 2 +- storage/ndb/src/mgmclient/ndb_mgmclient.h | 2 +- storage/ndb/src/mgmclient/ndb_mgmclient.hpp | 2 +- .../ndb/src/mgmclient/test_cpcd/test_cpcd.cpp | 2 +- storage/ndb/src/mgmsrv/Config.cpp | 2 +- storage/ndb/src/mgmsrv/Config.hpp | 2 +- storage/ndb/src/mgmsrv/ConfigInfo.cpp | 2 +- storage/ndb/src/mgmsrv/ConfigInfo.hpp | 2 +- .../ndb/src/mgmsrv/InitConfigFileParser.cpp | 2 +- .../ndb/src/mgmsrv/InitConfigFileParser.hpp | 2 +- storage/ndb/src/mgmsrv/Makefile.am | 2 +- storage/ndb/src/mgmsrv/MgmtSrvr.cpp | 2 +- storage/ndb/src/mgmsrv/MgmtSrvr.hpp | 2 +- storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp | 2 +- .../mgmsrv/MgmtSrvrGeneralSignalHandling.cpp | 2 +- storage/ndb/src/mgmsrv/Services.cpp | 2 +- storage/ndb/src/mgmsrv/Services.hpp | 2 +- storage/ndb/src/mgmsrv/SignalQueue.cpp | 2 +- storage/ndb/src/mgmsrv/SignalQueue.hpp | 2 +- storage/ndb/src/mgmsrv/convertStrToInt.cpp | 2 +- storage/ndb/src/mgmsrv/convertStrToInt.hpp | 2 +- storage/ndb/src/mgmsrv/main.cpp | 2 +- storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp | 2 +- storage/ndb/src/mgmsrv/ndb_mgmd_error.h | 2 +- storage/ndb/src/ndbapi/API.hpp | 2 +- storage/ndb/src/ndbapi/ClusterMgr.cpp | 2 +- storage/ndb/src/ndbapi/ClusterMgr.hpp | 2 +- storage/ndb/src/ndbapi/DictCache.cpp | 2 +- storage/ndb/src/ndbapi/DictCache.hpp | 2 +- storage/ndb/src/ndbapi/Makefile.am | 2 +- storage/ndb/src/ndbapi/Ndb.cpp | 2 +- storage/ndb/src/ndbapi/NdbApiSignal.cpp | 2 +- storage/ndb/src/ndbapi/NdbApiSignal.hpp | 2 +- storage/ndb/src/ndbapi/NdbBlob.cpp | 2 +- storage/ndb/src/ndbapi/NdbBlobImpl.hpp | 2 +- storage/ndb/src/ndbapi/NdbDictionary.cpp | 2 +- storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp | 2 +- storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp | 2 +- storage/ndb/src/ndbapi/NdbErrorOut.cpp | 2 +- storage/ndb/src/ndbapi/NdbEventOperation.cpp | 2 +- .../ndb/src/ndbapi/NdbEventOperationImpl.cpp | 2 +- .../ndb/src/ndbapi/NdbEventOperationImpl.hpp | 2 +- storage/ndb/src/ndbapi/NdbImpl.hpp | 2 +- storage/ndb/src/ndbapi/NdbIndexOperation.cpp | 2 +- storage/ndb/src/ndbapi/NdbIndexStat.cpp | 2 +- storage/ndb/src/ndbapi/NdbLinHash.hpp | 2 +- storage/ndb/src/ndbapi/NdbOperation.cpp | 2 +- storage/ndb/src/ndbapi/NdbOperationDefine.cpp | 2 +- storage/ndb/src/ndbapi/NdbOperationExec.cpp | 2 +- storage/ndb/src/ndbapi/NdbOperationInt.cpp | 2 +- storage/ndb/src/ndbapi/NdbOperationScan.cpp | 2 +- storage/ndb/src/ndbapi/NdbOperationSearch.cpp | 2 +- storage/ndb/src/ndbapi/NdbPool.cpp | 2 +- storage/ndb/src/ndbapi/NdbPoolImpl.cpp | 2 +- storage/ndb/src/ndbapi/NdbPoolImpl.hpp | 2 +- storage/ndb/src/ndbapi/NdbRecAttr.cpp | 2 +- storage/ndb/src/ndbapi/NdbReceiver.cpp | 2 +- storage/ndb/src/ndbapi/NdbScanFilter.cpp | 2 +- storage/ndb/src/ndbapi/NdbScanOperation.cpp | 2 +- storage/ndb/src/ndbapi/NdbTransaction.cpp | 2 +- storage/ndb/src/ndbapi/NdbTransactionScan.cpp | 2 +- storage/ndb/src/ndbapi/NdbUtil.cpp | 2 +- storage/ndb/src/ndbapi/NdbUtil.hpp | 2 +- storage/ndb/src/ndbapi/NdbWaiter.hpp | 2 +- storage/ndb/src/ndbapi/Ndberr.cpp | 2 +- storage/ndb/src/ndbapi/Ndbif.cpp | 2 +- storage/ndb/src/ndbapi/Ndbinit.cpp | 2 +- storage/ndb/src/ndbapi/Ndblist.cpp | 2 +- storage/ndb/src/ndbapi/ObjectMap.cpp | 2 +- storage/ndb/src/ndbapi/ObjectMap.hpp | 2 +- storage/ndb/src/ndbapi/SignalSender.cpp | 2 +- storage/ndb/src/ndbapi/SignalSender.hpp | 2 +- storage/ndb/src/ndbapi/TransporterFacade.cpp | 2 +- storage/ndb/src/ndbapi/TransporterFacade.hpp | 2 +- .../ndb/src/ndbapi/ndb_cluster_connection.cpp | 2 +- .../src/ndbapi/ndb_cluster_connection_impl.hpp | 2 +- storage/ndb/src/ndbapi/ndb_internal.hpp | 2 +- storage/ndb/src/ndbapi/ndberror.c | 2 +- storage/ndb/src/ndbapi/ndberror_check.c | 2 +- .../src/ndbapi/signal-sender/SignalSender.cpp | 2 +- .../src/ndbapi/signal-sender/SignalSender.hpp | 2 +- storage/ndb/test/Makefile.am | 2 +- storage/ndb/test/include/AtrtClient.hpp | 2 +- storage/ndb/test/include/CpcClient.hpp | 2 +- storage/ndb/test/include/DbUtil.hpp | 2 +- .../test/include/HugoAsynchTransactions.hpp | 2 +- storage/ndb/test/include/HugoCalculator.hpp | 2 +- storage/ndb/test/include/HugoOperations.hpp | 2 +- storage/ndb/test/include/HugoTransactions.hpp | 2 +- storage/ndb/test/include/NDBT.hpp | 2 +- storage/ndb/test/include/NDBT_DataSet.hpp | 2 +- .../test/include/NDBT_DataSetTransaction.hpp | 2 +- storage/ndb/test/include/NDBT_Error.hpp | 2 +- storage/ndb/test/include/NDBT_Output.hpp | 2 +- storage/ndb/test/include/NDBT_ResultRow.hpp | 2 +- storage/ndb/test/include/NDBT_ReturnCodes.h | 2 +- storage/ndb/test/include/NDBT_Stats.hpp | 2 +- storage/ndb/test/include/NDBT_Table.hpp | 2 +- storage/ndb/test/include/NDBT_Tables.hpp | 2 +- storage/ndb/test/include/NDBT_Test.hpp | 2 +- storage/ndb/test/include/NDBT_Thread.hpp | 2 +- storage/ndb/test/include/NdbBackup.hpp | 2 +- storage/ndb/test/include/NdbConfig.hpp | 2 +- storage/ndb/test/include/NdbGrep.hpp | 2 +- storage/ndb/test/include/NdbMixRestarter.hpp | 2 +- storage/ndb/test/include/NdbRestarter.hpp | 2 +- storage/ndb/test/include/NdbRestarts.hpp | 2 +- storage/ndb/test/include/NdbSchemaCon.hpp | 2 +- storage/ndb/test/include/NdbSchemaOp.hpp | 2 +- storage/ndb/test/include/NdbTest.hpp | 2 +- storage/ndb/test/include/NdbTimer.hpp | 2 +- .../ndb/test/include/TestNdbEventOperation.hpp | 2 +- storage/ndb/test/include/UtilTransactions.hpp | 2 +- storage/ndb/test/include/getarg.h | 2 +- storage/ndb/test/ndbapi/InsertRecs.cpp | 2 +- storage/ndb/test/ndbapi/Makefile.am | 2 +- storage/ndb/test/ndbapi/ScanFilter.hpp | 2 +- storage/ndb/test/ndbapi/ScanFunctions.hpp | 2 +- storage/ndb/test/ndbapi/ScanInterpretTest.hpp | 2 +- storage/ndb/test/ndbapi/TraceNdbApi.cpp | 2 +- storage/ndb/test/ndbapi/VerifyNdbApi.cpp | 2 +- storage/ndb/test/ndbapi/acid.cpp | 2 +- storage/ndb/test/ndbapi/acid2.cpp | 2 +- storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp | 2 +- storage/ndb/test/ndbapi/adoInsertRecs.cpp | 2 +- storage/ndb/test/ndbapi/asyncGenerator.cpp | 2 +- storage/ndb/test/ndbapi/bank/Bank.cpp | 2 +- storage/ndb/test/ndbapi/bank/Bank.hpp | 2 +- storage/ndb/test/ndbapi/bank/BankLoad.cpp | 2 +- storage/ndb/test/ndbapi/bank/Makefile.am | 2 +- storage/ndb/test/ndbapi/bank/bankCreator.cpp | 2 +- storage/ndb/test/ndbapi/bank/bankMakeGL.cpp | 2 +- .../ndb/test/ndbapi/bank/bankSumAccounts.cpp | 2 +- storage/ndb/test/ndbapi/bank/bankTimer.cpp | 2 +- .../test/ndbapi/bank/bankTransactionMaker.cpp | 2 +- .../test/ndbapi/bank/bankValidateAllGLs.cpp | 2 +- storage/ndb/test/ndbapi/bank/testBank.cpp | 2 +- .../ndb/test/ndbapi/bench/asyncGenerator.cpp | 2 +- storage/ndb/test/ndbapi/bench/dbGenerator.h | 2 +- storage/ndb/test/ndbapi/bench/dbPopulate.cpp | 2 +- storage/ndb/test/ndbapi/bench/dbPopulate.h | 2 +- storage/ndb/test/ndbapi/bench/macros.h | 2 +- .../test/ndbapi/bench/mainAsyncGenerator.cpp | 2 +- storage/ndb/test/ndbapi/bench/mainPopulate.cpp | 2 +- storage/ndb/test/ndbapi/bench/ndb_async1.cpp | 2 +- storage/ndb/test/ndbapi/bench/ndb_async2.cpp | 2 +- storage/ndb/test/ndbapi/bench/ndb_error.hpp | 2 +- storage/ndb/test/ndbapi/bench/ndb_schema.hpp | 2 +- .../test/ndbapi/bench/ndb_user_transaction.cpp | 2 +- .../ndbapi/bench/ndb_user_transaction2.cpp | 2 +- .../ndbapi/bench/ndb_user_transaction3.cpp | 2 +- .../ndbapi/bench/ndb_user_transaction4.cpp | 2 +- .../ndbapi/bench/ndb_user_transaction5.cpp | 2 +- .../ndbapi/bench/ndb_user_transaction6.cpp | 2 +- storage/ndb/test/ndbapi/bench/testData.h | 2 +- .../ndb/test/ndbapi/bench/testDefinitions.h | 2 +- .../ndb/test/ndbapi/bench/userInterface.cpp | 2 +- storage/ndb/test/ndbapi/bench/userInterface.h | 2 +- storage/ndb/test/ndbapi/benchronja.cpp | 2 +- storage/ndb/test/ndbapi/bulk_copy.cpp | 2 +- storage/ndb/test/ndbapi/cdrserver.cpp | 2 +- storage/ndb/test/ndbapi/celloDb.cpp | 2 +- storage/ndb/test/ndbapi/create_all_tabs.cpp | 2 +- storage/ndb/test/ndbapi/create_tab.cpp | 2 +- storage/ndb/test/ndbapi/drop_all_tabs.cpp | 2 +- storage/ndb/test/ndbapi/flexAsynch.cpp | 2 +- storage/ndb/test/ndbapi/flexBench.cpp | 2 +- storage/ndb/test/ndbapi/flexHammer.cpp | 2 +- storage/ndb/test/ndbapi/flexScan.cpp | 2 +- storage/ndb/test/ndbapi/flexTT.cpp | 2 +- storage/ndb/test/ndbapi/flexTimedAsynch.cpp | 2 +- storage/ndb/test/ndbapi/flex_bench_mysql.cpp | 2 +- storage/ndb/test/ndbapi/index.cpp | 2 +- storage/ndb/test/ndbapi/index2.cpp | 2 +- storage/ndb/test/ndbapi/initronja.cpp | 2 +- storage/ndb/test/ndbapi/interpreterInTup.cpp | 2 +- storage/ndb/test/ndbapi/mainAsyncGenerator.cpp | 2 +- storage/ndb/test/ndbapi/msa.cpp | 2 +- storage/ndb/test/ndbapi/ndb_async1.cpp | 2 +- storage/ndb/test/ndbapi/ndb_async2.cpp | 2 +- storage/ndb/test/ndbapi/ndb_user_populate.cpp | 2 +- .../ndb/test/ndbapi/ndb_user_transaction.cpp | 2 +- .../ndb/test/ndbapi/ndb_user_transaction2.cpp | 2 +- .../ndb/test/ndbapi/ndb_user_transaction3.cpp | 2 +- .../ndb/test/ndbapi/ndb_user_transaction4.cpp | 2 +- .../ndb/test/ndbapi/ndb_user_transaction5.cpp | 2 +- .../ndb/test/ndbapi/ndb_user_transaction6.cpp | 2 +- storage/ndb/test/ndbapi/restarter.cpp | 2 +- storage/ndb/test/ndbapi/restarter2.cpp | 2 +- storage/ndb/test/ndbapi/restarts.cpp | 2 +- storage/ndb/test/ndbapi/size.cpp | 2 +- storage/ndb/test/ndbapi/slow_select.cpp | 2 +- storage/ndb/test/ndbapi/testBackup.cpp | 2 +- storage/ndb/test/ndbapi/testBasic.cpp | 2 +- storage/ndb/test/ndbapi/testBasicAsynch.cpp | 2 +- storage/ndb/test/ndbapi/testBitfield.cpp | 2 +- storage/ndb/test/ndbapi/testBlobs.cpp | 2 +- storage/ndb/test/ndbapi/testDataBuffers.cpp | 2 +- storage/ndb/test/ndbapi/testDeadlock.cpp | 2 +- storage/ndb/test/ndbapi/testDict.cpp | 2 +- storage/ndb/test/ndbapi/testGrepVerify.cpp | 2 +- storage/ndb/test/ndbapi/testIndex.cpp | 2 +- storage/ndb/test/ndbapi/testIndexStat.cpp | 2 +- storage/ndb/test/ndbapi/testInterpreter.cpp | 2 +- storage/ndb/test/ndbapi/testLcp.cpp | 2 +- storage/ndb/test/ndbapi/testMgm.cpp | 2 +- storage/ndb/test/ndbapi/testNDBT.cpp | 2 +- storage/ndb/test/ndbapi/testNdbApi.cpp | 2 +- storage/ndb/test/ndbapi/testNodeRestart.cpp | 2 +- storage/ndb/test/ndbapi/testOIBasic.cpp | 2 +- storage/ndb/test/ndbapi/testOperations.cpp | 2 +- storage/ndb/test/ndbapi/testOrderedIndex.cpp | 2 +- storage/ndb/test/ndbapi/testPartitioning.cpp | 2 +- storage/ndb/test/ndbapi/testReadPerf.cpp | 2 +- storage/ndb/test/ndbapi/testRestartGci.cpp | 2 +- storage/ndb/test/ndbapi/testSRBank.cpp | 2 +- storage/ndb/test/ndbapi/testScan.cpp | 2 +- storage/ndb/test/ndbapi/testScanFilter.cpp | 2 +- .../ndb/test/ndbapi/testScanInterpreter.cpp | 2 +- storage/ndb/test/ndbapi/testScanPerf.cpp | 2 +- storage/ndb/test/ndbapi/testSystemRestart.cpp | 2 +- storage/ndb/test/ndbapi/testTimeout.cpp | 2 +- storage/ndb/test/ndbapi/testTransactions.cpp | 2 +- storage/ndb/test/ndbapi/test_event.cpp | 2 +- storage/ndb/test/ndbapi/test_event_merge.cpp | 2 +- .../ndb/test/ndbapi/test_event_multi_table.cpp | 2 +- storage/ndb/test/ndbapi/userInterface.cpp | 2 +- storage/ndb/test/ndbnet/test.run | 2 +- storage/ndb/test/ndbnet/testError.run | 2 +- storage/ndb/test/ndbnet/testMNF.run | 2 +- storage/ndb/test/ndbnet/testNR.run | 2 +- storage/ndb/test/ndbnet/testNR1.run | 2 +- storage/ndb/test/ndbnet/testNR4.run | 2 +- storage/ndb/test/ndbnet/testSRhang.run | 2 +- storage/ndb/test/ndbnet/testTR295.run | 2 +- .../test/newtonapi/basic_test/basic/basic.cpp | 2 +- .../newtonapi/basic_test/bulk_read/br_test.cpp | 2 +- .../ndb/test/newtonapi/basic_test/common.cpp | 2 +- .../ndb/test/newtonapi/basic_test/common.hpp | 2 +- .../ptr_binding/ptr_binding_test.cpp | 2 +- .../test/newtonapi/basic_test/too_basic.cpp | 2 +- storage/ndb/test/newtonapi/perf_test/perf.cpp | 2 +- .../ndb/test/odbc/SQL99_test/SQL99_test.cpp | 2 +- storage/ndb/test/odbc/SQL99_test/SQL99_test.h | 2 +- .../ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp | 2 +- .../test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp | 2 +- .../ndb/test/odbc/client/NDBT_SQLConnect.cpp | 2 +- .../ndb/test/odbc/client/NDBT_SQLPrepare.cpp | 2 +- .../ndb/test/odbc/client/SQLAllocEnvTest.cpp | 2 +- .../test/odbc/client/SQLAllocHandleTest.cpp | 2 +- .../test/odbc/client/SQLAllocHandleTest_bf.cpp | 2 +- .../ndb/test/odbc/client/SQLBindColTest.cpp | 2 +- .../test/odbc/client/SQLBindParameterTest.cpp | 2 +- storage/ndb/test/odbc/client/SQLCancelTest.cpp | 2 +- .../test/odbc/client/SQLCloseCursorTest.cpp | 2 +- .../test/odbc/client/SQLColAttributeTest.cpp | 2 +- .../test/odbc/client/SQLColAttributeTest1.cpp | 2 +- .../test/odbc/client/SQLColAttributeTest2.cpp | 2 +- .../test/odbc/client/SQLColAttributeTest3.cpp | 2 +- .../ndb/test/odbc/client/SQLConnectTest.cpp | 2 +- .../ndb/test/odbc/client/SQLCopyDescTest.cpp | 2 +- .../test/odbc/client/SQLDescribeColTest.cpp | 2 +- .../ndb/test/odbc/client/SQLDisconnectTest.cpp | 2 +- .../test/odbc/client/SQLDriverConnectTest.cpp | 2 +- .../ndb/test/odbc/client/SQLEndTranTest.cpp | 2 +- storage/ndb/test/odbc/client/SQLErrorTest.cpp | 2 +- .../ndb/test/odbc/client/SQLExecDirectTest.cpp | 2 +- .../ndb/test/odbc/client/SQLExecuteTest.cpp | 2 +- .../test/odbc/client/SQLFetchScrollTest.cpp | 2 +- storage/ndb/test/odbc/client/SQLFetchTest.cpp | 2 +- .../ndb/test/odbc/client/SQLFreeHandleTest.cpp | 2 +- .../ndb/test/odbc/client/SQLFreeStmtTest.cpp | 2 +- .../test/odbc/client/SQLGetConnectAttrTest.cpp | 2 +- .../test/odbc/client/SQLGetCursorNameTest.cpp | 2 +- .../ndb/test/odbc/client/SQLGetDataTest.cpp | 2 +- .../test/odbc/client/SQLGetDescFieldTest.cpp | 2 +- .../ndb/test/odbc/client/SQLGetDescRecTest.cpp | 2 +- .../test/odbc/client/SQLGetDiagFieldTest.cpp | 2 +- .../odbc/client/SQLGetDiagRecSimpleTest.cpp | 2 +- .../ndb/test/odbc/client/SQLGetDiagRecTest.cpp | 2 +- .../ndb/test/odbc/client/SQLGetEnvAttrTest.cpp | 2 +- .../test/odbc/client/SQLGetFunctionsTest.cpp | 2 +- .../ndb/test/odbc/client/SQLGetInfoTest.cpp | 2 +- .../test/odbc/client/SQLGetStmtAttrTest.cpp | 2 +- .../test/odbc/client/SQLGetTypeInfoTest.cpp | 2 +- .../test/odbc/client/SQLMoreResultsTest.cpp | 2 +- .../test/odbc/client/SQLNumResultColsTest.cpp | 2 +- .../ndb/test/odbc/client/SQLParamDataTest.cpp | 2 +- .../ndb/test/odbc/client/SQLPrepareTest.cpp | 2 +- .../ndb/test/odbc/client/SQLPutDataTest.cpp | 2 +- .../ndb/test/odbc/client/SQLRowCountTest.cpp | 2 +- .../test/odbc/client/SQLSetConnectAttrTest.cpp | 2 +- .../test/odbc/client/SQLSetCursorNameTest.cpp | 2 +- .../test/odbc/client/SQLSetDescFieldTest.cpp | 2 +- .../ndb/test/odbc/client/SQLSetDescRecTest.cpp | 2 +- .../ndb/test/odbc/client/SQLSetEnvAttrTest.cpp | 2 +- .../test/odbc/client/SQLSetStmtAttrTest.cpp | 2 +- storage/ndb/test/odbc/client/SQLTablesTest.cpp | 2 +- .../ndb/test/odbc/client/SQLTransactTest.cpp | 2 +- storage/ndb/test/odbc/client/common.hpp | 2 +- storage/ndb/test/odbc/client/main.cpp | 2 +- .../ndb/test/odbc/driver/testOdbcDriver.cpp | 2 +- .../test/odbc/test_compiler/test_compiler.cpp | 2 +- storage/ndb/test/run-test/16node-tests.txt | 2 +- storage/ndb/test/run-test/Makefile.am | 2 +- .../ndb/test/run-test/atrt-analyze-result.sh | 2 +- storage/ndb/test/run-test/atrt-clear-result.sh | 2 +- .../ndb/test/run-test/atrt-gather-result.sh | 2 +- storage/ndb/test/run-test/atrt-mysql-test-run | 2 +- storage/ndb/test/run-test/atrt-setup.sh | 2 +- storage/ndb/test/run-test/atrt-testBackup | 2 +- storage/ndb/test/run-test/atrt.hpp | 2 +- storage/ndb/test/run-test/autotest-boot.sh | 2 +- storage/ndb/test/run-test/autotest-run.sh | 2 +- storage/ndb/test/run-test/basic.txt | 2 +- .../ndb/test/run-test/daily-basic-tests.txt | 2 +- .../ndb/test/run-test/daily-devel-tests.txt | 2 +- storage/ndb/test/run-test/files.cpp | 2 +- storage/ndb/test/run-test/main.cpp | 2 +- storage/ndb/test/run-test/make-config.sh | 2 +- storage/ndb/test/run-test/make-html-reports.sh | 2 +- storage/ndb/test/run-test/make-index.sh | 2 +- storage/ndb/test/run-test/ndb-autotest.sh | 2 +- storage/ndb/test/run-test/setup.cpp | 2 +- storage/ndb/test/run-test/upgrade-boot.sh | 2 +- storage/ndb/test/src/AtrtClient.cpp | 2 +- storage/ndb/test/src/CpcClient.cpp | 2 +- storage/ndb/test/src/DbUtil.cpp | 2 +- .../ndb/test/src/HugoAsynchTransactions.cpp | 2 +- storage/ndb/test/src/HugoCalculator.cpp | 2 +- storage/ndb/test/src/HugoOperations.cpp | 2 +- storage/ndb/test/src/HugoTransactions.cpp | 2 +- storage/ndb/test/src/Makefile.am | 2 +- storage/ndb/test/src/NDBT_Error.cpp | 2 +- storage/ndb/test/src/NDBT_Output.cpp | 2 +- storage/ndb/test/src/NDBT_ResultRow.cpp | 2 +- storage/ndb/test/src/NDBT_ReturnCodes.cpp | 2 +- storage/ndb/test/src/NDBT_Table.cpp | 2 +- storage/ndb/test/src/NDBT_Tables.cpp | 2 +- storage/ndb/test/src/NDBT_Test.cpp | 2 +- storage/ndb/test/src/NDBT_Thread.cpp | 2 +- storage/ndb/test/src/NdbBackup.cpp | 2 +- storage/ndb/test/src/NdbConfig.cpp | 2 +- storage/ndb/test/src/NdbGrep.cpp | 2 +- storage/ndb/test/src/NdbMixRestarter.cpp | 2 +- storage/ndb/test/src/NdbRestarter.cpp | 2 +- storage/ndb/test/src/NdbRestarts.cpp | 2 +- storage/ndb/test/src/NdbSchemaCon.cpp | 2 +- storage/ndb/test/src/NdbSchemaOp.cpp | 2 +- storage/ndb/test/src/UtilTransactions.cpp | 2 +- storage/ndb/test/tools/Makefile.am | 2 +- storage/ndb/test/tools/connect.cpp | 2 +- storage/ndb/test/tools/copy_tab.cpp | 2 +- storage/ndb/test/tools/cpcc.cpp | 2 +- storage/ndb/test/tools/create_index.cpp | 2 +- storage/ndb/test/tools/hugoCalculator.cpp | 2 +- storage/ndb/test/tools/hugoFill.cpp | 2 +- storage/ndb/test/tools/hugoLoad.cpp | 2 +- storage/ndb/test/tools/hugoLockRecords.cpp | 2 +- storage/ndb/test/tools/hugoPkDelete.cpp | 2 +- storage/ndb/test/tools/hugoPkRead.cpp | 2 +- storage/ndb/test/tools/hugoPkReadRecord.cpp | 2 +- storage/ndb/test/tools/hugoPkUpdate.cpp | 2 +- storage/ndb/test/tools/hugoScanRead.cpp | 2 +- storage/ndb/test/tools/hugoScanUpdate.cpp | 2 +- storage/ndb/test/tools/listen.cpp | 2 +- storage/ndb/test/tools/log_listner.cpp | 2 +- storage/ndb/test/tools/rep_latency.cpp | 2 +- storage/ndb/test/tools/restart.cpp | 2 +- storage/ndb/test/tools/transproxy.cpp | 2 +- storage/ndb/test/tools/verify_index.cpp | 2 +- storage/ndb/tools/Makefile.am | 2 +- storage/ndb/tools/clean-links.sh | 2 +- storage/ndb/tools/delete_all.cpp | 2 +- storage/ndb/tools/desc.cpp | 2 +- storage/ndb/tools/drop_index.cpp | 2 +- storage/ndb/tools/drop_tab.cpp | 2 +- storage/ndb/tools/listTables.cpp | 2 +- storage/ndb/tools/make-errors.pl | 2 +- storage/ndb/tools/make-links.sh | 2 +- storage/ndb/tools/ndb_config.cpp | 2 +- storage/ndb/tools/ndb_error_reporter | 2 +- storage/ndb/tools/ndb_size.pl | 2 +- storage/ndb/tools/ndb_test_platform.cpp | 2 +- storage/ndb/tools/ndbsql.cpp | 2 +- storage/ndb/tools/restore/Restore.cpp | 2 +- storage/ndb/tools/restore/Restore.hpp | 2 +- storage/ndb/tools/restore/consumer.cpp | 2 +- storage/ndb/tools/restore/consumer.hpp | 2 +- storage/ndb/tools/restore/consumer_printer.cpp | 2 +- storage/ndb/tools/restore/consumer_printer.hpp | 2 +- storage/ndb/tools/restore/consumer_restore.cpp | 2 +- storage/ndb/tools/restore/consumer_restore.hpp | 2 +- .../ndb/tools/restore/consumer_restorem.cpp | 2 +- storage/ndb/tools/restore/ndb_nodegroup_map.h | 2 +- storage/ndb/tools/restore/restore_main.cpp | 2 +- storage/ndb/tools/rgrep | 2 +- storage/ndb/tools/select_all.cpp | 2 +- storage/ndb/tools/select_count.cpp | 2 +- storage/ndb/tools/waiter.cpp | 2 +- storage/perfschema/unittest/stub_server_misc.h | 2 +- storage/tokudb/COPYING | 4 ++-- storage/tokudb/ft-index/COPYING | 4 ++-- storage/tokudb/ft-index/README-TOKUDB | 2 +- .../tokudb/ft-index/buildheader/make_tdb.cc | 2 +- .../cmake/merge_archives_unix.cmake.in | 2 +- storage/tokudb/ft-index/ft/bndata.cc | 2 +- storage/tokudb/ft-index/ft/bndata.h | 2 +- .../ft/cachetable/background_job_manager.cc | 2 +- .../ft/cachetable/background_job_manager.h | 2 +- .../ft/cachetable/cachetable-internal.h | 2 +- .../ft-index/ft/cachetable/cachetable.cc | 2 +- .../tokudb/ft-index/ft/cachetable/cachetable.h | 2 +- .../ft-index/ft/cachetable/checkpoint.cc | 2 +- .../tokudb/ft-index/ft/cachetable/checkpoint.h | 2 +- storage/tokudb/ft-index/ft/comparator.h | 2 +- storage/tokudb/ft-index/ft/cursor.cc | 2 +- storage/tokudb/ft-index/ft/cursor.h | 2 +- .../ft-index/ft/ft-cachetable-wrappers.cc | 2 +- .../ft-index/ft/ft-cachetable-wrappers.h | 2 +- .../tokudb/ft-index/ft/ft-flusher-internal.h | 2 +- storage/tokudb/ft-index/ft/ft-flusher.cc | 2 +- storage/tokudb/ft-index/ft/ft-flusher.h | 2 +- storage/tokudb/ft-index/ft/ft-hot-flusher.cc | 2 +- storage/tokudb/ft-index/ft/ft-internal.h | 2 +- storage/tokudb/ft-index/ft/ft-ops.cc | 2 +- storage/tokudb/ft-index/ft/ft-ops.h | 2 +- storage/tokudb/ft-index/ft/ft-test-helpers.cc | 2 +- storage/tokudb/ft-index/ft/ft-verify.cc | 2 +- storage/tokudb/ft-index/ft/ft.cc | 2 +- storage/tokudb/ft-index/ft/ft.h | 2 +- storage/tokudb/ft-index/ft/le-cursor.cc | 2 +- storage/tokudb/ft-index/ft/le-cursor.h | 2 +- storage/tokudb/ft-index/ft/leafentry.cc | 2 +- storage/tokudb/ft-index/ft/leafentry.h | 2 +- storage/tokudb/ft-index/ft/loader/callbacks.cc | 2 +- storage/tokudb/ft-index/ft/loader/dbufio.cc | 2 +- storage/tokudb/ft-index/ft/loader/dbufio.h | 2 +- .../ft-index/ft/loader/loader-internal.h | 2 +- storage/tokudb/ft-index/ft/loader/loader.cc | 2 +- storage/tokudb/ft-index/ft/loader/loader.h | 2 +- storage/tokudb/ft-index/ft/loader/pqueue.cc | 2 +- storage/tokudb/ft-index/ft/loader/pqueue.h | 2 +- .../tokudb/ft-index/ft/logger/log-internal.h | 2 +- storage/tokudb/ft-index/ft/logger/log.h | 2 +- .../tokudb/ft-index/ft/logger/log_upgrade.cc | 2 +- storage/tokudb/ft-index/ft/logger/logcursor.cc | 2 +- storage/tokudb/ft-index/ft/logger/logcursor.h | 2 +- .../tokudb/ft-index/ft/logger/logfilemgr.cc | 2 +- storage/tokudb/ft-index/ft/logger/logfilemgr.h | 2 +- storage/tokudb/ft-index/ft/logger/logformat.cc | 2 +- storage/tokudb/ft-index/ft/logger/logger.cc | 2 +- storage/tokudb/ft-index/ft/logger/logger.h | 2 +- storage/tokudb/ft-index/ft/logger/recover.cc | 2 +- storage/tokudb/ft-index/ft/logger/recover.h | 2 +- storage/tokudb/ft-index/ft/msg.cc | 2 +- storage/tokudb/ft-index/ft/msg.h | 2 +- storage/tokudb/ft-index/ft/msg_buffer.cc | 2 +- storage/tokudb/ft-index/ft/msg_buffer.h | 2 +- storage/tokudb/ft-index/ft/node.cc | 2 +- storage/tokudb/ft-index/ft/node.h | 2 +- storage/tokudb/ft-index/ft/pivotkeys.cc | 2 +- .../ft-index/ft/serialize/block_allocator.cc | 2 +- .../ft-index/ft/serialize/block_allocator.h | 2 +- .../ft/serialize/block_allocator_strategy.cc | 2 +- .../ft/serialize/block_allocator_strategy.h | 2 +- .../ft-index/ft/serialize/block_table.cc | 2 +- .../tokudb/ft-index/ft/serialize/block_table.h | 2 +- .../tokudb/ft-index/ft/serialize/compress.cc | 2 +- .../tokudb/ft-index/ft/serialize/compress.h | 2 +- .../ft/serialize/ft-node-deserialize.cc | 2 +- .../ft-index/ft/serialize/ft-serialize.cc | 2 +- .../ft-index/ft/serialize/ft-serialize.h | 2 +- .../ft-index/ft/serialize/ft_layout_version.h | 2 +- .../ft-index/ft/serialize/ft_node-serialize.cc | 2 +- .../ft-index/ft/serialize/ft_node-serialize.h | 2 +- .../tokudb/ft-index/ft/serialize/quicklz.cc | 2 +- storage/tokudb/ft-index/ft/serialize/quicklz.h | 2 +- storage/tokudb/ft-index/ft/serialize/rbuf.h | 2 +- .../tokudb/ft-index/ft/serialize/sub_block.cc | 2 +- .../tokudb/ft-index/ft/serialize/sub_block.h | 2 +- storage/tokudb/ft-index/ft/serialize/wbuf.h | 2 +- storage/tokudb/ft-index/ft/serialize/workset.h | 2 +- .../tokudb/ft-index/ft/tests/benchmark-test.cc | 2 +- .../ft/tests/block_allocator_strategy_test.cc | 2 +- .../ft-index/ft/tests/block_allocator_test.cc | 2 +- .../ft-index/ft/tests/bnc-insert-benchmark.cc | 2 +- .../ft-index/ft/tests/cachetable-4357.cc | 2 +- .../ft-index/ft/tests/cachetable-4365.cc | 2 +- .../ft-index/ft/tests/cachetable-5097.cc | 2 +- .../ft-index/ft/tests/cachetable-5978-2.cc | 2 +- .../ft-index/ft/tests/cachetable-5978.cc | 2 +- .../ft-index/ft/tests/cachetable-all-write.cc | 2 +- .../ft/tests/cachetable-checkpoint-pending.cc | 2 +- .../cachetable-checkpoint-pinned-nodes.cc | 2 +- .../cachetable-checkpoint-prefetched-nodes.cc | 2 +- .../ft/tests/cachetable-checkpoint-test.cc | 2 +- .../ft/tests/cachetable-checkpointer-class.cc | 2 +- .../ft/tests/cachetable-cleaner-checkpoint.cc | 2 +- .../ft/tests/cachetable-cleaner-checkpoint2.cc | 2 +- ...chetable-cleaner-thread-attrs-accumulate.cc | 2 +- ...chetable-cleaner-thread-empty-cachetable.cc | 2 +- ...hetable-cleaner-thread-everything-pinned.cc | 2 +- ...le-cleaner-thread-nothing-needs-flushing.cc | 2 +- .../cachetable-cleaner-thread-same-fullhash.cc | 2 +- .../tests/cachetable-cleaner-thread-simple.cc | 2 +- .../ft/tests/cachetable-clock-all-pinned.cc | 2 +- .../ft/tests/cachetable-clock-eviction.cc | 2 +- .../ft/tests/cachetable-clock-eviction2.cc | 2 +- .../ft/tests/cachetable-clock-eviction3.cc | 2 +- .../ft/tests/cachetable-clock-eviction4.cc | 2 +- .../ft/tests/cachetable-clone-checkpoint.cc | 2 +- ...chetable-clone-partial-fetch-pinned-node.cc | 2 +- .../ft/tests/cachetable-clone-partial-fetch.cc | 2 +- .../tests/cachetable-clone-pin-nonblocking.cc | 2 +- .../ft/tests/cachetable-clone-unpin-remove.cc | 2 +- .../ft/tests/cachetable-count-pinned-test.cc | 2 +- .../ft-index/ft/tests/cachetable-debug-test.cc | 2 +- .../ft/tests/cachetable-eviction-close-test.cc | 2 +- .../tests/cachetable-eviction-close-test2.cc | 2 +- .../cachetable-eviction-getandpin-test.cc | 2 +- .../cachetable-eviction-getandpin-test2.cc | 2 +- .../ft/tests/cachetable-evictor-class.cc | 2 +- .../ft-index/ft/tests/cachetable-fd-test.cc | 2 +- .../tests/cachetable-fetch-inducing-evictor.cc | 2 +- .../tests/cachetable-flush-during-cleaner.cc | 2 +- .../ft-index/ft/tests/cachetable-flush-test.cc | 2 +- .../ft/tests/cachetable-getandpin-test.cc | 2 +- .../cachetable-kibbutz_and_flush_cachefile.cc | 2 +- .../ft/tests/cachetable-partial-fetch.cc | 2 +- .../ft/tests/cachetable-pin-checkpoint.cc | 2 +- ...hetable-pin-nonblocking-checkpoint-clean.cc | 2 +- .../cachetable-prefetch-checkpoint-test.cc | 2 +- .../cachetable-prefetch-close-leak-test.cc | 2 +- .../ft/tests/cachetable-prefetch-close-test.cc | 2 +- .../cachetable-prefetch-flowcontrol-test.cc | 2 +- .../cachetable-prefetch-getandpin-test.cc | 2 +- .../cachetable-prefetch-maybegetandpin-test.cc | 2 +- .../ft/tests/cachetable-prefetch2-test.cc | 2 +- .../ft/tests/cachetable-put-checkpoint.cc | 2 +- .../ft-index/ft/tests/cachetable-put-test.cc | 2 +- .../ft/tests/cachetable-rwlock-test.cc | 2 +- .../ft/tests/cachetable-simple-clone.cc | 2 +- .../ft/tests/cachetable-simple-clone2.cc | 2 +- .../ft/tests/cachetable-simple-close.cc | 2 +- .../tests/cachetable-simple-maybe-get-pin.cc | 2 +- .../ft/tests/cachetable-simple-pin-cheap.cc | 2 +- .../tests/cachetable-simple-pin-dep-nodes.cc | 2 +- .../cachetable-simple-pin-nonblocking-cheap.cc | 2 +- .../tests/cachetable-simple-pin-nonblocking.cc | 2 +- .../ft-index/ft/tests/cachetable-simple-pin.cc | 2 +- .../tests/cachetable-simple-put-dep-nodes.cc | 2 +- .../cachetable-simple-read-pin-nonblocking.cc | 2 +- .../ft/tests/cachetable-simple-read-pin.cc | 2 +- ...achetable-simple-unpin-remove-checkpoint.cc | 2 +- .../ft/tests/cachetable-simple-verify.cc | 2 +- .../ft-index/ft/tests/cachetable-test.cc | 2 +- .../tokudb/ft-index/ft/tests/cachetable-test.h | 2 +- .../tests/cachetable-unpin-and-remove-test.cc | 2 +- .../cachetable-unpin-remove-and-checkpoint.cc | 2 +- .../ft-index/ft/tests/cachetable-unpin-test.cc | 2 +- .../ft/tests/cachetable-writer-thread-limit.cc | 2 +- .../ft-index/ft/tests/comparator-test.cc | 2 +- .../tokudb/ft-index/ft/tests/compress-test.cc | 2 +- .../ft-index/ft/tests/dbufio-test-destroy.cc | 2 +- .../tokudb/ft-index/ft/tests/dbufio-test.cc | 2 +- storage/tokudb/ft-index/ft/tests/dmt-test.cc | 2 +- storage/tokudb/ft-index/ft/tests/dmt-test2.cc | 2 +- storage/tokudb/ft-index/ft/tests/fifo-test.cc | 2 +- .../tokudb/ft-index/ft/tests/ft-bfe-query.cc | 2 +- .../tokudb/ft-index/ft/tests/ft-clock-test.cc | 2 +- .../ft/tests/ft-serialize-benchmark.cc | 2 +- .../ft/tests/ft-serialize-sub-block-test.cc | 2 +- .../ft-index/ft/tests/ft-serialize-test.cc | 2 +- .../ft-index/ft/tests/ft-test-cursor-2.cc | 2 +- .../tokudb/ft-index/ft/tests/ft-test-cursor.cc | 2 +- .../tokudb/ft-index/ft/tests/ft-test-header.cc | 2 +- storage/tokudb/ft-index/ft/tests/ft-test.cc | 2 +- storage/tokudb/ft-index/ft/tests/ft-test0.cc | 2 +- storage/tokudb/ft-index/ft/tests/ft-test1.cc | 2 +- storage/tokudb/ft-index/ft/tests/ft-test2.cc | 2 +- storage/tokudb/ft-index/ft/tests/ft-test3.cc | 2 +- storage/tokudb/ft-index/ft/tests/ft-test4.cc | 2 +- storage/tokudb/ft-index/ft/tests/ft-test5.cc | 2 +- .../ft/tests/ftloader-error-injector.h | 2 +- .../ft/tests/ftloader-test-bad-generate.cc | 2 +- .../ft/tests/ftloader-test-extractor-errors.cc | 2 +- .../ft/tests/ftloader-test-extractor.cc | 2 +- .../tests/ftloader-test-merge-files-dbufio.cc | 2 +- .../ft-index/ft/tests/ftloader-test-open.cc | 2 +- .../ft-index/ft/tests/ftloader-test-vm.cc | 2 +- .../ft/tests/ftloader-test-writer-errors.cc | 2 +- .../ft-index/ft/tests/ftloader-test-writer.cc | 2 +- .../tokudb/ft-index/ft/tests/ftloader-test.cc | 2 +- .../ft/tests/generate-upgrade-recovery-logs.cc | 2 +- storage/tokudb/ft-index/ft/tests/is_empty.cc | 2 +- storage/tokudb/ft-index/ft/tests/keyrange.cc | 2 +- storage/tokudb/ft-index/ft/tests/keytest.cc | 2 +- .../ft-index/ft/tests/le-cursor-provdel.cc | 2 +- .../ft-index/ft/tests/le-cursor-right.cc | 2 +- .../tokudb/ft-index/ft/tests/le-cursor-walk.cc | 2 +- storage/tokudb/ft-index/ft/tests/list-test.cc | 2 +- .../ft-index/ft/tests/log-test-maybe-trim.cc | 2 +- storage/tokudb/ft-index/ft/tests/log-test.cc | 2 +- storage/tokudb/ft-index/ft/tests/log-test2.cc | 2 +- storage/tokudb/ft-index/ft/tests/log-test3.cc | 2 +- storage/tokudb/ft-index/ft/tests/log-test4.cc | 2 +- storage/tokudb/ft-index/ft/tests/log-test5.cc | 2 +- storage/tokudb/ft-index/ft/tests/log-test6.cc | 2 +- storage/tokudb/ft-index/ft/tests/log-test7.cc | 2 +- .../ft/tests/logcursor-bad-checksum.cc | 2 +- .../tokudb/ft-index/ft/tests/logcursor-bw.cc | 2 +- .../ft/tests/logcursor-empty-logdir.cc | 2 +- .../ft/tests/logcursor-empty-logfile-2.cc | 2 +- .../ft/tests/logcursor-empty-logfile-3.cc | 2 +- .../ft/tests/logcursor-empty-logfile.cc | 2 +- .../tokudb/ft-index/ft/tests/logcursor-fw.cc | 2 +- .../ft-index/ft/tests/logcursor-print.cc | 2 +- .../ft-index/ft/tests/logcursor-timestamp.cc | 2 +- .../ft/tests/logfilemgr-create-destroy.cc | 2 +- .../ft-index/ft/tests/logfilemgr-print.cc | 2 +- storage/tokudb/ft-index/ft/tests/make-tree.cc | 2 +- .../tokudb/ft-index/ft/tests/mempool-115.cc | 2 +- storage/tokudb/ft-index/ft/tests/msnfilter.cc | 2 +- .../ft-index/ft/tests/orthopush-flush.cc | 2 +- .../tokudb/ft-index/ft/tests/pqueue-test.cc | 2 +- .../tokudb/ft-index/ft/tests/quicklz-test.cc | 2 +- .../ft/tests/recovery-bad-last-entry.cc | 2 +- .../ft/tests/recovery-cbegin-cend-hello.cc | 2 +- .../ft-index/ft/tests/recovery-cbegin-cend.cc | 2 +- .../ft-index/ft/tests/recovery-cbegin.cc | 2 +- .../ft-index/ft/tests/recovery-cend-cbegin.cc | 2 +- .../ft/tests/recovery-datadir-is-file.cc | 2 +- .../tokudb/ft-index/ft/tests/recovery-empty.cc | 2 +- .../ft/tests/recovery-fopen-missing-file.cc | 2 +- .../tokudb/ft-index/ft/tests/recovery-hello.cc | 2 +- .../recovery-lsn-error-during-forward-scan.cc | 2 +- .../ft-index/ft/tests/recovery-no-datadir.cc | 2 +- .../ft-index/ft/tests/recovery-no-log.cc | 2 +- .../ft-index/ft/tests/recovery-no-logdir.cc | 2 +- .../ft-index/ft/tests/recovery-test5123.cc | 2 +- storage/tokudb/ft-index/ft/tests/shortcut.cc | 2 +- .../ft/tests/subblock-test-checksum.cc | 2 +- .../ft/tests/subblock-test-compression.cc | 2 +- .../ft-index/ft/tests/subblock-test-index.cc | 2 +- .../ft-index/ft/tests/subblock-test-size.cc | 2 +- .../tokudb/ft-index/ft/tests/test-assert.cc | 2 +- storage/tokudb/ft-index/ft/tests/test-bjm.cc | 2 +- .../ft/tests/test-checkpoint-during-flush.cc | 2 +- .../ft/tests/test-checkpoint-during-merge.cc | 2 +- .../tests/test-checkpoint-during-rebalance.cc | 2 +- .../ft/tests/test-checkpoint-during-split.cc | 2 +- .../ft-index/ft/tests/test-del-inorder.cc | 2 +- .../ft/tests/test-dirty-flushes-on-cleaner.cc | 2 +- .../tokudb/ft-index/ft/tests/test-dump-ft.cc | 2 +- .../ft/tests/test-flushes-on-cleaner.cc | 2 +- .../ft-index/ft/tests/test-ft-overflow.cc | 2 +- .../tokudb/ft-index/ft/tests/test-ft-txns.h | 2 +- .../ft-index/ft/tests/test-hot-with-bounds.cc | 2 +- .../tokudb/ft-index/ft/tests/test-inc-split.cc | 2 +- .../ft/tests/test-leafentry-child-txn.cc | 2 +- .../ft-index/ft/tests/test-leafentry-nested.cc | 2 +- .../ft/tests/test-merges-on-cleaner.cc | 2 +- .../tests/test-oldest-referenced-xid-flush.cc | 2 +- .../ft/tests/test-pick-child-to-flush.cc | 2 +- .../ft/tests/test-txn-child-manager.cc | 2 +- .../ft/tests/test-upgrade-recovery-logs.cc | 2 +- storage/tokudb/ft-index/ft/tests/test.h | 2 +- storage/tokudb/ft-index/ft/tests/test1308a.cc | 2 +- storage/tokudb/ft-index/ft/tests/test3681.cc | 2 +- storage/tokudb/ft-index/ft/tests/test3856.cc | 2 +- storage/tokudb/ft-index/ft/tests/test3884.cc | 2 +- storage/tokudb/ft-index/ft/tests/test4115.cc | 2 +- storage/tokudb/ft-index/ft/tests/test4244.cc | 2 +- .../tokudb/ft-index/ft/tests/test_logcursor.cc | 2 +- storage/tokudb/ft-index/ft/tests/test_oexcl.cc | 2 +- .../test_rightmost_leaf_seqinsert_heuristic.cc | 2 +- .../tests/test_rightmost_leaf_split_merge.cc | 2 +- .../ft/tests/test_toku_malloc_plain_free.cc | 2 +- .../ft-index/ft/tests/upgrade_test_simple.cc | 2 +- .../tokudb/ft-index/ft/tests/verify-bad-msn.cc | 2 +- .../ft-index/ft/tests/verify-bad-pivots.cc | 2 +- .../ft-index/ft/tests/verify-dup-in-leaf.cc | 2 +- .../ft-index/ft/tests/verify-dup-pivots.cc | 2 +- .../ft-index/ft/tests/verify-misrouted-msgs.cc | 2 +- .../ft-index/ft/tests/verify-unsorted-leaf.cc | 2 +- .../ft/tests/verify-unsorted-pivots.cc | 2 +- .../ft-index/ft/tests/xid_lsn_independent.cc | 2 +- storage/tokudb/ft-index/ft/tests/ybt-test.cc | 2 +- storage/tokudb/ft-index/ft/txn/roll.cc | 2 +- .../tokudb/ft-index/ft/txn/rollback-apply.cc | 2 +- .../tokudb/ft-index/ft/txn/rollback-apply.h | 2 +- .../ft-index/ft/txn/rollback-ct-callbacks.cc | 2 +- .../ft-index/ft/txn/rollback-ct-callbacks.h | 2 +- storage/tokudb/ft-index/ft/txn/rollback.cc | 2 +- storage/tokudb/ft-index/ft/txn/rollback.h | 2 +- .../ft-index/ft/txn/rollback_log_node_cache.cc | 2 +- .../ft-index/ft/txn/rollback_log_node_cache.h | 2 +- storage/tokudb/ft-index/ft/txn/txn.cc | 2 +- storage/tokudb/ft-index/ft/txn/txn.h | 2 +- .../ft-index/ft/txn/txn_child_manager.cc | 2 +- .../tokudb/ft-index/ft/txn/txn_child_manager.h | 2 +- storage/tokudb/ft-index/ft/txn/txn_manager.cc | 2 +- storage/tokudb/ft-index/ft/txn/txn_manager.h | 2 +- storage/tokudb/ft-index/ft/txn/txn_state.h | 2 +- storage/tokudb/ft-index/ft/txn/xids.cc | 2 +- storage/tokudb/ft-index/ft/txn/xids.h | 2 +- storage/tokudb/ft-index/ft/ule-internal.h | 2 +- storage/tokudb/ft-index/ft/ule.cc | 2 +- storage/tokudb/ft-index/ft/ule.h | 2 +- .../ft-index/locktree/concurrent_tree.cc | 2 +- .../tokudb/ft-index/locktree/concurrent_tree.h | 2 +- storage/tokudb/ft-index/locktree/keyrange.cc | 2 +- storage/tokudb/ft-index/locktree/keyrange.h | 2 +- .../tokudb/ft-index/locktree/lock_request.cc | 2 +- .../tokudb/ft-index/locktree/lock_request.h | 2 +- storage/tokudb/ft-index/locktree/locktree.cc | 2 +- storage/tokudb/ft-index/locktree/locktree.h | 2 +- storage/tokudb/ft-index/locktree/manager.cc | 2 +- .../tokudb/ft-index/locktree/range_buffer.cc | 2 +- .../tokudb/ft-index/locktree/range_buffer.h | 2 +- .../tests/concurrent_tree_create_destroy.cc | 2 +- .../concurrent_tree_lkr_acquire_release.cc | 2 +- .../tests/concurrent_tree_lkr_insert_remove.cc | 2 +- .../concurrent_tree_lkr_insert_serial_large.cc | 2 +- .../tests/concurrent_tree_lkr_remove_all.cc | 2 +- .../locktree/tests/concurrent_tree_unit_test.h | 2 +- .../locktree/tests/lock_request_create_set.cc | 2 +- .../tests/lock_request_get_set_keys.cc | 2 +- .../locktree/tests/lock_request_killed.cc | 2 +- .../locktree/tests/lock_request_not_killed.cc | 2 +- .../tests/lock_request_start_deadlock.cc | 2 +- .../tests/lock_request_start_pending.cc | 2 +- .../tests/lock_request_start_retry_race.cc | 2 +- .../locktree/tests/lock_request_unit_test.h | 2 +- .../tests/lock_request_wait_time_callback.cc | 2 +- .../locktree/tests/locktree_conflicts.cc | 2 +- .../locktree/tests/locktree_create_destroy.cc | 2 +- .../locktree_escalation_1big7lt_1small.cc | 2 +- .../tests/locktree_escalation_2big_1lt.cc | 2 +- .../tests/locktree_escalation_2big_2lt.cc | 2 +- .../tests/locktree_escalation_impossible.cc | 2 +- .../tests/locktree_escalation_stalls.cc | 2 +- .../locktree/tests/locktree_infinity.cc | 2 +- .../ft-index/locktree/tests/locktree_misc.cc | 2 +- .../tests/locktree_overlapping_relock.cc | 2 +- .../locktree/tests/locktree_simple_lock.cc | 2 +- .../locktree_single_txnid_optimization.cc | 2 +- .../locktree/tests/locktree_unit_test.h | 2 +- .../locktree/tests/manager_create_destroy.cc | 2 +- .../locktree/tests/manager_locktree_map.cc | 2 +- .../manager_parallel_locktree_get_release.cc | 2 +- .../ft-index/locktree/tests/manager_params.cc | 2 +- .../tests/manager_reference_release_lt.cc | 2 +- .../ft-index/locktree/tests/manager_status.cc | 2 +- .../locktree/tests/manager_unit_test.h | 2 +- .../locktree/tests/range_buffer_test.cc | 2 +- storage/tokudb/ft-index/locktree/tests/test.h | 2 +- .../ft-index/locktree/tests/txnid_set_test.cc | 2 +- .../tokudb/ft-index/locktree/tests/wfg_test.cc | 2 +- storage/tokudb/ft-index/locktree/treenode.cc | 2 +- storage/tokudb/ft-index/locktree/treenode.h | 2 +- storage/tokudb/ft-index/locktree/txnid_set.cc | 2 +- storage/tokudb/ft-index/locktree/txnid_set.h | 2 +- storage/tokudb/ft-index/locktree/wfg.cc | 2 +- storage/tokudb/ft-index/locktree/wfg.h | 2 +- storage/tokudb/ft-index/portability/file.cc | 2 +- .../portability/huge_page_detection.cc | 2 +- storage/tokudb/ft-index/portability/memory.cc | 2 +- storage/tokudb/ft-index/portability/memory.h | 2 +- .../tokudb/ft-index/portability/os_malloc.cc | 2 +- .../tokudb/ft-index/portability/portability.cc | 2 +- .../portability/tests/rwlock_condvar.h | 2 +- .../portability/tests/test-active-cpus.cc | 2 +- .../tests/test-cache-line-boundary-fails.cc | 2 +- .../tests/test-cpu-freq-openlimit17.cc | 2 +- .../portability/tests/test-cpu-freq.cc | 2 +- .../portability/tests/test-filesystem-sizes.cc | 2 +- .../ft-index/portability/tests/test-flock.cc | 2 +- .../portability/tests/test-fsync-directory.cc | 2 +- .../ft-index/portability/tests/test-fsync.cc | 2 +- .../ft-index/portability/tests/test-gettime.cc | 2 +- .../portability/tests/test-gettimeofday.cc | 2 +- .../portability/tests/test-hugepage.cc | 2 +- .../portability/tests/test-max-data.cc | 2 +- .../portability/tests/test-memory-status.cc | 2 +- .../portability/tests/test-pagesize.cc | 2 +- .../tests/test-pthread-rwlock-rdlock.cc | 2 +- .../tests/test-pthread-rwlock-rwr.cc | 2 +- .../portability/tests/test-pwrite4g.cc | 2 +- .../portability/tests/test-snprintf.cc | 2 +- .../ft-index/portability/tests/test-stat.cc | 2 +- .../portability/tests/test-toku-malloc.cc | 2 +- .../ft-index/portability/tests/test-xid.cc | 2 +- .../tokudb/ft-index/portability/tests/test.h | 2 +- .../portability/tests/try-assert-zero.cc | 2 +- .../ft-index/portability/tests/try-assert0.cc | 2 +- .../portability/tests/try-leak-lost.cc | 2 +- .../portability/tests/try-leak-reachable.cc | 2 +- .../ft-index/portability/tests/try-uninit.cc | 2 +- .../tokudb/ft-index/portability/toku_assert.cc | 2 +- .../tokudb/ft-index/portability/toku_assert.h | 2 +- .../tokudb/ft-index/portability/toku_atomic.h | 2 +- .../ft-index/portability/toku_byteswap.h | 2 +- .../tokudb/ft-index/portability/toku_crash.cc | 2 +- .../tokudb/ft-index/portability/toku_crash.h | 2 +- .../tokudb/ft-index/portability/toku_htod.h | 2 +- .../tokudb/ft-index/portability/toku_htonl.h | 2 +- .../tokudb/ft-index/portability/toku_list.h | 2 +- storage/tokudb/ft-index/portability/toku_os.h | 2 +- .../ft-index/portability/toku_os_types.h | 2 +- .../tokudb/ft-index/portability/toku_path.cc | 2 +- .../tokudb/ft-index/portability/toku_path.h | 2 +- .../ft-index/portability/toku_portability.h | 2 +- .../ft-index/portability/toku_pthread.cc | 2 +- .../tokudb/ft-index/portability/toku_pthread.h | 2 +- .../ft-index/portability/toku_race_tools.h | 2 +- .../tokudb/ft-index/portability/toku_random.h | 2 +- .../tokudb/ft-index/portability/toku_stdint.h | 2 +- .../tokudb/ft-index/portability/toku_stdlib.h | 2 +- .../tokudb/ft-index/portability/toku_time.cc | 2 +- .../tokudb/ft-index/portability/toku_time.h | 2 +- storage/tokudb/ft-index/src/errors.cc | 2 +- storage/tokudb/ft-index/src/indexer-internal.h | 2 +- storage/tokudb/ft-index/src/indexer-undo-do.cc | 2 +- storage/tokudb/ft-index/src/indexer.cc | 2 +- storage/tokudb/ft-index/src/indexer.h | 2 +- storage/tokudb/ft-index/src/loader.cc | 2 +- storage/tokudb/ft-index/src/loader.h | 2 +- .../src/tests/big-nested-abort-abort.cc | 2 +- .../src/tests/big-nested-abort-commit.cc | 2 +- .../src/tests/big-nested-commit-abort.cc | 2 +- .../src/tests/big-nested-commit-commit.cc | 2 +- .../tokudb/ft-index/src/tests/big-shutdown.cc | 2 +- storage/tokudb/ft-index/src/tests/bigtxn27.cc | 2 +- storage/tokudb/ft-index/src/tests/blackhole.cc | 2 +- .../ft-index/src/tests/blocking-first-empty.cc | 2 +- .../ft-index/src/tests/blocking-first.cc | 2 +- .../tokudb/ft-index/src/tests/blocking-last.cc | 2 +- .../src/tests/blocking-next-prev-deadlock.cc | 2 +- .../ft-index/src/tests/blocking-next-prev.cc | 2 +- .../src/tests/blocking-prelock-range.cc | 2 +- .../ft-index/src/tests/blocking-put-timeout.cc | 2 +- .../ft-index/src/tests/blocking-put-wakeup.cc | 2 +- .../tokudb/ft-index/src/tests/blocking-put.cc | 2 +- .../ft-index/src/tests/blocking-set-range-0.cc | 2 +- .../ft-index/src/tests/blocking-set-range-n.cc | 2 +- .../src/tests/blocking-set-range-reverse-0.cc | 2 +- .../tokudb/ft-index/src/tests/blocking-set.cc | 2 +- .../ft-index/src/tests/blocking-table-lock.cc | 2 +- storage/tokudb/ft-index/src/tests/bug1381.cc | 2 +- .../ft-index/src/tests/cachetable-race.cc | 2 +- .../tokudb/ft-index/src/tests/checkpoint1.cc | 2 +- .../ft-index/src/tests/checkpoint_fairness.cc | 2 +- .../ft-index/src/tests/checkpoint_stress.cc | 2 +- .../ft-index/src/tests/checkpoint_test.h | 2 +- .../ft-index/src/tests/create-datadir.cc | 2 +- .../ft-index/src/tests/cursor-isolation.cc | 2 +- .../tests/cursor-more-than-a-leaf-provdel.cc | 2 +- .../ft-index/src/tests/cursor-set-del-rmw.cc | 2 +- .../ft-index/src/tests/cursor-set-range-rmw.cc | 2 +- .../src/tests/cursor-step-over-delete.cc | 2 +- .../tests/db-put-simple-deadlock-threads.cc | 2 +- .../src/tests/db-put-simple-deadlock.cc | 2 +- .../src/tests/db-put-simple-lockwait.cc | 2 +- .../src/tests/db-put-update-deadlock.cc | 2 +- .../src/tests/dbremove-nofile-limit.cc | 2 +- .../src/tests/del-multiple-huge-primary-row.cc | 2 +- .../ft-index/src/tests/del-multiple-srcdb.cc | 2 +- .../tokudb/ft-index/src/tests/del-multiple.cc | 2 +- .../tokudb/ft-index/src/tests/del-simple.cc | 2 +- .../ft-index/src/tests/directory_lock.cc | 2 +- storage/tokudb/ft-index/src/tests/diskfull.cc | 2 +- storage/tokudb/ft-index/src/tests/dump-env.cc | 2 +- .../ft-index/src/tests/env-put-multiple.cc | 2 +- .../ft-index/src/tests/env_loader_memory.cc | 2 +- storage/tokudb/ft-index/src/tests/env_nproc.cc | 2 +- .../tokudb/ft-index/src/tests/env_startup.cc | 2 +- storage/tokudb/ft-index/src/tests/filesize.cc | 2 +- .../src/tests/get_key_after_bytes_unit.cc | 2 +- .../tokudb/ft-index/src/tests/get_last_key.cc | 2 +- storage/tokudb/ft-index/src/tests/helgrind1.cc | 2 +- storage/tokudb/ft-index/src/tests/helgrind2.cc | 2 +- storage/tokudb/ft-index/src/tests/helgrind3.cc | 2 +- .../src/tests/hot-optimize-table-tests.cc | 2 +- .../tokudb/ft-index/src/tests/hotindexer-bw.cc | 2 +- .../src/tests/hotindexer-error-callback.cc | 2 +- .../hotindexer-insert-committed-optimized.cc | 2 +- .../src/tests/hotindexer-insert-committed.cc | 2 +- .../src/tests/hotindexer-insert-provisional.cc | 2 +- .../ft-index/src/tests/hotindexer-lock-test.cc | 2 +- .../src/tests/hotindexer-multiclient.cc | 2 +- .../hotindexer-nested-insert-committed.cc | 2 +- .../ft-index/src/tests/hotindexer-put-abort.cc | 2 +- .../src/tests/hotindexer-put-commit.cc | 2 +- .../src/tests/hotindexer-put-multiple.cc | 2 +- .../src/tests/hotindexer-simple-abort-put.cc | 2 +- .../src/tests/hotindexer-simple-abort.cc | 2 +- .../src/tests/hotindexer-undo-do-test.cc | 2 +- .../src/tests/hotindexer-with-queries.cc | 2 +- storage/tokudb/ft-index/src/tests/inflate.cc | 2 +- storage/tokudb/ft-index/src/tests/inflate2.cc | 2 +- .../ft-index/src/tests/insert-dup-prelock.cc | 2 +- .../src/tests/isolation-read-committed.cc | 2 +- storage/tokudb/ft-index/src/tests/isolation.cc | 2 +- storage/tokudb/ft-index/src/tests/key-val.h | 2 +- .../ft-index/src/tests/keyrange-merge.cc | 2 +- storage/tokudb/ft-index/src/tests/keyrange.cc | 2 +- .../ft-index/src/tests/last-verify-time.cc | 2 +- .../ft-index/src/tests/loader-cleanup-test.cc | 2 +- .../src/tests/loader-close-nproc-limit.cc | 2 +- .../ft-index/src/tests/loader-create-abort.cc | 2 +- .../ft-index/src/tests/loader-create-close.cc | 2 +- .../tests/loader-create-commit-nproc-limit.cc | 2 +- .../src/tests/loader-create-nproc-limit.cc | 2 +- .../ft-index/src/tests/loader-dup-test.cc | 2 +- .../ft-index/src/tests/loader-no-puts.cc | 2 +- .../src/tests/loader-reference-test.cc | 2 +- .../ft-index/src/tests/loader-stress-del.cc | 2 +- .../ft-index/src/tests/loader-stress-test.cc | 2 +- .../ft-index/src/tests/loader-tpch-load.cc | 2 +- .../src/tests/locktree_escalation_stalls.cc | 2 +- storage/tokudb/ft-index/src/tests/manyfiles.cc | 2 +- .../ft-index/src/tests/maxsize-for-loader.cc | 2 +- .../src/tests/medium-nested-commit-commit.cc | 2 +- .../tokudb/ft-index/src/tests/multiprocess.cc | 2 +- .../ft-index/src/tests/mvcc-create-table.cc | 2 +- .../ft-index/src/tests/mvcc-many-committed.cc | 2 +- .../ft-index/src/tests/mvcc-read-committed.cc | 2 +- .../ft-index/src/tests/openlimit17-locktree.cc | 2 +- .../src/tests/openlimit17-metafiles.cc | 2 +- .../tokudb/ft-index/src/tests/openlimit17.cc | 2 +- .../ft-index/src/tests/perf_checkpoint_var.cc | 2 +- .../ft-index/src/tests/perf_child_txn.cc | 2 +- .../ft-index/src/tests/perf_cursor_nop.cc | 2 +- .../tokudb/ft-index/src/tests/perf_iibench.cc | 2 +- .../tokudb/ft-index/src/tests/perf_insert.cc | 2 +- .../ft-index/src/tests/perf_malloc_free.cc | 2 +- storage/tokudb/ft-index/src/tests/perf_nop.cc | 2 +- .../tokudb/ft-index/src/tests/perf_ptquery.cc | 2 +- .../tokudb/ft-index/src/tests/perf_ptquery2.cc | 2 +- .../ft-index/src/tests/perf_rangequery.cc | 2 +- .../tokudb/ft-index/src/tests/perf_read_txn.cc | 2 +- .../src/tests/perf_read_txn_single_thread.cc | 2 +- .../ft-index/src/tests/perf_read_write.cc | 2 +- .../src/tests/perf_txn_single_thread.cc | 2 +- storage/tokudb/ft-index/src/tests/powerfail.cc | 2 +- .../ft-index/src/tests/preload-db-nested.cc | 2 +- .../tokudb/ft-index/src/tests/preload-db.cc | 2 +- .../ft-index/src/tests/prelock-read-read.cc | 2 +- .../ft-index/src/tests/prelock-read-write.cc | 2 +- .../ft-index/src/tests/prelock-write-read.cc | 2 +- .../ft-index/src/tests/prelock-write-write.cc | 2 +- .../ft-index/src/tests/print_engine_status.cc | 2 +- storage/tokudb/ft-index/src/tests/progress.cc | 2 +- .../tests/put-del-multiple-array-indexing.cc | 2 +- .../ft-index/src/tests/queries_with_deletes.cc | 2 +- .../tokudb/ft-index/src/tests/recover-2483.cc | 2 +- .../tokudb/ft-index/src/tests/recover-3113.cc | 2 +- .../tokudb/ft-index/src/tests/recover-5146.cc | 2 +- ...cover-checkpoint-fcreate-fdelete-fcreate.cc | 2 +- .../tests/recover-checkpoint-fopen-abort.cc | 2 +- .../tests/recover-checkpoint-fopen-commit.cc | 2 +- .../src/tests/recover-child-rollback.cc | 2 +- .../src/tests/recover-compare-db-descriptor.cc | 2 +- .../ft-index/src/tests/recover-compare-db.cc | 2 +- .../src/tests/recover-del-multiple-abort.cc | 2 +- .../recover-del-multiple-srcdb-fdelete-all.cc | 2 +- .../ft-index/src/tests/recover-del-multiple.cc | 2 +- .../tests/recover-delboth-after-checkpoint.cc | 2 +- .../src/tests/recover-delboth-checkpoint.cc | 2 +- .../ft-index/src/tests/recover-descriptor.cc | 2 +- .../ft-index/src/tests/recover-descriptor10.cc | 2 +- .../ft-index/src/tests/recover-descriptor11.cc | 2 +- .../ft-index/src/tests/recover-descriptor12.cc | 2 +- .../ft-index/src/tests/recover-descriptor2.cc | 2 +- .../ft-index/src/tests/recover-descriptor3.cc | 2 +- .../ft-index/src/tests/recover-descriptor4.cc | 2 +- .../ft-index/src/tests/recover-descriptor5.cc | 2 +- .../ft-index/src/tests/recover-descriptor6.cc | 2 +- .../ft-index/src/tests/recover-descriptor7.cc | 2 +- .../ft-index/src/tests/recover-descriptor8.cc | 2 +- .../ft-index/src/tests/recover-descriptor9.cc | 2 +- .../ft-index/src/tests/recover-fassociate.cc | 2 +- .../src/tests/recover-fclose-in-checkpoint.cc | 2 +- .../tests/recover-fcreate-basementnodesize.cc | 2 +- .../src/tests/recover-fcreate-fclose.cc | 2 +- .../src/tests/recover-fcreate-fdelete.cc | 2 +- .../src/tests/recover-fcreate-nodesize.cc | 2 +- .../src/tests/recover-fcreate-xabort.cc | 2 +- .../tokudb/ft-index/src/tests/recover-flt1.cc | 2 +- .../tokudb/ft-index/src/tests/recover-flt10.cc | 2 +- .../tokudb/ft-index/src/tests/recover-flt2.cc | 2 +- .../tokudb/ft-index/src/tests/recover-flt3.cc | 2 +- .../tokudb/ft-index/src/tests/recover-flt4.cc | 2 +- .../tokudb/ft-index/src/tests/recover-flt5.cc | 2 +- .../tokudb/ft-index/src/tests/recover-flt6.cc | 2 +- .../tokudb/ft-index/src/tests/recover-flt7.cc | 2 +- .../tokudb/ft-index/src/tests/recover-flt8.cc | 2 +- .../tokudb/ft-index/src/tests/recover-flt9.cc | 2 +- .../tests/recover-fopen-checkpoint-fclose.cc | 2 +- .../tests/recover-fopen-fclose-checkpoint.cc | 2 +- ...recover-fopen-fdelete-checkpoint-fcreate.cc | 2 +- .../recover-hotindexer-simple-abort-put.cc | 2 +- .../ft-index/src/tests/recover-loader-test.cc | 2 +- .../src/tests/recover-lsn-filter-multiple.cc | 2 +- .../ft-index/src/tests/recover-lsn-filter.cc | 2 +- .../src/tests/recover-missing-dbfile-2.cc | 2 +- .../src/tests/recover-missing-dbfile.cc | 2 +- .../src/tests/recover-missing-logfile.cc | 2 +- .../src/tests/recover-put-multiple-abort.cc | 2 +- .../tests/recover-put-multiple-fdelete-all.cc | 2 +- .../tests/recover-put-multiple-fdelete-some.cc | 2 +- .../recover-put-multiple-srcdb-fdelete-all.cc | 2 +- .../ft-index/src/tests/recover-put-multiple.cc | 2 +- .../ft-index/src/tests/recover-rollback.cc | 2 +- .../ft-index/src/tests/recover-rollinclude.cc | 2 +- .../src/tests/recover-split-checkpoint.cc | 2 +- .../src/tests/recover-straddle-txn-nested.cc | 2 +- .../ft-index/src/tests/recover-straddle-txn.cc | 2 +- .../ft-index/src/tests/recover-tablelock.cc | 2 +- .../src/tests/recover-test-logsuppress-put.cc | 2 +- .../src/tests/recover-test-logsuppress.cc | 2 +- .../tokudb/ft-index/src/tests/recover-test1.cc | 2 +- .../tokudb/ft-index/src/tests/recover-test2.cc | 2 +- .../tokudb/ft-index/src/tests/recover-test3.cc | 2 +- .../recover-test_crash_in_flusher_thread.h | 2 +- .../ft-index/src/tests/recover-test_stress1.cc | 2 +- .../ft-index/src/tests/recover-test_stress2.cc | 2 +- .../ft-index/src/tests/recover-test_stress3.cc | 2 +- .../src/tests/recover-test_stress_openclose.cc | 2 +- .../src/tests/recover-update-multiple-abort.cc | 2 +- .../src/tests/recover-update-multiple.cc | 2 +- .../src/tests/recover-update_aborts.cc | 2 +- .../recover-update_aborts_before_checkpoint.cc | 2 +- .../recover-update_aborts_before_close.cc | 2 +- .../tests/recover-update_broadcast_aborts.cc | 2 +- .../tests/recover-update_broadcast_aborts2.cc | 2 +- .../tests/recover-update_broadcast_aborts3.cc | 2 +- ...pdate_broadcast_aborts_before_checkpoint.cc | 2 +- ...ver-update_broadcast_aborts_before_close.cc | 2 +- .../recover-update_broadcast_changes_values.cc | 2 +- ...recover-update_broadcast_changes_values2.cc | 2 +- ...recover-update_broadcast_changes_values3.cc | 2 +- ...oadcast_changes_values_before_checkpoint.cc | 2 +- ...te_broadcast_changes_values_before_close.cc | 2 +- .../src/tests/recover-update_changes_values.cc | 2 +- ...-update_changes_values_before_checkpoint.cc | 2 +- ...cover-update_changes_values_before_close.cc | 2 +- ...ecover-upgrade-db-descriptor-multihandle.cc | 2 +- .../src/tests/recover-upgrade-db-descriptor.cc | 2 +- .../ft-index/src/tests/recover-x1-abort.cc | 2 +- .../ft-index/src/tests/recover-x1-commit.cc | 2 +- .../src/tests/recover-x1-nested-abort.cc | 2 +- .../src/tests/recover-x1-nested-commit.cc | 2 +- .../ft-index/src/tests/recover-x2-abort.cc | 2 +- .../ft-index/src/tests/recover-x2-commit.cc | 2 +- .../src/tests/recovery_fileops_stress.cc | 2 +- .../src/tests/recovery_fileops_unit.cc | 2 +- .../ft-index/src/tests/recovery_stress.cc | 2 +- storage/tokudb/ft-index/src/tests/redirect.cc | 2 +- .../src/tests/replace-into-write-lock.cc | 2 +- .../tokudb/ft-index/src/tests/root_fifo_1.cc | 2 +- .../tokudb/ft-index/src/tests/root_fifo_2.cc | 2 +- .../tokudb/ft-index/src/tests/root_fifo_31.cc | 2 +- .../tokudb/ft-index/src/tests/root_fifo_32.cc | 2 +- .../tokudb/ft-index/src/tests/root_fifo_41.cc | 2 +- storage/tokudb/ft-index/src/tests/rowsize.cc | 2 +- storage/tokudb/ft-index/src/tests/seqinsert.cc | 2 +- .../tokudb/ft-index/src/tests/shutdown-3344.cc | 2 +- storage/tokudb/ft-index/src/tests/simple.cc | 2 +- .../src/tests/stat64-create-modify-times.cc | 2 +- .../ft-index/src/tests/stat64-null-txn.cc | 2 +- .../ft-index/src/tests/stat64-root-changes.cc | 2 +- storage/tokudb/ft-index/src/tests/stat64.cc | 2 +- storage/tokudb/ft-index/src/tests/stress-gc.cc | 2 +- .../tokudb/ft-index/src/tests/stress-gc2.cc | 2 +- .../tokudb/ft-index/src/tests/stress-test.cc | 2 +- .../ft-index/src/tests/stress_openclose.h | 2 +- storage/tokudb/ft-index/src/tests/test-5138.cc | 2 +- .../src/tests/test-nested-xopen-eclose.cc | 2 +- .../tokudb/ft-index/src/tests/test-prepare.cc | 2 +- .../tokudb/ft-index/src/tests/test-prepare2.cc | 2 +- .../tokudb/ft-index/src/tests/test-prepare3.cc | 2 +- .../ft-index/src/tests/test-rollinclude.cc | 2 +- .../ft-index/src/tests/test-xa-prepare.cc | 2 +- .../ft-index/src/tests/test-xopen-eclose.cc | 2 +- storage/tokudb/ft-index/src/tests/test.h | 2 +- storage/tokudb/ft-index/src/tests/test1572.cc | 2 +- storage/tokudb/ft-index/src/tests/test1753.cc | 2 +- storage/tokudb/ft-index/src/tests/test1842.cc | 2 +- storage/tokudb/ft-index/src/tests/test3039.cc | 2 +- storage/tokudb/ft-index/src/tests/test3219.cc | 2 +- storage/tokudb/ft-index/src/tests/test3522.cc | 2 +- storage/tokudb/ft-index/src/tests/test3522b.cc | 2 +- storage/tokudb/ft-index/src/tests/test3529.cc | 2 +- .../ft-index/src/tests/test4573-logtrim.cc | 2 +- storage/tokudb/ft-index/src/tests/test5092.cc | 2 +- storage/tokudb/ft-index/src/tests/test938.cc | 2 +- storage/tokudb/ft-index/src/tests/test938b.cc | 2 +- storage/tokudb/ft-index/src/tests/test938c.cc | 2 +- .../ft-index/src/tests/test_3529_insert_2.cc | 2 +- .../ft-index/src/tests/test_3529_table_lock.cc | 2 +- storage/tokudb/ft-index/src/tests/test_3645.cc | 2 +- storage/tokudb/ft-index/src/tests/test_3755.cc | 2 +- storage/tokudb/ft-index/src/tests/test_4015.cc | 2 +- storage/tokudb/ft-index/src/tests/test_4368.cc | 2 +- storage/tokudb/ft-index/src/tests/test_4657.cc | 2 +- storage/tokudb/ft-index/src/tests/test_5015.cc | 2 +- storage/tokudb/ft-index/src/tests/test_5469.cc | 2 +- storage/tokudb/ft-index/src/tests/test_789.cc | 2 +- storage/tokudb/ft-index/src/tests/test_935.cc | 2 +- .../tokudb/ft-index/src/tests/test_abort1.cc | 2 +- .../tokudb/ft-index/src/tests/test_abort2.cc | 2 +- .../tokudb/ft-index/src/tests/test_abort3.cc | 2 +- .../tokudb/ft-index/src/tests/test_abort4.cc | 2 +- .../tokudb/ft-index/src/tests/test_abort5.cc | 2 +- .../src/tests/test_abort_delete_first.cc | 2 +- .../tokudb/ft-index/src/tests/test_archive0.cc | 2 +- .../tokudb/ft-index/src/tests/test_archive1.cc | 2 +- .../tokudb/ft-index/src/tests/test_archive2.cc | 2 +- .../src/tests/test_bad_implicit_promotion.cc | 2 +- .../src/tests/test_blobs_leaf_split.cc | 2 +- .../ft-index/src/tests/test_bulk_fetch.cc | 2 +- .../ft-index/src/tests/test_cachesize.cc | 2 +- .../ft-index/src/tests/test_cmp_descriptor.cc | 2 +- .../src/tests/test_compression_methods.cc | 2 +- .../tokudb/ft-index/src/tests/test_cursor_2.cc | 2 +- .../tokudb/ft-index/src/tests/test_cursor_3.cc | 2 +- .../src/tests/test_cursor_DB_NEXT_no_dup.cc | 2 +- .../src/tests/test_cursor_db_current.cc | 2 +- .../ft-index/src/tests/test_cursor_delete2.cc | 2 +- .../ft-index/src/tests/test_cursor_flags.cc | 2 +- .../src/tests/test_cursor_interrupt.cc | 2 +- .../src/tests/test_cursor_nonleaf_expand.cc | 2 +- .../ft-index/src/tests/test_cursor_null.cc | 2 +- .../src/tests/test_cursor_stickyness.cc | 2 +- .../src/tests/test_cursor_with_read_txn.cc | 2 +- .../src/tests/test_db_already_exists.cc | 2 +- .../src/tests/test_db_change_pagesize.cc | 2 +- .../ft-index/src/tests/test_db_change_xxx.cc | 2 +- .../src/tests/test_db_close_no_open.cc | 2 +- .../src/tests/test_db_current_clobbers_db.cc | 2 +- .../src/tests/test_db_dbt_mem_behavior.cc | 2 +- .../ft-index/src/tests/test_db_delete.cc | 2 +- .../ft-index/src/tests/test_db_descriptor.cc | 2 +- .../src/tests/test_db_env_open_close.cc | 2 +- .../src/tests/test_db_env_open_nocreate.cc | 2 +- .../src/tests/test_db_env_open_open_close.cc | 2 +- .../src/tests/test_db_env_set_errpfx.cc | 2 +- .../src/tests/test_db_env_set_lg_dir.cc | 2 +- .../src/tests/test_db_env_set_tmp_dir.cc | 2 +- .../src/tests/test_db_env_strdup_null.cc | 2 +- .../src/tests/test_db_get_put_flags.cc | 2 +- .../src/tests/test_db_named_delete_last.cc | 2 +- .../ft-index/src/tests/test_db_no_env.cc | 2 +- .../src/tests/test_db_open_notexist_reopen.cc | 2 +- .../ft-index/src/tests/test_db_remove.cc | 2 +- .../ft-index/src/tests/test_db_remove_subdb.cc | 2 +- .../ft-index/src/tests/test_db_set_flags.cc | 2 +- .../tokudb/ft-index/src/tests/test_db_subdb.cc | 2 +- .../src/tests/test_db_subdb_different_flags.cc | 2 +- .../tests/test_db_txn_locks_nonheaviside.cc | 2 +- .../test_db_txn_locks_read_uncommitted.cc | 2 +- .../ft-index/src/tests/test_db_version.cc | 2 +- .../ft-index/src/tests/test_env_close_flags.cc | 2 +- .../src/tests/test_env_create_db_create.cc | 2 +- .../ft-index/src/tests/test_env_open_flags.cc | 2 +- .../test_equal_keys_with_different_bytes.cc | 2 +- .../tokudb/ft-index/src/tests/test_error.cc | 2 +- .../tokudb/ft-index/src/tests/test_forkjoin.cc | 2 +- .../src/tests/test_get_max_row_size.cc | 2 +- .../ft-index/src/tests/test_get_zeroed_dbt.cc | 2 +- .../src/tests/test_groupcommit_count.cc | 2 +- .../src/tests/test_groupcommit_perf.cc | 2 +- storage/tokudb/ft-index/src/tests/test_hsoc.cc | 2 +- .../tests/test_insert_cursor_delete_insert.cc | 2 +- .../ft-index/src/tests/test_insert_many_gc.cc | 2 +- .../ft-index/src/tests/test_insert_memleak.cc | 2 +- .../ft-index/src/tests/test_insert_unique.cc | 2 +- .../tests/test_iterate_live_transactions.cc | 2 +- .../test_iterate_pending_lock_requests.cc | 2 +- .../ft-index/src/tests/test_keylen_diff.cc | 2 +- .../tokudb/ft-index/src/tests/test_kv_gen.h | 2 +- .../ft-index/src/tests/test_kv_limits.cc | 2 +- ..._large_update_broadcast_small_cachetable.cc | 2 +- .../src/tests/test_lock_timeout_callback.cc | 2 +- .../src/tests/test_locking_with_read_txn.cc | 2 +- .../ft-index/src/tests/test_locktree_close.cc | 2 +- storage/tokudb/ft-index/src/tests/test_log0.cc | 2 +- storage/tokudb/ft-index/src/tests/test_log1.cc | 2 +- .../tokudb/ft-index/src/tests/test_log10.cc | 2 +- .../ft-index/src/tests/test_log1_abort.cc | 2 +- storage/tokudb/ft-index/src/tests/test_log2.cc | 2 +- .../ft-index/src/tests/test_log2_abort.cc | 2 +- storage/tokudb/ft-index/src/tests/test_log3.cc | 2 +- .../ft-index/src/tests/test_log3_abort.cc | 2 +- storage/tokudb/ft-index/src/tests/test_log4.cc | 2 +- .../ft-index/src/tests/test_log4_abort.cc | 2 +- storage/tokudb/ft-index/src/tests/test_log5.cc | 2 +- .../ft-index/src/tests/test_log5_abort.cc | 2 +- storage/tokudb/ft-index/src/tests/test_log6.cc | 2 +- .../ft-index/src/tests/test_log6_abort.cc | 2 +- .../ft-index/src/tests/test_log6a_abort.cc | 2 +- storage/tokudb/ft-index/src/tests/test_log7.cc | 2 +- storage/tokudb/ft-index/src/tests/test_log8.cc | 2 +- storage/tokudb/ft-index/src/tests/test_log9.cc | 2 +- .../tokudb/ft-index/src/tests/test_logflush.cc | 2 +- .../tokudb/ft-index/src/tests/test_logmax.cc | 2 +- .../ft-index/src/tests/test_memcmp_magic.cc | 2 +- .../ft-index/src/tests/test_mostly_seq.cc | 2 +- .../test_multiple_checkpoints_block_commit.cc | 2 +- .../tokudb/ft-index/src/tests/test_nested.cc | 2 +- .../ft-index/src/tests/test_nodup_set.cc | 2 +- .../tokudb/ft-index/src/tests/test_query.cc | 2 +- .../ft-index/src/tests/test_rand_insert.cc | 2 +- .../src/tests/test_read_txn_invalid_ops.cc | 2 +- .../ft-index/src/tests/test_redirect_func.cc | 2 +- .../tokudb/ft-index/src/tests/test_restrict.cc | 2 +- .../src/tests/test_reverse_compare_fun.cc | 2 +- .../ft-index/src/tests/test_set_func_malloc.cc | 2 +- .../ft-index/src/tests/test_simple_read_txn.cc | 2 +- .../tokudb/ft-index/src/tests/test_stress0.cc | 2 +- .../tokudb/ft-index/src/tests/test_stress1.cc | 2 +- .../tokudb/ft-index/src/tests/test_stress2.cc | 2 +- .../tokudb/ft-index/src/tests/test_stress3.cc | 2 +- .../tokudb/ft-index/src/tests/test_stress4.cc | 2 +- .../tokudb/ft-index/src/tests/test_stress5.cc | 2 +- .../tokudb/ft-index/src/tests/test_stress6.cc | 2 +- .../tokudb/ft-index/src/tests/test_stress7.cc | 2 +- .../src/tests/test_stress_hot_indexing.cc | 2 +- .../src/tests/test_stress_openclose.cc | 2 +- .../src/tests/test_stress_with_verify.cc | 2 +- .../ft-index/src/tests/test_thread_flags.cc | 2 +- .../ft-index/src/tests/test_thread_insert.cc | 2 +- .../src/tests/test_trans_desc_during_chkpt.cc | 2 +- .../src/tests/test_trans_desc_during_chkpt2.cc | 2 +- .../src/tests/test_trans_desc_during_chkpt3.cc | 2 +- .../src/tests/test_trans_desc_during_chkpt4.cc | 2 +- .../src/tests/test_transactional_descriptor.cc | 2 +- .../ft-index/src/tests/test_txn_abort5.cc | 2 +- .../ft-index/src/tests/test_txn_abort5a.cc | 2 +- .../ft-index/src/tests/test_txn_abort6.cc | 2 +- .../ft-index/src/tests/test_txn_abort7.cc | 2 +- .../src/tests/test_txn_begin_commit.cc | 2 +- .../src/tests/test_txn_close_before_commit.cc | 2 +- .../test_txn_close_before_prepare_commit.cc | 2 +- .../ft-index/src/tests/test_txn_cursor_last.cc | 2 +- .../ft-index/src/tests/test_txn_nested1.cc | 2 +- .../ft-index/src/tests/test_txn_nested2.cc | 2 +- .../ft-index/src/tests/test_txn_nested3.cc | 2 +- .../ft-index/src/tests/test_txn_nested4.cc | 2 +- .../ft-index/src/tests/test_txn_nested5.cc | 2 +- .../src/tests/test_txn_nested_abort.cc | 2 +- .../src/tests/test_txn_nested_abort2.cc | 2 +- .../src/tests/test_txn_nested_abort3.cc | 2 +- .../src/tests/test_txn_nested_abort4.cc | 2 +- .../ft-index/src/tests/test_txn_recover3.cc | 2 +- .../src/tests/test_unused_memory_crash.cc | 2 +- .../src/tests/test_update_abort_works.cc | 2 +- .../tests/test_update_broadcast_abort_works.cc | 2 +- .../tests/test_update_broadcast_calls_back.cc | 2 +- ...est_update_broadcast_can_delete_elements.cc | 2 +- .../test_update_broadcast_changes_values.cc | 2 +- .../src/tests/test_update_broadcast_indexer.cc | 2 +- .../src/tests/test_update_broadcast_loader.cc | 2 +- .../test_update_broadcast_nested_updates.cc | 2 +- ...test_update_broadcast_previously_deleted.cc | 2 +- .../src/tests/test_update_broadcast_stress.cc | 2 +- ..._update_broadcast_update_fun_has_choices.cc | 2 +- .../test_update_broadcast_with_empty_table.cc | 2 +- .../src/tests/test_update_calls_back.cc | 2 +- .../tests/test_update_can_delete_elements.cc | 2 +- .../src/tests/test_update_changes_values.cc | 2 +- .../src/tests/test_update_nested_updates.cc | 2 +- .../src/tests/test_update_nonexistent_keys.cc | 2 +- .../tests/test_update_previously_deleted.cc | 2 +- .../ft-index/src/tests/test_update_stress.cc | 2 +- ...t_update_txn_snapshot_works_concurrently.cc | 2 +- ...xn_snapshot_works_correctly_with_deletes.cc | 2 +- .../src/tests/test_update_with_empty_table.cc | 2 +- .../src/tests/test_updates_single_key.cc | 2 +- .../ft-index/src/tests/test_weakxaction.cc | 2 +- .../src/tests/test_zero_length_keys.cc | 2 +- .../src/tests/threaded_stress_test_helpers.h | 2 +- .../ft-index/src/tests/time_create_db.cc | 2 +- .../src/tests/transactional_fileops.cc | 2 +- .../src/tests/update-multiple-data-diagonal.cc | 2 +- .../ft-index/src/tests/update-multiple-key0.cc | 2 +- .../src/tests/update-multiple-nochange.cc | 2 +- .../update-multiple-with-indexer-array.cc | 2 +- .../src/tests/update-multiple-with-indexer.cc | 2 +- storage/tokudb/ft-index/src/tests/update.cc | 2 +- .../ft-index/src/tests/upgrade-test-1.cc | 2 +- .../ft-index/src/tests/upgrade-test-2.cc | 2 +- .../ft-index/src/tests/upgrade-test-3.cc | 2 +- .../ft-index/src/tests/upgrade-test-4.cc | 2 +- .../ft-index/src/tests/upgrade-test-5.cc | 2 +- .../ft-index/src/tests/upgrade-test-6.cc | 2 +- .../ft-index/src/tests/upgrade-test-7.cc | 2 +- .../ft-index/src/tests/upgrade_simple.cc | 2 +- .../ft-index/src/tests/xa-dirty-commit.cc | 2 +- .../ft-index/src/tests/xa-dirty-rollback.cc | 2 +- .../ft-index/src/tests/xa-txn-discard-abort.cc | 2 +- .../src/tests/xa-txn-discard-commit.cc | 2 +- storage/tokudb/ft-index/src/tests/zombie_db.cc | 2 +- storage/tokudb/ft-index/src/toku_patent.cc | 4 ++-- storage/tokudb/ft-index/src/ydb-internal.h | 2 +- storage/tokudb/ft-index/src/ydb.cc | 2 +- storage/tokudb/ft-index/src/ydb.h | 2 +- storage/tokudb/ft-index/src/ydb_cursor.cc | 2 +- storage/tokudb/ft-index/src/ydb_cursor.h | 2 +- storage/tokudb/ft-index/src/ydb_db.cc | 2 +- storage/tokudb/ft-index/src/ydb_db.h | 2 +- storage/tokudb/ft-index/src/ydb_env_func.cc | 2 +- storage/tokudb/ft-index/src/ydb_env_func.h | 2 +- storage/tokudb/ft-index/src/ydb_lib.cc | 2 +- storage/tokudb/ft-index/src/ydb_load.h | 2 +- storage/tokudb/ft-index/src/ydb_row_lock.cc | 2 +- storage/tokudb/ft-index/src/ydb_row_lock.h | 2 +- storage/tokudb/ft-index/src/ydb_txn.cc | 2 +- storage/tokudb/ft-index/src/ydb_txn.h | 2 +- storage/tokudb/ft-index/src/ydb_write.cc | 2 +- storage/tokudb/ft-index/src/ydb_write.h | 2 +- .../third_party/xz-4.999.9beta/COPYING.GPLv2 | 4 ++-- .../xz-4.999.9beta/COPYING.LGPLv2.1 | 4 ++-- .../xz-4.999.9beta/build-aux/config.guess | 2 +- .../xz-4.999.9beta/build-aux/config.sub | 2 +- .../xz-4.999.9beta/build-aux/ltmain.sh | 2 +- .../third_party/xz-4.999.9beta/configure | 2 +- .../third_party/xz-4.999.9beta/lib/getopt.c | 2 +- .../third_party/xz-4.999.9beta/lib/getopt.in.h | 2 +- .../third_party/xz-4.999.9beta/lib/getopt1.c | 2 +- .../xz-4.999.9beta/lib/getopt_int.h | 2 +- .../third_party/xz-4.999.9beta/m4/libtool.m4 | 2 +- storage/tokudb/ft-index/tools/ba_replay.cc | 2 +- storage/tokudb/ft-index/tools/ftverify.cc | 2 +- storage/tokudb/ft-index/tools/tdb-recover.cc | 2 +- storage/tokudb/ft-index/tools/tokudb_dump.cc | 2 +- .../tokudb/ft-index/tools/tokuft_logprint.cc | 2 +- storage/tokudb/ft-index/tools/tokuftdump.cc | 2 +- storage/tokudb/ft-index/util/bytestring.h | 2 +- .../tokudb/ft-index/util/circular_buffer.cc | 2 +- storage/tokudb/ft-index/util/circular_buffer.h | 2 +- storage/tokudb/ft-index/util/constexpr.h | 2 +- storage/tokudb/ft-index/util/context.cc | 2 +- storage/tokudb/ft-index/util/context.h | 2 +- storage/tokudb/ft-index/util/dbt.cc | 2 +- storage/tokudb/ft-index/util/dbt.h | 2 +- storage/tokudb/ft-index/util/dmt.cc | 2 +- storage/tokudb/ft-index/util/dmt.h | 2 +- .../tokudb/ft-index/util/doubly_linked_list.h | 2 +- storage/tokudb/ft-index/util/frwlock.cc | 2 +- storage/tokudb/ft-index/util/frwlock.h | 2 +- storage/tokudb/ft-index/util/growable_array.h | 2 +- storage/tokudb/ft-index/util/kibbutz.cc | 2 +- storage/tokudb/ft-index/util/kibbutz.h | 2 +- storage/tokudb/ft-index/util/memarena.cc | 2 +- storage/tokudb/ft-index/util/memarena.h | 2 +- storage/tokudb/ft-index/util/mempool.cc | 2 +- storage/tokudb/ft-index/util/mempool.h | 2 +- storage/tokudb/ft-index/util/minicron.cc | 2 +- storage/tokudb/ft-index/util/minicron.h | 2 +- storage/tokudb/ft-index/util/nb_mutex.h | 2 +- storage/tokudb/ft-index/util/omt.cc | 2 +- storage/tokudb/ft-index/util/omt.h | 2 +- .../ft-index/util/partitioned_counter.cc | 2 +- .../tokudb/ft-index/util/partitioned_counter.h | 2 +- storage/tokudb/ft-index/util/queue.cc | 2 +- storage/tokudb/ft-index/util/queue.h | 2 +- storage/tokudb/ft-index/util/rwlock.h | 2 +- storage/tokudb/ft-index/util/scoped_malloc.cc | 2 +- storage/tokudb/ft-index/util/scoped_malloc.h | 2 +- storage/tokudb/ft-index/util/sort.h | 2 +- storage/tokudb/ft-index/util/status.h | 2 +- .../ft-index/util/tests/marked-omt-test.cc | 2 +- .../ft-index/util/tests/memarena-test.cc | 2 +- .../ft-index/util/tests/minicron-test.cc | 2 +- storage/tokudb/ft-index/util/tests/omt-test.cc | 2 +- .../ft-index/util/tests/omt-tmpl-test.cc | 2 +- .../tokudb/ft-index/util/tests/queue-test.cc | 2 +- .../ft-index/util/tests/rwlock_condvar.h | 2 +- storage/tokudb/ft-index/util/tests/sm-basic.cc | 2 +- .../util/tests/sm-crash-double-free.cc | 2 +- .../ft-index/util/tests/sort-tmpl-test.cc | 2 +- .../tokudb/ft-index/util/tests/test-kibbutz.cc | 2 +- .../ft-index/util/tests/test-kibbutz2.cc | 2 +- .../util/tests/test-rwlock-cheapness.cc | 2 +- .../tokudb/ft-index/util/tests/test-rwlock.cc | 2 +- storage/tokudb/ft-index/util/tests/test.h | 2 +- .../util/tests/test_circular_buffer.cc | 2 +- .../util/tests/test_doubly_linked_list.cc | 2 +- .../util/tests/test_partitioned_counter.cc | 2 +- .../tests/test_partitioned_counter_5833.cc | 2 +- .../util/tests/threadpool-nproc-limit.cc | 2 +- .../ft-index/util/tests/threadpool-test.cc | 2 +- .../ft-index/util/tests/threadpool-testrunf.cc | 2 +- .../tokudb/ft-index/util/tests/x1764-test.cc | 2 +- storage/tokudb/ft-index/util/threadpool.cc | 2 +- storage/tokudb/ft-index/util/threadpool.h | 2 +- storage/tokudb/ft-index/util/x1764.cc | 2 +- storage/tokudb/ft-index/util/x1764.h | 2 +- storage/tokudb/ha_tokudb.cc | 2 +- storage/tokudb/ha_tokudb.h | 2 +- storage/tokudb/ha_tokudb_admin.cc | 2 +- storage/tokudb/ha_tokudb_alter_55.cc | 2 +- storage/tokudb/ha_tokudb_alter_56.cc | 2 +- storage/tokudb/ha_tokudb_alter_common.cc | 2 +- storage/tokudb/ha_tokudb_mrr_maria.cc | 2 +- storage/tokudb/ha_tokudb_mrr_mysql.cc | 2 +- storage/tokudb/ha_tokudb_update.cc | 2 +- storage/tokudb/hatoku_cmp.cc | 2 +- storage/tokudb/hatoku_cmp.h | 2 +- storage/tokudb/hatoku_defines.h | 2 +- storage/tokudb/hatoku_hton.cc | 2 +- storage/tokudb/hatoku_hton.h | 2 +- storage/tokudb/tests/card_1.cc | 2 +- storage/tokudb/tests/card_etime.cc | 2 +- storage/tokudb/tests/card_inf.cc | 2 +- storage/tokudb/tests/card_inf_1.cc | 2 +- storage/tokudb/tests/card_random_1.cc | 2 +- storage/tokudb/tests/card_test.cc | 2 +- storage/tokudb/tests/card_test_alter.cc | 2 +- storage/tokudb/tests/card_test_key_info.cc | 2 +- storage/tokudb/tests/fake_mysql.h | 2 +- storage/tokudb/tests/math_test_int.cc | 2 +- storage/tokudb/tests/math_test_uint.cc | 2 +- storage/tokudb/tests/max_test.cc | 2 +- storage/tokudb/tests/sint_test.cc | 2 +- storage/tokudb/tests/tokudb_buffer_test.cc | 2 +- storage/tokudb/tests/uint_test.cc | 2 +- storage/tokudb/tests/vlq_test.cc | 2 +- storage/tokudb/tests/vlq_test_uint32.cc | 2 +- storage/tokudb/tests/vlq_test_uint64.cc | 2 +- storage/tokudb/tokudb_buffer.h | 2 +- storage/tokudb/tokudb_card.h | 2 +- storage/tokudb/tokudb_math.h | 2 +- storage/tokudb/tokudb_status.h | 2 +- storage/tokudb/tokudb_update_fun.cc | 2 +- storage/tokudb/tokudb_vlq.h | 2 +- storage/xtradb/CMakeLists.txt | 2 +- storage/xtradb/btr/btr0pcur.c | 2 +- storage/xtradb/btr/btr0sea.c | 2 +- storage/xtradb/buf/buf0buddy.c | 2 +- storage/xtradb/buf/buf0buf.c | 2 +- storage/xtradb/buf/buf0flu.c | 2 +- storage/xtradb/buf/buf0lru.c | 2 +- storage/xtradb/buf/buf0rea.c | 2 +- storage/xtradb/data/data0data.c | 2 +- storage/xtradb/data/data0type.c | 2 +- storage/xtradb/dict/dict0boot.c | 2 +- storage/xtradb/dict/dict0crea.c | 2 +- storage/xtradb/dict/dict0load.c | 2 +- storage/xtradb/dict/dict0mem.c | 2 +- storage/xtradb/eval/eval0eval.c | 2 +- storage/xtradb/eval/eval0proc.c | 2 +- storage/xtradb/fil/fil0fil.c | 2 +- storage/xtradb/fut/fut0fut.c | 2 +- storage/xtradb/fut/fut0lst.c | 2 +- storage/xtradb/ha/ha0ha.c | 2 +- storage/xtradb/ha/ha0storage.c | 2 +- storage/xtradb/ha/hash0hash.c | 2 +- storage/xtradb/handler/ha_innodb.h | 2 +- storage/xtradb/handler/i_s.cc | 2 +- storage/xtradb/handler/i_s.h | 2 +- storage/xtradb/include/btr0btr.ic | 2 +- storage/xtradb/include/btr0pcur.h | 2 +- storage/xtradb/include/btr0pcur.ic | 2 +- storage/xtradb/include/btr0sea.h | 2 +- storage/xtradb/include/btr0sea.ic | 2 +- storage/xtradb/include/btr0types.h | 2 +- storage/xtradb/include/buf0buddy.h | 2 +- storage/xtradb/include/buf0buddy.ic | 2 +- storage/xtradb/include/buf0flu.h | 2 +- storage/xtradb/include/buf0flu.ic | 2 +- storage/xtradb/include/buf0lru.h | 2 +- storage/xtradb/include/buf0lru.ic | 2 +- storage/xtradb/include/buf0rea.h | 2 +- storage/xtradb/include/buf0types.h | 2 +- storage/xtradb/include/data0data.h | 2 +- storage/xtradb/include/data0data.ic | 2 +- storage/xtradb/include/data0type.h | 2 +- storage/xtradb/include/data0type.ic | 2 +- storage/xtradb/include/data0types.h | 2 +- storage/xtradb/include/dict0boot.h | 2 +- storage/xtradb/include/dict0boot.ic | 2 +- storage/xtradb/include/dict0crea.h | 2 +- storage/xtradb/include/dict0crea.ic | 2 +- storage/xtradb/include/dict0load.h | 2 +- storage/xtradb/include/dict0load.ic | 2 +- storage/xtradb/include/dict0mem.ic | 2 +- storage/xtradb/include/dict0types.h | 2 +- storage/xtradb/include/eval0eval.h | 2 +- storage/xtradb/include/eval0eval.ic | 2 +- storage/xtradb/include/eval0proc.h | 2 +- storage/xtradb/include/eval0proc.ic | 2 +- storage/xtradb/include/fil0fil.h | 2 +- storage/xtradb/include/fsp0types.h | 2 +- storage/xtradb/include/fut0fut.h | 2 +- storage/xtradb/include/fut0fut.ic | 2 +- storage/xtradb/include/fut0lst.h | 2 +- storage/xtradb/include/fut0lst.ic | 2 +- storage/xtradb/include/ha0ha.h | 2 +- storage/xtradb/include/ha0ha.ic | 2 +- storage/xtradb/include/ha0storage.h | 2 +- storage/xtradb/include/ha0storage.ic | 2 +- storage/xtradb/include/ha_prototypes.h | 2 +- storage/xtradb/include/handler0alter.h | 2 +- storage/xtradb/include/hash0hash.h | 2 +- storage/xtradb/include/hash0hash.ic | 2 +- storage/xtradb/include/ibuf0ibuf.h | 2 +- storage/xtradb/include/ibuf0ibuf.ic | 2 +- storage/xtradb/include/ibuf0types.h | 2 +- storage/xtradb/include/lock0iter.h | 2 +- storage/xtradb/include/lock0lock.h | 2 +- storage/xtradb/include/lock0lock.ic | 2 +- storage/xtradb/include/lock0priv.h | 2 +- storage/xtradb/include/lock0priv.ic | 2 +- storage/xtradb/include/lock0types.h | 2 +- storage/xtradb/include/log0log.ic | 2 +- storage/xtradb/include/log0online.h | 2 +- storage/xtradb/include/log0recv.h | 2 +- storage/xtradb/include/log0recv.ic | 2 +- storage/xtradb/include/mach0data.h | 2 +- storage/xtradb/include/mach0data.ic | 2 +- storage/xtradb/include/mem0dbg.h | 2 +- storage/xtradb/include/mem0dbg.ic | 2 +- storage/xtradb/include/mem0mem.h | 2 +- storage/xtradb/include/mem0mem.ic | 2 +- storage/xtradb/include/mem0pool.h | 2 +- storage/xtradb/include/mem0pool.ic | 2 +- storage/xtradb/include/mtr0log.h | 2 +- storage/xtradb/include/mtr0log.ic | 2 +- storage/xtradb/include/mtr0types.h | 2 +- storage/xtradb/include/os0file.h | 2 +- storage/xtradb/include/os0file.ic | 2 +- storage/xtradb/include/os0proc.h | 2 +- storage/xtradb/include/os0proc.ic | 2 +- storage/xtradb/include/os0stacktrace.h | 2 +- storage/xtradb/include/os0sync.h | 2 +- storage/xtradb/include/os0sync.ic | 2 +- storage/xtradb/include/os0thread.h | 2 +- storage/xtradb/include/os0thread.ic | 2 +- storage/xtradb/include/page0cur.h | 2 +- storage/xtradb/include/page0cur.ic | 2 +- storage/xtradb/include/page0types.h | 2 +- storage/xtradb/include/page0zip.h | 2 +- storage/xtradb/include/page0zip.ic | 2 +- storage/xtradb/include/pars0grm.h | 2 +- storage/xtradb/include/pars0opt.h | 2 +- storage/xtradb/include/pars0opt.ic | 2 +- storage/xtradb/include/pars0pars.h | 2 +- storage/xtradb/include/pars0pars.ic | 2 +- storage/xtradb/include/pars0sym.h | 2 +- storage/xtradb/include/pars0sym.ic | 2 +- storage/xtradb/include/pars0types.h | 2 +- storage/xtradb/include/que0que.h | 2 +- storage/xtradb/include/que0que.ic | 2 +- storage/xtradb/include/que0types.h | 2 +- storage/xtradb/include/read0read.h | 2 +- storage/xtradb/include/read0read.ic | 2 +- storage/xtradb/include/read0types.h | 2 +- storage/xtradb/include/rem0cmp.h | 2 +- storage/xtradb/include/rem0cmp.ic | 2 +- storage/xtradb/include/rem0rec.h | 2 +- storage/xtradb/include/rem0rec.ic | 2 +- storage/xtradb/include/rem0types.h | 2 +- storage/xtradb/include/row0ext.h | 2 +- storage/xtradb/include/row0ext.ic | 2 +- storage/xtradb/include/row0ins.h | 2 +- storage/xtradb/include/row0ins.ic | 2 +- storage/xtradb/include/row0merge.h | 2 +- storage/xtradb/include/row0mysql.h | 2 +- storage/xtradb/include/row0mysql.ic | 2 +- storage/xtradb/include/row0purge.h | 2 +- storage/xtradb/include/row0purge.ic | 2 +- storage/xtradb/include/row0row.h | 2 +- storage/xtradb/include/row0row.ic | 2 +- storage/xtradb/include/row0sel.h | 2 +- storage/xtradb/include/row0sel.ic | 2 +- storage/xtradb/include/row0types.h | 2 +- storage/xtradb/include/row0uins.h | 2 +- storage/xtradb/include/row0uins.ic | 2 +- storage/xtradb/include/row0umod.h | 2 +- storage/xtradb/include/row0umod.ic | 2 +- storage/xtradb/include/row0undo.h | 2 +- storage/xtradb/include/row0undo.ic | 2 +- storage/xtradb/include/row0upd.h | 2 +- storage/xtradb/include/row0upd.ic | 2 +- storage/xtradb/include/row0vers.h | 2 +- storage/xtradb/include/row0vers.ic | 2 +- storage/xtradb/include/srv0srv.h | 2 +- storage/xtradb/include/srv0srv.ic | 2 +- storage/xtradb/include/srv0start.h | 2 +- storage/xtradb/include/sync0arr.h | 2 +- storage/xtradb/include/sync0arr.ic | 2 +- storage/xtradb/include/sync0rw.h | 2 +- storage/xtradb/include/sync0rw.ic | 2 +- storage/xtradb/include/sync0sync.ic | 2 +- storage/xtradb/include/sync0types.h | 2 +- storage/xtradb/include/trx0i_s.h | 2 +- storage/xtradb/include/trx0purge.h | 2 +- storage/xtradb/include/trx0purge.ic | 2 +- storage/xtradb/include/trx0rec.h | 2 +- storage/xtradb/include/trx0roll.h | 2 +- storage/xtradb/include/trx0roll.ic | 2 +- storage/xtradb/include/trx0rseg.h | 2 +- storage/xtradb/include/trx0rseg.ic | 2 +- storage/xtradb/include/trx0sys.h | 2 +- storage/xtradb/include/trx0sys.ic | 2 +- storage/xtradb/include/trx0trx.h | 2 +- storage/xtradb/include/trx0trx.ic | 2 +- storage/xtradb/include/trx0types.h | 2 +- storage/xtradb/include/trx0undo.ic | 2 +- storage/xtradb/include/trx0xa.h | 2 +- storage/xtradb/include/univ.i | 2 +- storage/xtradb/include/usr0sess.h | 2 +- storage/xtradb/include/usr0sess.ic | 2 +- storage/xtradb/include/usr0types.h | 2 +- storage/xtradb/include/ut0bh.h | 2 +- storage/xtradb/include/ut0bh.ic | 2 +- storage/xtradb/include/ut0byte.h | 2 +- storage/xtradb/include/ut0byte.ic | 2 +- storage/xtradb/include/ut0dbg.h | 2 +- storage/xtradb/include/ut0list.h | 2 +- storage/xtradb/include/ut0list.ic | 2 +- storage/xtradb/include/ut0lst.h | 2 +- storage/xtradb/include/ut0mem.h | 2 +- storage/xtradb/include/ut0mem.ic | 2 +- storage/xtradb/include/ut0rbt.h | 2 +- storage/xtradb/include/ut0rnd.h | 2 +- storage/xtradb/include/ut0rnd.ic | 2 +- storage/xtradb/include/ut0sort.h | 2 +- storage/xtradb/include/ut0ut.h | 2 +- storage/xtradb/include/ut0ut.ic | 2 +- storage/xtradb/include/ut0vec.h | 2 +- storage/xtradb/include/ut0vec.ic | 2 +- storage/xtradb/include/ut0wqueue.h | 2 +- storage/xtradb/lock/lock0iter.c | 2 +- storage/xtradb/lock/lock0lock.c | 2 +- storage/xtradb/log/log0online.c | 2 +- storage/xtradb/log/log0recv.c | 2 +- storage/xtradb/mach/mach0data.c | 2 +- storage/xtradb/mem/mem0dbg.c | 2 +- storage/xtradb/mem/mem0mem.c | 2 +- storage/xtradb/mem/mem0pool.c | 2 +- storage/xtradb/mtr/mtr0log.c | 2 +- storage/xtradb/os/os0file.c | 2 +- storage/xtradb/os/os0proc.c | 2 +- storage/xtradb/os/os0stacktrace.c | 2 +- storage/xtradb/os/os0sync.c | 2 +- storage/xtradb/os/os0thread.c | 2 +- storage/xtradb/page/page0zip.c | 2 +- storage/xtradb/pars/lexyy.c | 2 +- storage/xtradb/pars/make_bison.sh | 2 +- storage/xtradb/pars/make_flex.sh | 2 +- storage/xtradb/pars/pars0grm.c | 2 +- storage/xtradb/pars/pars0grm.y | 2 +- storage/xtradb/pars/pars0lex.l | 2 +- storage/xtradb/pars/pars0opt.c | 2 +- storage/xtradb/pars/pars0pars.c | 2 +- storage/xtradb/pars/pars0sym.c | 2 +- storage/xtradb/que/que0que.c | 2 +- storage/xtradb/read/read0read.c | 2 +- storage/xtradb/rem/rem0cmp.c | 2 +- storage/xtradb/rem/rem0rec.c | 2 +- storage/xtradb/row/row0ext.c | 2 +- storage/xtradb/row/row0merge.c | 2 +- storage/xtradb/row/row0sel.c | 2 +- storage/xtradb/row/row0uins.c | 2 +- storage/xtradb/row/row0umod.c | 2 +- storage/xtradb/row/row0undo.c | 2 +- storage/xtradb/row/row0vers.c | 2 +- storage/xtradb/srv/srv0srv.c | 2 +- storage/xtradb/srv/srv0start.c | 2 +- storage/xtradb/sync/sync0arr.c | 2 +- storage/xtradb/trx/trx0i_s.c | 2 +- storage/xtradb/trx/trx0purge.c | 2 +- storage/xtradb/trx/trx0roll.c | 2 +- storage/xtradb/trx/trx0rseg.c | 2 +- storage/xtradb/trx/trx0trx.c | 2 +- storage/xtradb/usr/usr0sess.c | 2 +- storage/xtradb/ut/ut0bh.c | 2 +- storage/xtradb/ut/ut0byte.c | 2 +- storage/xtradb/ut/ut0dbg.c | 2 +- storage/xtradb/ut/ut0list.c | 2 +- storage/xtradb/ut/ut0mem.c | 2 +- storage/xtradb/ut/ut0rbt.c | 2 +- storage/xtradb/ut/ut0rnd.c | 2 +- storage/xtradb/ut/ut0vec.c | 2 +- storage/xtradb/ut/ut0wqueue.c | 2 +- strings/CMakeLists.txt | 2 +- strings/conf_to_src.c | 4 ++-- strings/ctype-big5.c | 2 +- strings/ctype-bin.c | 2 +- strings/ctype-cp932.c | 2 +- strings/ctype-czech.c | 2 +- strings/ctype-euc_kr.c | 2 +- strings/ctype-eucjpms.c | 2 +- strings/ctype-extra.c | 2 +- strings/ctype-gb2312.c | 2 +- strings/ctype-gbk.c | 2 +- strings/ctype-latin1.c | 2 +- strings/ctype-mb.c | 2 +- strings/ctype-simple.c | 2 +- strings/ctype-sjis.c | 2 +- strings/ctype-uca.c | 2 +- strings/ctype-ucs2.c | 2 +- strings/ctype-ujis.c | 2 +- strings/ctype-utf8.c | 2 +- strings/ctype-win1250ch.c | 2 +- strings/ctype.c | 2 +- strings/decimal.c | 2 +- strings/do_ctype.c | 2 +- strings/dtoa.c | 2 +- strings/dump_map.c | 2 +- strings/my_strchr.c | 2 +- strings/my_vsnprintf.c | 2 +- strings/str_alloc.c | 2 +- strings/strmake.c | 2 +- strings/t_ctype.h | 2 +- strings/uca-dump.c | 2 +- strings/uctypedump.c | 2 +- strings/utr11-dump.c | 2 +- strings/xml.c | 2 +- support-files/CMakeLists.txt | 2 +- support-files/MacOSX/Description.plist.sh | 2 +- support-files/MacOSX/Info.plist.sh | 2 +- support-files/MacOSX/MySQLCOM | 2 +- .../MacOSX/StartupItem.Description.plist | 2 +- support-files/MacOSX/StartupItem.Info.plist | 2 +- support-files/MacOSX/StartupItem.postinstall | 2 +- .../MacOSX/StartupParameters.plist.sh | 2 +- support-files/MacOSX/mwar-wrapper | 2 +- support-files/MacOSX/mwcc-wrapper | 2 +- support-files/MacOSX/postflight.sh | 2 +- support-files/MacOSX/preflight.sh | 2 +- support-files/MySQL-shared-compat.spec.sh | 2 +- support-files/SELinux/CMakeLists.txt | 2 +- support-files/SELinux/rhel4-mysql.fc | 2 +- support-files/SELinux/rhel4-mysql.te | 2 +- support-files/config.huge.ini.sh | 2 +- support-files/config.medium.ini.sh | 2 +- support-files/config.small.ini.sh | 2 +- support-files/dtrace/locktime.d | 2 +- support-files/dtrace/query-execandqc.d | 2 +- support-files/dtrace/query-filesort-time.d | 2 +- support-files/dtrace/query-network-time.d | 2 +- support-files/dtrace/query-parse-time.d | 2 +- support-files/dtrace/query-rowops.d | 2 +- support-files/dtrace/query-time.d | 2 +- support-files/dtrace/statement-time.d | 2 +- .../dtrace/statement-type-aggregate.d | 2 +- support-files/mysql.m4 | 2 +- support-files/mysql.spec.sh | 2 +- support-files/ndb-config-2-node.ini.sh | 2 +- tests/CMakeLists.txt | 2 +- tests/big_record.pl | 2 +- tests/bug25714.c | 2 +- tests/connect_test.c | 2 +- tests/deadlock_test.c | 2 +- tests/drop_test.pl | 2 +- tests/export.pl | 2 +- tests/fork2_test.pl | 2 +- tests/fork_big.pl | 2 +- tests/fork_big2.pl | 2 +- tests/grant.pl | 2 +- tests/index_corrupt.pl | 2 +- tests/insert_and_repair.pl | 2 +- tests/insert_test.c | 2 +- tests/list_test.c | 2 +- tests/lock_test.pl | 2 +- tests/mysql_client_fw.c | 2 +- tests/mysql_client_test.c | 2 +- tests/pmail.pl | 2 +- tests/rename_test.pl | 2 +- tests/select_test.c | 2 +- tests/showdb_test.c | 2 +- tests/ssl_test.c | 2 +- tests/table_types.pl | 2 +- tests/test_delayed_insert.pl | 2 +- tests/thread_test.c | 2 +- tests/truncate.pl | 2 +- unittest/examples/CMakeLists.txt | 2 +- unittest/examples/core-t.c | 2 +- unittest/examples/no_plan-t.c | 2 +- unittest/examples/simple-t.c | 2 +- unittest/examples/skip-t.c | 2 +- unittest/examples/skip_all-t.c | 2 +- unittest/examples/todo-t.c | 2 +- unittest/my_decimal/CMakeLists.txt | 2 +- unittest/my_decimal/my_decimal-t.cc | 2 +- unittest/mysys/CMakeLists.txt | 2 +- unittest/mysys/base64-t.c | 2 +- unittest/mysys/bitmap-t.c | 2 +- unittest/mysys/dynstring-t.c | 2 +- unittest/mysys/lf-t.c | 2 +- unittest/mysys/my_atomic-t.c | 2 +- unittest/mysys/my_delete-t.c | 2 +- unittest/mysys/my_getopt-t.c | 2 +- unittest/mysys/my_malloc-t.c | 2 +- unittest/mysys/my_rdtsc-t.c | 2 +- unittest/mysys/my_vsnprintf-t.c | 2 +- unittest/mysys/thr_template.c | 2 +- unittest/mytap/CMakeLists.txt | 2 +- unittest/mytap/t/basic-t.c | 2 +- unittest/mytap/tap.c | 2 +- unittest/mytap/tap.h | 2 +- unittest/sql/CMakeLists.txt | 2 +- unittest/sql/explain_filename-t.cc | 2 +- unittest/strings/strings-t.c | 2 +- unittest/unit.pl | 2 +- vio/CMakeLists.txt | 2 +- vio/test-ssl.c | 2 +- vio/test-sslclient.c | 2 +- vio/test-sslserver.c | 2 +- vio/vio.c | 2 +- vio/vio_priv.h | 2 +- vio/viosocket.c | 2 +- vio/viossl.c | 2 +- vio/viosslfactories.c | 2 +- vio/viotest-ssl.c | 2 +- vio/viotest-sslconnect.cc | 2 +- vio/viotest.cc | 2 +- win/create_def_file.js | 2 +- win/packaging/CMakeLists.txt | 2 +- win/packaging/ca/CMakeLists.txt | 2 +- zlib/CMakeLists.txt | 2 +- 4079 files changed, 4102 insertions(+), 4102 deletions(-) diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 86085fcc593..7e4f47760f4 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -13,7 +13,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA cflags="$c_warnings $extra_flags $EXTRA_FLAGS $EXTRA_CFLAGS" cxxflags="$cxx_warnings $base_cxxflags $extra_flags $EXTRA_FLAGS $EXTRA_CXXFLAGS" diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 1ec50ed5bb3..1c5ab0c4777 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA ######################################################################## diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh index 1d7cf5561ad..45a70779481 100755 --- a/BUILD/autorun.sh +++ b/BUILD/autorun.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # Create MySQL cmake configure wrapper diff --git a/BUILD/build_mccge.sh b/BUILD/build_mccge.sh index 78e5350dc1b..b003bfd39ce 100755 --- a/BUILD/build_mccge.sh +++ b/BUILD/build_mccge.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA die() { diff --git a/BUILD/check-cpu b/BUILD/check-cpu index ad8816dc421..f55073391e8 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -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 # # Check cpu of current machine and find the diff --git a/BUILD/cleanup b/BUILD/cleanup index 1a3cfa7b24e..3d791296554 100755 --- a/BUILD/cleanup +++ b/BUILD/cleanup @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/cmake_configure.sh b/BUILD/cmake_configure.sh index 668d6a81b5c..7f877de21ba 100644 --- a/BUILD/cmake_configure.sh +++ b/BUILD/cmake_configure.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # Ensure cmake and perl are there cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no diff --git a/BUILD/compile-alpha b/BUILD/compile-alpha index 45f72eb90e1..cb3c4478acb 100755 --- a/BUILD/compile-alpha +++ b/BUILD/compile-alpha @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-amd64-debug-max b/BUILD/compile-amd64-debug-max index 923379598d4..281f2775cb1 100755 --- a/BUILD/compile-amd64-debug-max +++ b/BUILD/compile-amd64-debug-max @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-amd64-debug-max-no-ndb b/BUILD/compile-amd64-debug-max-no-ndb index 100a17163a4..91802172852 100755 --- a/BUILD/compile-amd64-debug-max-no-ndb +++ b/BUILD/compile-amd64-debug-max-no-ndb @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-amd64-gcov b/BUILD/compile-amd64-gcov index 80936d1f3ec..c9bd3f36dd2 100755 --- a/BUILD/compile-amd64-gcov +++ b/BUILD/compile-amd64-gcov @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-amd64-gprof b/BUILD/compile-amd64-gprof index b6e38a68b8f..2be4fdfaf3e 100755 --- a/BUILD/compile-amd64-gprof +++ b/BUILD/compile-amd64-gprof @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-amd64-max b/BUILD/compile-amd64-max index 3814a98b74f..6d3470deb1a 100755 --- a/BUILD/compile-amd64-max +++ b/BUILD/compile-amd64-max @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-amd64-max-sci b/BUILD/compile-amd64-max-sci index fbcbba7920b..59955e8c75c 100644 --- a/BUILD/compile-amd64-max-sci +++ b/BUILD/compile-amd64-max-sci @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-amd64-valgrind-max b/BUILD/compile-amd64-valgrind-max index 303b73e4bae..2d6fa68bd5e 100755 --- a/BUILD/compile-amd64-valgrind-max +++ b/BUILD/compile-amd64-valgrind-max @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-darwin-mwcc b/BUILD/compile-darwin-mwcc index 06332910eaa..811de47e276 100755 --- a/BUILD/compile-darwin-mwcc +++ b/BUILD/compile-darwin-mwcc @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-dist b/BUILD/compile-dist index becfea638f8..9e922233e6e 100755 --- a/BUILD/compile-dist +++ b/BUILD/compile-dist @@ -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 # # This script's purpose is to update the automake/autoconf helper scripts and diff --git a/BUILD/compile-hpux11-parisc2-aCC b/BUILD/compile-hpux11-parisc2-aCC index 0a3c8e78b10..15e9b964450 100755 --- a/BUILD/compile-hpux11-parisc2-aCC +++ b/BUILD/compile-hpux11-parisc2-aCC @@ -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 if [ ! -f "sql/mysqld.cc" ]; then echo "You must run this script from the MySQL top-level directory." diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max index 508cadf73e2..415d3cec7a6 100755 --- a/BUILD/compile-ia64-debug-max +++ b/BUILD/compile-ia64-debug-max @@ -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 gmake -k maintainer-clean || true /bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache diff --git a/BUILD/compile-innodb b/BUILD/compile-innodb index 6b0b2df66da..54d44a12dca 100644 --- a/BUILD/compile-innodb +++ b/BUILD/compile-innodb @@ -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 +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA # # we assume this script is in storage/innobase/ diff --git a/BUILD/compile-irix-mips64-mipspro b/BUILD/compile-irix-mips64-mipspro index 4a55654e938..917f3d07bbb 100755 --- a/BUILD/compile-irix-mips64-mipspro +++ b/BUILD/compile-irix-mips64-mipspro @@ -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 if [ ! -f "sql/mysqld.cc" ]; then echo "You must run this script from the MySQL top-level directory." diff --git a/BUILD/compile-ndb-autotest b/BUILD/compile-ndb-autotest index 691b309fb60..48d6ef7463f 100755 --- a/BUILD/compile-ndb-autotest +++ b/BUILD/compile-ndb-autotest @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium b/BUILD/compile-pentium index c197d9b49bf..15a041fc0b9 100755 --- a/BUILD/compile-pentium +++ b/BUILD/compile-pentium @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-cybozu b/BUILD/compile-pentium-cybozu index fc65adf1ea1..4ff01e73a26 100755 --- a/BUILD/compile-pentium-cybozu +++ b/BUILD/compile-pentium-cybozu @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium-debug index faeb1b89597..d19292773cc 100755 --- a/BUILD/compile-pentium-debug +++ b/BUILD/compile-pentium-debug @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium-debug-max index 0c925d8426f..59d471af104 100755 --- a/BUILD/compile-pentium-debug-max +++ b/BUILD/compile-pentium-debug-max @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-debug-max-no-embedded b/BUILD/compile-pentium-debug-max-no-embedded index 2394c8aa2c7..9564836c0bc 100755 --- a/BUILD/compile-pentium-debug-max-no-embedded +++ b/BUILD/compile-pentium-debug-max-no-embedded @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-debug-max-no-ndb b/BUILD/compile-pentium-debug-max-no-ndb index fa8069414b2..ef7e91f19fe 100755 --- a/BUILD/compile-pentium-debug-max-no-ndb +++ b/BUILD/compile-pentium-debug-max-no-ndb @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-debug-openssl b/BUILD/compile-pentium-debug-openssl index abf6b41a2d2..3fd46135345 100755 --- a/BUILD/compile-pentium-debug-openssl +++ b/BUILD/compile-pentium-debug-openssl @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-debug-yassl b/BUILD/compile-pentium-debug-yassl index e8cfff6cb07..0a53e7f9718 100755 --- a/BUILD/compile-pentium-debug-yassl +++ b/BUILD/compile-pentium-debug-yassl @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov index 56072f619e5..11fc6dd9c28 100755 --- a/BUILD/compile-pentium-gcov +++ b/BUILD/compile-pentium-gcov @@ -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 # Need to disable ccache, or we loose the gcov-needed compiler output files. diff --git a/BUILD/compile-pentium-gprof b/BUILD/compile-pentium-gprof index 52231e7832a..75dbd755834 100755 --- a/BUILD/compile-pentium-gprof +++ b/BUILD/compile-pentium-gprof @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-icc b/BUILD/compile-pentium-icc index 23333a13c15..385e8a41111 100755 --- a/BUILD/compile-pentium-icc +++ b/BUILD/compile-pentium-icc @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-icc-valgrind-max b/BUILD/compile-pentium-icc-valgrind-max index 4858f796fab..182028629ac 100755 --- a/BUILD/compile-pentium-icc-valgrind-max +++ b/BUILD/compile-pentium-icc-valgrind-max @@ -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 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # @@ -27,7 +27,7 @@ # # You should have 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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-icc-yassl b/BUILD/compile-pentium-icc-yassl index ef0ec1a5d76..cd4d8dc822e 100644 --- a/BUILD/compile-pentium-icc-yassl +++ b/BUILD/compile-pentium-icc-yassl @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium-max index 470596f8eb9..41cb3a26974 100755 --- a/BUILD/compile-pentium-max +++ b/BUILD/compile-pentium-max @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-myodbc b/BUILD/compile-pentium-myodbc index d9b1dd47129..62e06a4b552 100755 --- a/BUILD/compile-pentium-myodbc +++ b/BUILD/compile-pentium-myodbc @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-valgrind-max b/BUILD/compile-pentium-valgrind-max index c4cb1845ba1..da0c903bc50 100755 --- a/BUILD/compile-pentium-valgrind-max +++ b/BUILD/compile-pentium-valgrind-max @@ -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 # Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. # @@ -27,7 +27,7 @@ # # You should have 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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium-valgrind-max-no-ndb b/BUILD/compile-pentium-valgrind-max-no-ndb index c3ebb47cc22..098f0ce57b8 100755 --- a/BUILD/compile-pentium-valgrind-max-no-ndb +++ b/BUILD/compile-pentium-valgrind-max-no-ndb @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium64-debug b/BUILD/compile-pentium64-debug index 74909c346ec..f30c6634ea8 100755 --- a/BUILD/compile-pentium64-debug +++ b/BUILD/compile-pentium64-debug @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium64-debug-max b/BUILD/compile-pentium64-debug-max index 49a9c7daf3a..09061de6891 100755 --- a/BUILD/compile-pentium64-debug-max +++ b/BUILD/compile-pentium64-debug-max @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium64-gcov b/BUILD/compile-pentium64-gcov index 36d4b6192ec..598d43c0593 100755 --- a/BUILD/compile-pentium64-gcov +++ b/BUILD/compile-pentium64-gcov @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium64-gprof b/BUILD/compile-pentium64-gprof index b7821e06b6e..5940dc6b22f 100755 --- a/BUILD/compile-pentium64-gprof +++ b/BUILD/compile-pentium64-gprof @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium64-max b/BUILD/compile-pentium64-max index 7f63d408f1a..a7bf969d093 100755 --- a/BUILD/compile-pentium64-max +++ b/BUILD/compile-pentium64-max @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium64-max-sci b/BUILD/compile-pentium64-max-sci index a19351308c5..706412d214d 100644 --- a/BUILD/compile-pentium64-max-sci +++ b/BUILD/compile-pentium64-max-sci @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-pentium64-valgrind-max b/BUILD/compile-pentium64-valgrind-max index beb2ee2532c..0653fb7fe75 100755 --- a/BUILD/compile-pentium64-valgrind-max +++ b/BUILD/compile-pentium64-valgrind-max @@ -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 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # @@ -27,7 +27,7 @@ # # You should have 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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-ppc b/BUILD/compile-ppc index 18051aa33ee..18c8842d724 100755 --- a/BUILD/compile-ppc +++ b/BUILD/compile-ppc @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-ppc-debug b/BUILD/compile-ppc-debug index cbd8ef6533a..504ffcf8d79 100755 --- a/BUILD/compile-ppc-debug +++ b/BUILD/compile-ppc-debug @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-ppc-debug-max b/BUILD/compile-ppc-debug-max index ecc2b183b4b..ef8d798429e 100755 --- a/BUILD/compile-ppc-debug-max +++ b/BUILD/compile-ppc-debug-max @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-ppc-debug-max-no-ndb b/BUILD/compile-ppc-debug-max-no-ndb index ba7fe9aee5b..67b7ad9a4e9 100755 --- a/BUILD/compile-ppc-debug-max-no-ndb +++ b/BUILD/compile-ppc-debug-max-no-ndb @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-ppc-max b/BUILD/compile-ppc-max index 419f096a95b..10ffdfc5604 100755 --- a/BUILD/compile-ppc-max +++ b/BUILD/compile-ppc-max @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-solaris-amd64-debug b/BUILD/compile-solaris-amd64-debug index 49e1e90ebeb..78d66495463 100755 --- a/BUILD/compile-solaris-amd64-debug +++ b/BUILD/compile-solaris-amd64-debug @@ -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 path=`dirname $0` . "$path/SETUP.sh" diff --git a/BUILD/compile-solaris-amd64-forte b/BUILD/compile-solaris-amd64-forte index a55627d2401..4dee546b23c 100755 --- a/BUILD/compile-solaris-amd64-forte +++ b/BUILD/compile-solaris-amd64-forte @@ -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 # See file compile-solaris-amd64 for basic pre-requisites. diff --git a/BUILD/compile-solaris-sparc b/BUILD/compile-solaris-sparc index ddecb0e3436..911d0025a0f 100755 --- a/BUILD/compile-solaris-sparc +++ b/BUILD/compile-solaris-sparc @@ -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 make -k clean || true /bin/rm -f */.deps/*.P config.cache diff --git a/BUILD/compile-solaris-sparc-forte b/BUILD/compile-solaris-sparc-forte index cf17fa49c51..5e513ebcf62 100755 --- a/BUILD/compile-solaris-sparc-forte +++ b/BUILD/compile-solaris-sparc-forte @@ -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 # Copyright (c) 2001, 2002, 2005, 2007 MySQL AB, 2008 Sun Microsystems, Inc. # Use is subject to license terms. @@ -29,7 +29,7 @@ # # You should have 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 # Assume Forte is installed in /opt/SUNWSpro and ld is installed in # /usr/ccs/bin diff --git a/CMakeLists.txt b/CMakeLists.txt index bc4c4e4f103..1fb7e7ae2b4 100644 --- a/CMakeLists.txt +++ b/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 CMAKE_MINIMUM_REQUIRED(VERSION 2.6) # Avoid warnings in higher versions diff --git a/COPYING b/COPYING index d511905c164..6e475df5526 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. You should have 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. Also add information on how to contact you by electronic and paper mail. diff --git a/README b/README index f13f4174b59..f7be80aea33 100644 --- a/README +++ b/README @@ -220,7 +220,7 @@ cmake-2.4.8/Utilities/cmtar/compat/gethostname.c: You should have 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. + Boston, MA 02110-1335 USA. As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -610,7 +610,7 @@ ltmain.sh inclusion: # # You should have 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. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -641,7 +641,7 @@ libtool inclusion: # # You should have 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. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -673,7 +673,7 @@ Auto-generated files: # # You should have 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. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -699,7 +699,7 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -972,7 +972,7 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. Also add information on how to contact you by electronic and paper mail. @@ -1395,7 +1395,7 @@ text: You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin Place - Suite 330, + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ @@ -1824,7 +1824,7 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -2127,7 +2127,7 @@ the "copyright" line and a pointer to where the full notice is found. You should have 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. Also add information on how to contact you by electronic and paper mail. diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 56e891ea284..35793028276 100644 --- a/client/CMakeLists.txt +++ b/client/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 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include diff --git a/client/client_priv.h b/client/client_priv.h index b5c647fbd0c..d152112be86 100644 --- a/client/client_priv.h +++ b/client/client_priv.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 */ /* Common defines for all clients */ diff --git a/client/completion_hash.cc b/client/completion_hash.cc index 9ffb2082c06..ce5394d804b 100644 --- a/client/completion_hash.cc +++ b/client/completion_hash.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 */ /* Quick & light hash implementation for tab completion purposes * diff --git a/client/completion_hash.h b/client/completion_hash.h index 70c2cf1b371..57483e0f8b8 100644 --- a/client/completion_hash.h +++ b/client/completion_hash.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA */ + MA 02110-1335 USA */ #ifndef _HASH_ #define _HASH_ diff --git a/client/echo.c b/client/echo.c index 2a3cb915d23..90a538faf62 100644 --- a/client/echo.c +++ b/client/echo.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 */ /* echo is a replacement for the "echo" command builtin to cmd.exe diff --git a/client/get_password.c b/client/get_password.c index 8a507d94e9b..04c5537fc35 100644 --- a/client/get_password.c +++ b/client/get_password.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 */ /* ** Ask for a password from tty diff --git a/client/my_readline.h b/client/my_readline.h index 57537308fed..ec43d81f2c0 100644 --- a/client/my_readline.h +++ b/client/my_readline.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 */ /* readline for batch mode */ diff --git a/client/mysql_plugin.c b/client/mysql_plugin.c index bc9969c9b66..32335e8b69b 100644 --- a/client/mysql_plugin.c +++ b/client/mysql_plugin.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 */ #include diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 836f2c1686b..fc998466883 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.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 */ #include "client_priv.h" diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 105e195c269..50bc12e9878 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.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 */ /* maintaince of mysql databases */ diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 1a11e3e697b..979b82463b0 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.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/client/mysqlcheck.c b/client/mysqlcheck.c index 8b938580679..6cac9762d89 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.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 */ /* By Jani Tolonen, 2001-04-20, MySQL Development Team */ diff --git a/client/mysqldump.c b/client/mysqldump.c index ad71a4dd0ce..f976cc31fc8 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.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 Street, Fifth Floor, Boston, MA 02110-1301, USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* mysqldump.c - Dump a tables contents and format to an ASCII file diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 9fd96965213..cf857390008 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.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 */ /* diff --git a/client/mysqlshow.c b/client/mysqlshow.c index 8bfbd87aca6..bc03020795f 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.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 */ /* Show databases, tables or columns */ diff --git a/client/mysqlslap.c b/client/mysqlslap.c index ba7b8cea6a9..c18befaf6f2 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.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 */ /* diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 842bde3b99e..c604797ce7a 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.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 */ /* mysqltest diff --git a/client/readline.cc b/client/readline.cc index b6643b86356..0b5bd7fd3a6 100644 --- a/client/readline.cc +++ b/client/readline.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 */ /* readline for batch mode */ diff --git a/client/sql_string.cc.dontuse b/client/sql_string.cc.dontuse index 9679197b207..94dfbfb461a 100644 --- a/client/sql_string.cc.dontuse +++ b/client/sql_string.cc.dontuse @@ -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/client/sql_string.h.dontuse b/client/sql_string.h.dontuse index 94f844dc689..e5bf8e0b67c 100644 --- a/client/sql_string.h.dontuse +++ b/client/sql_string.h.dontuse @@ -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 */ /* This file is originally from the mysql distribution. Coded by monty */ diff --git a/cmake/abi_check.cmake b/cmake/abi_check.cmake index cca595c5635..d033f866437 100644 --- a/cmake/abi_check.cmake +++ b/cmake/abi_check.cmake @@ -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 # # Headers which need to be checked for abi/api compatibility are in diff --git a/cmake/bison.cmake b/cmake/bison.cmake index d5c725fbbde..e7094a2f5d6 100644 --- a/cmake/bison.cmake +++ b/cmake/bison.cmake @@ -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(CMAKE_SYSTEM_NAME MATCHES "SunOS") # On Solaris, /opt/csw often contains a newer bison diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index a464631e9a2..9d47eaf39f7 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -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 includes build settings used for MySQL release diff --git a/cmake/cat.cmake b/cmake/cat.cmake index 1ffe2ecfa1d..3a76b20da99 100644 --- a/cmake/cat.cmake +++ b/cmake/cat.cmake @@ -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 # Concatenate files # diff --git a/cmake/character_sets.cmake b/cmake/character_sets.cmake index 74a39e09cac..870222ff23d 100644 --- a/cmake/character_sets.cmake +++ b/cmake/character_sets.cmake @@ -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 # Charsets and collations IF(NOT DEFAULT_CHARSET) diff --git a/cmake/check_minimal_version.cmake b/cmake/check_minimal_version.cmake index d96c6a93418..5bef555b32d 100644 --- a/cmake/check_minimal_version.cmake +++ b/cmake/check_minimal_version.cmake @@ -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 is a helper script is used to check for the minimal required version # It helps to decide whether to use autoconf based configure or cmake's diff --git a/cmake/cmake_parse_arguments.cmake b/cmake/cmake_parse_arguments.cmake index 487fe2bacd9..800fef6e728 100644 --- a/cmake/cmake_parse_arguments.cmake +++ b/cmake/cmake_parse_arguments.cmake @@ -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 # Handy macro to parse macro arguments MACRO(MYSQL_PARSE_ARGUMENTS prefix arg_names option_names) diff --git a/cmake/compile_flags.cmake b/cmake/compile_flags.cmake index b39bf7b79d6..a87846e9915 100644 --- a/cmake/compile_flags.cmake +++ b/cmake/compile_flags.cmake @@ -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 ## ADD_COMPILE_FLAGS( COMPILE_FLAGS ) diff --git a/cmake/configure.pl b/cmake/configure.pl index d5c0b9b061a..38fccfbcb83 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -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 use strict; use Cwd 'abs_path'; diff --git a/cmake/cpack_source_ignore_files.cmake b/cmake/cpack_source_ignore_files.cmake index 0874311428e..8f41a8099bc 100644 --- a/cmake/cpack_source_ignore_files.cmake +++ b/cmake/cpack_source_ignore_files.cmake @@ -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 SET(CPACK_SOURCE_IGNORE_FILES CMakeCache\\\\.txt diff --git a/cmake/create_initial_db.cmake.in b/cmake/create_initial_db.cmake.in index ce638b14e39..ee5759ad933 100644 --- a/cmake/create_initial_db.cmake.in +++ b/cmake/create_initial_db.cmake.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 # This script creates initial database for packaging on Windows SET(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@") diff --git a/cmake/do_abi_check.cmake b/cmake/do_abi_check.cmake index c0ffce353f3..43d8b15a7ab 100644 --- a/cmake/do_abi_check.cmake +++ b/cmake/do_abi_check.cmake @@ -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 # # Rules for checking that the abi/api has not changed. diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake index 3edcdc4c1c5..23bce1046d4 100644 --- a/cmake/dtrace.cmake +++ b/cmake/dtrace.cmake @@ -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 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SIZEOF_VOID_P EQUAL 4) diff --git a/cmake/dtrace_prelink.cmake b/cmake/dtrace_prelink.cmake index 0efc2bb64bb..f2e678f06d5 100644 --- a/cmake/dtrace_prelink.cmake +++ b/cmake/dtrace_prelink.cmake @@ -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 # Generates an ELF object file with dtrace entry points. # This object that must to be linked with together with diff --git a/cmake/info_bin.cmake b/cmake/info_bin.cmake index 9cec3de0e0f..d59b512bcec 100644 --- a/cmake/info_bin.cmake +++ b/cmake/info_bin.cmake @@ -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 sole purpose of this cmake control file is to create the "INFO_BIN" file. diff --git a/cmake/info_macros.cmake.in b/cmake/info_macros.cmake.in index fc2f8849337..05c07226c0d 100644 --- a/cmake/info_macros.cmake.in +++ b/cmake/info_macros.cmake.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 # Handle/create the "INFO_*" files describing a MySQL (server) binary. diff --git a/cmake/info_src.cmake b/cmake/info_src.cmake index ce9873cc9d0..df6249f111e 100644 --- a/cmake/info_src.cmake +++ b/cmake/info_src.cmake @@ -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 sole purpose of this cmake control file is to create the "INFO_SRC" file. diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index ebf3852182c..0111b397efb 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -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 purpose of this file is to set the default installation layout. # diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index 22a525d7344..708126bf206 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -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 GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_parse_arguments.cmake) diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index 67e222eefb0..dd8f9b192a3 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -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 file exports macros that emulate some functionality found in GNU libtool diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake index 872d61d9aac..bda92dca54e 100644 --- a/cmake/maintainer.cmake +++ b/cmake/maintainer.cmake @@ -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 # Common warning flags for GCC, G++, Clang and Clang++ SET(MY_WARNING_FLAGS "-Wall -Wextra -Wformat-security") diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in index f35d16834b6..d9153604a46 100644 --- a/cmake/make_dist.cmake.in +++ b/cmake/make_dist.cmake.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 # Make source distribution # If bzr is present, run bzr export. diff --git a/cmake/merge_archives_unix.cmake.in b/cmake/merge_archives_unix.cmake.in index d05336d6c91..7bb5f54f411 100644 --- a/cmake/merge_archives_unix.cmake.in +++ b/cmake/merge_archives_unix.cmake.in @@ -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 script merges many static libraries into # one big library on Unix. diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake index 45575bdd536..e9fa38fb64e 100644 --- a/cmake/mysql_add_executable.cmake +++ b/cmake/mysql_add_executable.cmake @@ -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 # Add executable plus some additional MySQL specific stuff # Usage (same as for standard CMake's ADD_EXECUTABLE) diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake index 7fa5240e324..3f1a66bb036 100644 --- a/cmake/mysql_version.cmake +++ b/cmake/mysql_version.cmake @@ -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 # # Global constants, only to be changed between major releases. diff --git a/cmake/os/AIX.cmake b/cmake/os/AIX.cmake index c86392f8bc4..12ddf30d440 100644 --- a/cmake/os/AIX.cmake +++ b/cmake/os/AIX.cmake @@ -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 #Enable 64 bit file offsets diff --git a/cmake/os/Cygwin.cmake b/cmake/os/Cygwin.cmake index 9c29277c626..a54241654a6 100644 --- a/cmake/os/Cygwin.cmake +++ b/cmake/os/Cygwin.cmake @@ -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 # Cygwin is not Windows SET(WIN32 0) \ No newline at end of file diff --git a/cmake/os/Darwin.cmake b/cmake/os/Darwin.cmake index 4ac72070e8b..21e18360dfe 100644 --- a/cmake/os/Darwin.cmake +++ b/cmake/os/Darwin.cmake @@ -11,6 +11,6 @@ # # You should have 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 OSX specific options and quirks, related to system checks diff --git a/cmake/os/FreeBSD.cmake b/cmake/os/FreeBSD.cmake index ffb89c81206..b9c335e4ddf 100644 --- a/cmake/os/FreeBSD.cmake +++ b/cmake/os/FreeBSD.cmake @@ -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 includes FreeBSD specific options and quirks, related to system checks diff --git a/cmake/os/HP-UX.cmake b/cmake/os/HP-UX.cmake index 4cadddc7b18..5bbc799427e 100644 --- a/cmake/os/HP-UX.cmake +++ b/cmake/os/HP-UX.cmake @@ -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(CheckCXXSourceCompiles) # Enable 64 bit file offsets diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake index b0680d92a1b..e37fb284d70 100644 --- a/cmake/os/Linux.cmake +++ b/cmake/os/Linux.cmake @@ -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 includes Linux specific options and quirks, related to system checks diff --git a/cmake/os/OS400.cmake b/cmake/os/OS400.cmake index 502eeccc30a..5a9b2aba64d 100644 --- a/cmake/os/OS400.cmake +++ b/cmake/os/OS400.cmake @@ -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 GET_FILENAME_COMPONENT(_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) INCLUDE(${_SCRIPT_DIR}/AIX.cmake) \ No newline at end of file diff --git a/cmake/os/SunOS.cmake b/cmake/os/SunOS.cmake index d5a4b5c96b0..4a77b53fb31 100644 --- a/cmake/os/SunOS.cmake +++ b/cmake/os/SunOS.cmake @@ -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(CheckSymbolExists) INCLUDE(CheckCSourceRuns) diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index ea5084ebba6..15d8253d2b7 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -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 file includes Windows specific hacks, mostly around compiler flags diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index 1694b238e7b..81cd916b2fe 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -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 # Avoid system checks on Windows by pre-caching results. Most of the system checks # are not relevant for Windows anyway and it takes lot more time to run them, diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake index 4ba8fc18e3f..b751d8a96a9 100644 --- a/cmake/package_name.cmake +++ b/cmake/package_name.cmake @@ -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 # Produce meaningful package name for the binary package # The logic is rather involved with special cases for different OSes diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 321724f3b16..c92fe9cae1c 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -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 GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) diff --git a/cmake/readline.cmake b/cmake/readline.cmake index 64e04ef8663..aad9f62db58 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -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(CheckCXXSourceCompiles) diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 60d2cb48387..58727845cbd 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -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 MACRO (CHANGE_SSL_SETTINGS string) SET(WITH_SSL ${string} CACHE STRING "Options are: no bundled yes(prefer os library if present otherwise use bundled) system(use os library)" FORCE) diff --git a/cmake/stack_direction.c b/cmake/stack_direction.c index d75bbbfa035..1f7a5d0b135 100644 --- a/cmake/stack_direction.c +++ b/cmake/stack_direction.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 */ /* Check stack direction (0-down, 1-up) */ int f(int *a) diff --git a/cmake/tags.cmake b/cmake/tags.cmake index 07c1411a1d6..309bfae9832 100644 --- a/cmake/tags.cmake +++ b/cmake/tags.cmake @@ -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 # Generate tag files IF(UNIX) diff --git a/cmake/versioninfo.rc.in b/cmake/versioninfo.rc.in index cd880b917e0..29b39353124 100644 --- a/cmake/versioninfo.rc.in +++ b/cmake/versioninfo.rc.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 VS_VERSION_INFO VERSIONINFO diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake index bfb2b70be74..42e9898d7dd 100644 --- a/cmake/zlib.cmake +++ b/cmake/zlib.cmake @@ -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 MACRO (MYSQL_USE_BUNDLED_ZLIB) SET(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/zlib ${CMAKE_BINARY_DIR}/zlib) diff --git a/cmd-line-utils/libedit/CMakeLists.txt b/cmd-line-utils/libedit/CMakeLists.txt index 1f9aa29fb4a..1f637c5b831 100644 --- a/cmd-line-utils/libedit/CMakeLists.txt +++ b/cmd-line-utils/libedit/CMakeLists.txt @@ -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_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ) INCLUDE(CheckIncludeFile) diff --git a/cmd-line-utils/readline/CMakeLists.txt b/cmd-line-utils/readline/CMakeLists.txt index bdecdd1fcce..9a02d9b8247 100644 --- a/cmd-line-utils/readline/CMakeLists.txt +++ b/cmd-line-utils/readline/CMakeLists.txt @@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/cmd-line-utils/readline/COPYING b/cmd-line-utils/readline/COPYING index 18e17032a13..7ca98023bb8 100644 --- a/cmd-line-utils/readline/COPYING +++ b/cmd-line-utils/readline/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. You should have 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 Also add information on how to contact you by electronic and paper mail. diff --git a/cmd-line-utils/readline/ansi_stdlib.h b/cmd-line-utils/readline/ansi_stdlib.h index 42ac66ebcc0..3c6da58c42f 100644 --- a/cmd-line-utils/readline/ansi_stdlib.h +++ b/cmd-line-utils/readline/ansi_stdlib.h @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with Bash; see the file COPYING. If not, write to the Free Software - Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_STDLIB_H_) #define _STDLIB_H_ 1 diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c index d979f244f4d..282053e80e8 100644 --- a/cmd-line-utils/readline/bind.c +++ b/cmd-line-utils/readline/bind.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY diff --git a/cmd-line-utils/readline/callback.c b/cmd-line-utils/readline/callback.c index 08c2f0ce80b..df15a65d75e 100644 --- a/cmd-line-utils/readline/callback.c +++ b/cmd-line-utils/readline/callback.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/chardefs.h b/cmd-line-utils/readline/chardefs.h index 6aa185d9383..0c3bf833481 100644 --- a/cmd-line-utils/readline/chardefs.h +++ b/cmd-line-utils/readline/chardefs.h @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #ifndef _CHARDEFS_H_ #define _CHARDEFS_H_ diff --git a/cmd-line-utils/readline/compat.c b/cmd-line-utils/readline/compat.c index c16771b8f29..9f9e3f855b6 100644 --- a/cmd-line-utils/readline/compat.c +++ b/cmd-line-utils/readline/compat.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/complete.c b/cmd-line-utils/readline/complete.c index b6c20789da4..44bf13821a4 100644 --- a/cmd-line-utils/readline/complete.c +++ b/cmd-line-utils/readline/complete.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/configure.in b/cmd-line-utils/readline/configure.in index 949da72933e..067e37ca6d4 100644 --- a/cmd-line-utils/readline/configure.in +++ b/cmd-line-utils/readline/configure.in @@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script. # You should have 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. +# MA 02110-1335 USA. AC_REVISION([for Readline 5.2, version 2.61]) diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c index 4226cdae5a2..b8500f30bcc 100644 --- a/cmd-line-utils/readline/display.c +++ b/cmd-line-utils/readline/display.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/emacs_keymap.c b/cmd-line-utils/readline/emacs_keymap.c index a42443f39d6..31e6b49090b 100644 --- a/cmd-line-utils/readline/emacs_keymap.c +++ b/cmd-line-utils/readline/emacs_keymap.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (BUFSIZ) #include diff --git a/cmd-line-utils/readline/funmap.c b/cmd-line-utils/readline/funmap.c index d3a537dfacd..23b3ce19676 100644 --- a/cmd-line-utils/readline/funmap.c +++ b/cmd-line-utils/readline/funmap.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/histexpand.c b/cmd-line-utils/readline/histexpand.c index 73286614d55..38292c6045b 100644 --- a/cmd-line-utils/readline/histexpand.c +++ b/cmd-line-utils/readline/histexpand.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY diff --git a/cmd-line-utils/readline/histfile.c b/cmd-line-utils/readline/histfile.c index 1d433b98be4..1ad828d4155 100644 --- a/cmd-line-utils/readline/histfile.c +++ b/cmd-line-utils/readline/histfile.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ /* The goal is to make the implementation transparent, so that you don't have to know what data types are used, just what functions diff --git a/cmd-line-utils/readline/histlib.h b/cmd-line-utils/readline/histlib.h index 4418f537389..4d63ca7440c 100644 --- a/cmd-line-utils/readline/histlib.h +++ b/cmd-line-utils/readline/histlib.h @@ -17,7 +17,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_HISTLIB_H_) #define _HISTLIB_H_ diff --git a/cmd-line-utils/readline/history.c b/cmd-line-utils/readline/history.c index f36bbe4bc53..a777229248c 100644 --- a/cmd-line-utils/readline/history.c +++ b/cmd-line-utils/readline/history.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ /* The goal is to make the implementation transparent, so that you don't have to know what data types are used, just what functions diff --git a/cmd-line-utils/readline/history.h b/cmd-line-utils/readline/history.h index c196b0361e3..dd8169dc51b 100644 --- a/cmd-line-utils/readline/history.h +++ b/cmd-line-utils/readline/history.h @@ -17,7 +17,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #ifndef _HISTORY_H_ #define _HISTORY_H_ diff --git a/cmd-line-utils/readline/histsearch.c b/cmd-line-utils/readline/histsearch.c index dcf6b420b1b..43cac20a18a 100644 --- a/cmd-line-utils/readline/histsearch.c +++ b/cmd-line-utils/readline/histsearch.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY diff --git a/cmd-line-utils/readline/input.c b/cmd-line-utils/readline/input.c index 3f8eb65c07d..e88df08a299 100644 --- a/cmd-line-utils/readline/input.c +++ b/cmd-line-utils/readline/input.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (__TANDEM) diff --git a/cmd-line-utils/readline/isearch.c b/cmd-line-utils/readline/isearch.c index 83829f4861c..750113f5dd8 100644 --- a/cmd-line-utils/readline/isearch.c +++ b/cmd-line-utils/readline/isearch.c @@ -23,7 +23,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/keymaps.c b/cmd-line-utils/readline/keymaps.c index 17436cf20bf..f431b9daaed 100644 --- a/cmd-line-utils/readline/keymaps.c +++ b/cmd-line-utils/readline/keymaps.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with Readline; see the file COPYING. If not, write to the Free - Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/keymaps.h b/cmd-line-utils/readline/keymaps.h index 1de567ddc1e..64bd4c14c39 100644 --- a/cmd-line-utils/readline/keymaps.h +++ b/cmd-line-utils/readline/keymaps.h @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #ifndef _KEYMAPS_H_ #define _KEYMAPS_H_ diff --git a/cmd-line-utils/readline/kill.c b/cmd-line-utils/readline/kill.c index bfe6afe77fe..accda438537 100644 --- a/cmd-line-utils/readline/kill.c +++ b/cmd-line-utils/readline/kill.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/macro.c b/cmd-line-utils/readline/macro.c index 7a26fc40c97..0dd02fd139d 100644 --- a/cmd-line-utils/readline/macro.c +++ b/cmd-line-utils/readline/macro.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/mbutil.c b/cmd-line-utils/readline/mbutil.c index b3d5c1b0ea4..1d6d8bbf9a2 100644 --- a/cmd-line-utils/readline/mbutil.c +++ b/cmd-line-utils/readline/mbutil.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/misc.c b/cmd-line-utils/readline/misc.c index 033a0dd9482..6d5f2732a79 100644 --- a/cmd-line-utils/readline/misc.c +++ b/cmd-line-utils/readline/misc.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/nls.c b/cmd-line-utils/readline/nls.c index ddfca55d62d..089ef8a6abd 100644 --- a/cmd-line-utils/readline/nls.c +++ b/cmd-line-utils/readline/nls.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/parens.c b/cmd-line-utils/readline/parens.c index 6b2a4d8d263..d9390e41b1e 100644 --- a/cmd-line-utils/readline/parens.c +++ b/cmd-line-utils/readline/parens.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (__TANDEM) diff --git a/cmd-line-utils/readline/posixdir.h b/cmd-line-utils/readline/posixdir.h index fe4cb231173..156ad363872 100644 --- a/cmd-line-utils/readline/posixdir.h +++ b/cmd-line-utils/readline/posixdir.h @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with Bash; see the file COPYING. If not, write to the Free - Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ /* This file should be included instead of or . */ diff --git a/cmd-line-utils/readline/posixjmp.h b/cmd-line-utils/readline/posixjmp.h index a2c89b83d4e..94af2bd11a8 100644 --- a/cmd-line-utils/readline/posixjmp.h +++ b/cmd-line-utils/readline/posixjmp.h @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with Bash; see the file COPYING. If not, write to the Free - Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #ifndef _POSIXJMP_H_ #define _POSIXJMP_H_ diff --git a/cmd-line-utils/readline/posixstat.h b/cmd-line-utils/readline/posixstat.h index d3eca09b634..e0957260806 100644 --- a/cmd-line-utils/readline/posixstat.h +++ b/cmd-line-utils/readline/posixstat.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with Bash; see the file COPYING. If not, write to the Free - Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ /* This file should be included instead of . It relies on the local sys/stat.h to work though. */ diff --git a/cmd-line-utils/readline/readline.c b/cmd-line-utils/readline/readline.c index d2e710875dc..77e8e17c216 100644 --- a/cmd-line-utils/readline/readline.c +++ b/cmd-line-utils/readline/readline.c @@ -19,7 +19,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/readline.h b/cmd-line-utils/readline/readline.h index 867b2e71641..ace11f7c96e 100644 --- a/cmd-line-utils/readline/readline.h +++ b/cmd-line-utils/readline/readline.h @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_READLINE_H_) #define _READLINE_H_ diff --git a/cmd-line-utils/readline/rlconf.h b/cmd-line-utils/readline/rlconf.h index 4aacbb9e7f4..57103da7dc1 100644 --- a/cmd-line-utils/readline/rlconf.h +++ b/cmd-line-utils/readline/rlconf.h @@ -19,7 +19,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_RLCONF_H_) #define _RLCONF_H_ diff --git a/cmd-line-utils/readline/rldefs.h b/cmd-line-utils/readline/rldefs.h index 732bd54baa9..f8334bd4566 100644 --- a/cmd-line-utils/readline/rldefs.h +++ b/cmd-line-utils/readline/rldefs.h @@ -21,7 +21,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_RLDEFS_H_) #define _RLDEFS_H_ diff --git a/cmd-line-utils/readline/rlmbutil.h b/cmd-line-utils/readline/rlmbutil.h index 63c4055f9f4..3e8fa2221cf 100644 --- a/cmd-line-utils/readline/rlmbutil.h +++ b/cmd-line-utils/readline/rlmbutil.h @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_RL_MBUTIL_H_) #define _RL_MBUTIL_H_ diff --git a/cmd-line-utils/readline/rlprivate.h b/cmd-line-utils/readline/rlprivate.h index a693bd988b6..cf3d2038194 100644 --- a/cmd-line-utils/readline/rlprivate.h +++ b/cmd-line-utils/readline/rlprivate.h @@ -19,7 +19,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_RL_PRIVATE_H_) #define _RL_PRIVATE_H_ diff --git a/cmd-line-utils/readline/rlshell.h b/cmd-line-utils/readline/rlshell.h index 629b0e03b46..8d5db8893b5 100644 --- a/cmd-line-utils/readline/rlshell.h +++ b/cmd-line-utils/readline/rlshell.h @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_RL_SHELL_H_) #define _RL_SHELL_H_ diff --git a/cmd-line-utils/readline/rlstdc.h b/cmd-line-utils/readline/rlstdc.h index 2a2272895ce..1bcaff3eef2 100644 --- a/cmd-line-utils/readline/rlstdc.h +++ b/cmd-line-utils/readline/rlstdc.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with Bash; see the file COPYING. If not, write to the Free - Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_RL_STDC_H_) #define _RL_STDC_H_ diff --git a/cmd-line-utils/readline/rltty.c b/cmd-line-utils/readline/rltty.c index ca8caee7de7..0efacf18ff2 100644 --- a/cmd-line-utils/readline/rltty.c +++ b/cmd-line-utils/readline/rltty.c @@ -19,7 +19,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/rltty.h b/cmd-line-utils/readline/rltty.h index 3a4770d25cb..3fa38bb9e40 100644 --- a/cmd-line-utils/readline/rltty.h +++ b/cmd-line-utils/readline/rltty.h @@ -19,7 +19,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_RLTTY_H_) #define _RLTTY_H_ diff --git a/cmd-line-utils/readline/rltypedefs.h b/cmd-line-utils/readline/rltypedefs.h index 2a0773b0672..2331662274b 100644 --- a/cmd-line-utils/readline/rltypedefs.h +++ b/cmd-line-utils/readline/rltypedefs.h @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #ifndef _RL_TYPEDEFS_H_ #define _RL_TYPEDEFS_H_ diff --git a/cmd-line-utils/readline/rlwinsize.h b/cmd-line-utils/readline/rlwinsize.h index ad671693c7b..14a1f8bfafb 100644 --- a/cmd-line-utils/readline/rlwinsize.h +++ b/cmd-line-utils/readline/rlwinsize.h @@ -20,7 +20,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_RLWINSIZE_H_) #define _RLWINSIZE_H_ diff --git a/cmd-line-utils/readline/savestring.c b/cmd-line-utils/readline/savestring.c index 9c431a0e852..2a9ad425c8e 100644 --- a/cmd-line-utils/readline/savestring.c +++ b/cmd-line-utils/readline/savestring.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #include "config_readline.h" diff --git a/cmd-line-utils/readline/search.c b/cmd-line-utils/readline/search.c index cf50a7cc499..9345be4f5bc 100644 --- a/cmd-line-utils/readline/search.c +++ b/cmd-line-utils/readline/search.c @@ -19,7 +19,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/shell.c b/cmd-line-utils/readline/shell.c index d67f3e65017..3b331e927c8 100644 --- a/cmd-line-utils/readline/shell.c +++ b/cmd-line-utils/readline/shell.c @@ -19,7 +19,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/signals.c b/cmd-line-utils/readline/signals.c index db392b3dcc4..cda33b7c7c2 100644 --- a/cmd-line-utils/readline/signals.c +++ b/cmd-line-utils/readline/signals.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/tcap.h b/cmd-line-utils/readline/tcap.h index d1e212869ce..28ec669b356 100644 --- a/cmd-line-utils/readline/tcap.h +++ b/cmd-line-utils/readline/tcap.h @@ -19,7 +19,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_RLTCAP_H_) #define _RLTCAP_H_ diff --git a/cmd-line-utils/readline/terminal.c b/cmd-line-utils/readline/terminal.c index 43086d42e2d..27397c8208a 100644 --- a/cmd-line-utils/readline/terminal.c +++ b/cmd-line-utils/readline/terminal.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/text.c b/cmd-line-utils/readline/text.c index 90ad7787000..c9cceac96eb 100644 --- a/cmd-line-utils/readline/text.c +++ b/cmd-line-utils/readline/text.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/tilde.c b/cmd-line-utils/readline/tilde.c index 3d84fd4815a..aace95d783e 100644 --- a/cmd-line-utils/readline/tilde.c +++ b/cmd-line-utils/readline/tilde.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with Readline; see the file COPYING. If not, write to the Free - Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if defined (HAVE_CONFIG_H) # include "config_readline.h" diff --git a/cmd-line-utils/readline/tilde.h b/cmd-line-utils/readline/tilde.h index 6060ec6506d..56986c9741e 100644 --- a/cmd-line-utils/readline/tilde.h +++ b/cmd-line-utils/readline/tilde.h @@ -19,7 +19,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_TILDE_H_) # define _TILDE_H_ diff --git a/cmd-line-utils/readline/undo.c b/cmd-line-utils/readline/undo.c index 6b217e45e35..f9931b4aabe 100644 --- a/cmd-line-utils/readline/undo.c +++ b/cmd-line-utils/readline/undo.c @@ -19,7 +19,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/util.c b/cmd-line-utils/readline/util.c index 7c98bcaaefe..fafb5d8a1ac 100644 --- a/cmd-line-utils/readline/util.c +++ b/cmd-line-utils/readline/util.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/vi_keymap.c b/cmd-line-utils/readline/vi_keymap.c index 85a90fe7086..89acdf22e67 100644 --- a/cmd-line-utils/readline/vi_keymap.c +++ b/cmd-line-utils/readline/vi_keymap.c @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (BUFSIZ) #include diff --git a/cmd-line-utils/readline/vi_mode.c b/cmd-line-utils/readline/vi_mode.c index 7a7dda760df..cae0b29e1ea 100644 --- a/cmd-line-utils/readline/vi_mode.c +++ b/cmd-line-utils/readline/vi_mode.c @@ -19,7 +19,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY /* **************************************************************** */ diff --git a/cmd-line-utils/readline/xmalloc.c b/cmd-line-utils/readline/xmalloc.c index 60a142ec1c3..73d760ae1c0 100644 --- a/cmd-line-utils/readline/xmalloc.c +++ b/cmd-line-utils/readline/xmalloc.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with Readline; see the file COPYING. If not, write to the Free - Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #define READLINE_LIBRARY #if defined (HAVE_CONFIG_H) diff --git a/cmd-line-utils/readline/xmalloc.h b/cmd-line-utils/readline/xmalloc.h index 58b17f39f3d..5a01449b32b 100644 --- a/cmd-line-utils/readline/xmalloc.h +++ b/cmd-line-utils/readline/xmalloc.h @@ -18,7 +18,7 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ #if !defined (_XMALLOC_H_) #define _XMALLOC_H_ diff --git a/config.h.cmake b/config.h.cmake index 271d77f2e5a..15070c7ae58 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -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 MY_CONFIG_H #define MY_CONFIG_H diff --git a/configure.cmake b/configure.cmake index 43f8f71390d..ea1f4d201f0 100644 --- a/configure.cmake +++ b/configure.cmake @@ -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 (CheckCSourceCompiles) diff --git a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt index 3d0b0801132..d66d2307e9d 100644 --- a/dbug/CMakeLists.txt +++ b/dbug/CMakeLists.txt @@ -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_DIRECTORIES( ${CMAKE_SOURCE_DIR}/dbug diff --git a/dbug/dbug_add_tags.pl b/dbug/dbug_add_tags.pl index fe3637b4d12..7be8fb9b18d 100755 --- a/dbug/dbug_add_tags.pl +++ b/dbug/dbug_add_tags.pl @@ -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 die "No files specified\n" unless $ARGV[0]; diff --git a/debian/copyright b/debian/copyright index 9c98778b4f8..d37d04fd642 100644 --- a/debian/copyright +++ b/debian/copyright @@ -55,7 +55,7 @@ License: > > You should have received a copy of the GNU General Public License > along with this package; 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 On Debian systems, the complete text of the GNU General Public License and the Artistic License can be found in `/usr/share/common-licenses/'. diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index 7f47f878110..ced1fdadd67 100644 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -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_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include diff --git a/extra/charset2html.c b/extra/charset2html.c index cafac2c1cd5..0142057f026 100644 --- a/extra/charset2html.c +++ b/extra/charset2html.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 */ /* diff --git a/extra/comp_err.c b/extra/comp_err.c index f0396bc5878..46fd2bda0d1 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.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 */ /* diff --git a/extra/innochecksum.c b/extra/innochecksum.c index ed4dfc48789..8abc18cd6a9 100644 --- a/extra/innochecksum.c +++ b/extra/innochecksum.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 */ /* diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index 4690b29e8a5..b84db958b6c 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.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 */ /* diff --git a/extra/mysql_waitpid.c b/extra/mysql_waitpid.c index 5cdf1dedc27..e19f92261db 100644 --- a/extra/mysql_waitpid.c +++ b/extra/mysql_waitpid.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 */ /* Wait until a program dies */ diff --git a/extra/perror.c b/extra/perror.c index c4ee6087d50..8613074776d 100644 --- a/extra/perror.c +++ b/extra/perror.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 */ /* Return error-text for system error messages and handler messages */ diff --git a/extra/replace.c b/extra/replace.c index 2ad4979c09e..b5ab9af4b62 100644 --- a/extra/replace.c +++ b/extra/replace.c @@ -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 */ + 02110-1335 USA */ /* Replace strings in textfile diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c index dd77e1785d0..8046e96d5d5 100644 --- a/extra/resolve_stack_dump.c +++ b/extra/resolve_stack_dump.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 */ /* Resolve numeric stack dump produced by mysqld 3.23.30 and later versions into symbolic names. By Sasha Pachev diff --git a/extra/resolveip.c b/extra/resolveip.c index b6840d9d463..d3a33282c2a 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.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 */ /* Resolves IP's to hostname and hostnames to IP's */ diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt index 5c5e4922b1d..cf64f2d9dc8 100644 --- a/extra/yassl/CMakeLists.txt +++ b/extra/yassl/CMakeLists.txt @@ -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_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include diff --git a/extra/yassl/COPYING b/extra/yassl/COPYING index d20476ee118..98861a5402d 100644 --- a/extra/yassl/COPYING +++ b/extra/yassl/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. You should have 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 Also add information on how to contact you by electronic and paper mail. diff --git a/extra/yassl/examples/client/client.cpp b/extra/yassl/examples/client/client.cpp index 102ed61734c..d2c07897f3c 100644 --- a/extra/yassl/examples/client/client.cpp +++ b/extra/yassl/examples/client/client.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* client.cpp */ diff --git a/extra/yassl/examples/echoclient/echoclient.cpp b/extra/yassl/examples/echoclient/echoclient.cpp index fabcfbec29e..99a8b4d9c88 100644 --- a/extra/yassl/examples/echoclient/echoclient.cpp +++ b/extra/yassl/examples/echoclient/echoclient.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* echoclient.cpp */ diff --git a/extra/yassl/examples/echoserver/echoserver.cpp b/extra/yassl/examples/echoserver/echoserver.cpp index 82696568ace..3f639469895 100644 --- a/extra/yassl/examples/echoserver/echoserver.cpp +++ b/extra/yassl/examples/echoserver/echoserver.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* echoserver.cpp */ diff --git a/extra/yassl/examples/server/server.cpp b/extra/yassl/examples/server/server.cpp index 1540f6d3689..8a3a0a7db0e 100644 --- a/extra/yassl/examples/server/server.cpp +++ b/extra/yassl/examples/server/server.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* server.cpp */ diff --git a/extra/yassl/include/buffer.hpp b/extra/yassl/include/buffer.hpp index 77d2ed8193c..71bea3c109a 100644 --- a/extra/yassl/include/buffer.hpp +++ b/extra/yassl/include/buffer.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/include/cert_wrapper.hpp b/extra/yassl/include/cert_wrapper.hpp index 7e9f197e58d..a3a52828cc6 100644 --- a/extra/yassl/include/cert_wrapper.hpp +++ b/extra/yassl/include/cert_wrapper.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/include/crypto_wrapper.hpp b/extra/yassl/include/crypto_wrapper.hpp index 0472b304679..97cd989b78d 100644 --- a/extra/yassl/include/crypto_wrapper.hpp +++ b/extra/yassl/include/crypto_wrapper.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/include/factory.hpp b/extra/yassl/include/factory.hpp index 5c60335fbc2..e0f420844fb 100644 --- a/extra/yassl/include/factory.hpp +++ b/extra/yassl/include/factory.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* The factory header defines an Object Factory, used by SSL message and diff --git a/extra/yassl/include/handshake.hpp b/extra/yassl/include/handshake.hpp index a8ed0545ae4..dc472690c73 100644 --- a/extra/yassl/include/handshake.hpp +++ b/extra/yassl/include/handshake.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* The handshake header declares function prototypes for creating and reading diff --git a/extra/yassl/include/lock.hpp b/extra/yassl/include/lock.hpp index 5273f92f151..3f66ea145bf 100644 --- a/extra/yassl/include/lock.hpp +++ b/extra/yassl/include/lock.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* lock.hpp provides an os specific Lock, locks mutex on entry and unlocks diff --git a/extra/yassl/include/log.hpp b/extra/yassl/include/log.hpp index faaf68e64a1..8dc33684a43 100644 --- a/extra/yassl/include/log.hpp +++ b/extra/yassl/include/log.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/include/openssl/crypto.h b/extra/yassl/include/openssl/crypto.h index 103fcbb0e30..d60d5a0e398 100644 --- a/extra/yassl/include/openssl/crypto.h +++ b/extra/yassl/include/openssl/crypto.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* crypto.h for openSSL */ diff --git a/extra/yassl/include/openssl/des.h b/extra/yassl/include/openssl/des.h index f7394b65634..71cd7e9b1a9 100644 --- a/extra/yassl/include/openssl/des.h +++ b/extra/yassl/include/openssl/des.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* des.h for openssl */ diff --git a/extra/yassl/include/openssl/des_old.h b/extra/yassl/include/openssl/des_old.h index b6e2e3e969a..b2467185445 100644 --- a/extra/yassl/include/openssl/des_old.h +++ b/extra/yassl/include/openssl/des_old.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* des_old.h for openvn */ diff --git a/extra/yassl/include/openssl/engine.h b/extra/yassl/include/openssl/engine.h index 15ddcd14640..52c43f08010 100644 --- a/extra/yassl/include/openssl/engine.h +++ b/extra/yassl/include/openssl/engine.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* engine.h for libcurl */ diff --git a/extra/yassl/include/openssl/err.h b/extra/yassl/include/openssl/err.h index 948474296fa..fc96330e90e 100644 --- a/extra/yassl/include/openssl/err.h +++ b/extra/yassl/include/openssl/err.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* err.h for openssl */ diff --git a/extra/yassl/include/openssl/evp.h b/extra/yassl/include/openssl/evp.h index 6aa7335dabc..a57c4a9088b 100644 --- a/extra/yassl/include/openssl/evp.h +++ b/extra/yassl/include/openssl/evp.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* evp.h for openSSL */ diff --git a/extra/yassl/include/openssl/generate_prefix_files.pl b/extra/yassl/include/openssl/generate_prefix_files.pl index 8fbfb146955..d7609aebaf3 100755 --- a/extra/yassl/include/openssl/generate_prefix_files.pl +++ b/extra/yassl/include/openssl/generate_prefix_files.pl @@ -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 # # This script generates defines for all functions diff --git a/extra/yassl/include/openssl/hmac.h b/extra/yassl/include/openssl/hmac.h index 5da6644e1de..0a3861c0937 100644 --- a/extra/yassl/include/openssl/hmac.h +++ b/extra/yassl/include/openssl/hmac.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* hmac.h for openvpn */ diff --git a/extra/yassl/include/openssl/lhash.h b/extra/yassl/include/openssl/lhash.h index 6d64df7d9d2..bde2d3742b3 100644 --- a/extra/yassl/include/openssl/lhash.h +++ b/extra/yassl/include/openssl/lhash.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* lhash.h for openSSL */ diff --git a/extra/yassl/include/openssl/md4.h b/extra/yassl/include/openssl/md4.h index 8a864993c9c..360499018cb 100644 --- a/extra/yassl/include/openssl/md4.h +++ b/extra/yassl/include/openssl/md4.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* md4.h for libcurl */ diff --git a/extra/yassl/include/openssl/md5.h b/extra/yassl/include/openssl/md5.h index b54ebcd910e..abe6200a4cc 100644 --- a/extra/yassl/include/openssl/md5.h +++ b/extra/yassl/include/openssl/md5.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* md5.h for openssl */ diff --git a/extra/yassl/include/openssl/objects.h b/extra/yassl/include/openssl/objects.h index ed2c0294527..fb9a265a19c 100644 --- a/extra/yassl/include/openssl/objects.h +++ b/extra/yassl/include/openssl/objects.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* objects.h for openvpn */ diff --git a/extra/yassl/include/openssl/opensslv.h b/extra/yassl/include/openssl/opensslv.h index 88b9ca6d26d..477d2656650 100644 --- a/extra/yassl/include/openssl/opensslv.h +++ b/extra/yassl/include/openssl/opensslv.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* opensslv.h compatibility */ diff --git a/extra/yassl/include/openssl/pem.h b/extra/yassl/include/openssl/pem.h index c467e461d7f..4b308a58ad8 100644 --- a/extra/yassl/include/openssl/pem.h +++ b/extra/yassl/include/openssl/pem.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* pem.h for libcurl */ diff --git a/extra/yassl/include/openssl/pkcs12.h b/extra/yassl/include/openssl/pkcs12.h index c3f8ee67968..4f848209cdb 100644 --- a/extra/yassl/include/openssl/pkcs12.h +++ b/extra/yassl/include/openssl/pkcs12.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* pkcs12.h for libcurl */ diff --git a/extra/yassl/include/openssl/prefix_crypto.h b/extra/yassl/include/openssl/prefix_crypto.h index 895dd51a23f..acf3e7bd7d3 100644 --- a/extra/yassl/include/openssl/prefix_crypto.h +++ b/extra/yassl/include/openssl/prefix_crypto.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ #define SSLeay_version yaSSLeay_version diff --git a/extra/yassl/include/openssl/prefix_ssl.h b/extra/yassl/include/openssl/prefix_ssl.h index 22b3f4de34b..0f2f2dcded2 100644 --- a/extra/yassl/include/openssl/prefix_ssl.h +++ b/extra/yassl/include/openssl/prefix_ssl.h @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ #define Copyright yaCopyright diff --git a/extra/yassl/include/openssl/rand.h b/extra/yassl/include/openssl/rand.h index 9e0cedf3e86..7f605915efd 100644 --- a/extra/yassl/include/openssl/rand.h +++ b/extra/yassl/include/openssl/rand.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* rand.h for openSSL */ diff --git a/extra/yassl/include/openssl/rsa.h b/extra/yassl/include/openssl/rsa.h index 95305a84ba5..453161a7c21 100644 --- a/extra/yassl/include/openssl/rsa.h +++ b/extra/yassl/include/openssl/rsa.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* rsa.h for openSSL */ diff --git a/extra/yassl/include/openssl/sha.h b/extra/yassl/include/openssl/sha.h index 5b7c6bd238a..af097309846 100644 --- a/extra/yassl/include/openssl/sha.h +++ b/extra/yassl/include/openssl/sha.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* sha.h for openvpn */ diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h index 0cce783de35..81d201b28a6 100644 --- a/extra/yassl/include/openssl/ssl.h +++ b/extra/yassl/include/openssl/ssl.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* ssl.h defines openssl compatibility layer diff --git a/extra/yassl/include/openssl/x509.h b/extra/yassl/include/openssl/x509.h index 74eb83eb13f..dd79e6833ec 100644 --- a/extra/yassl/include/openssl/x509.h +++ b/extra/yassl/include/openssl/x509.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* x509.h for libcurl */ diff --git a/extra/yassl/include/openssl/x509v3.h b/extra/yassl/include/openssl/x509v3.h index b48e9b485d4..4a7a2175ebe 100644 --- a/extra/yassl/include/openssl/x509v3.h +++ b/extra/yassl/include/openssl/x509v3.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* x509v3.h for libcurl */ diff --git a/extra/yassl/include/socket_wrapper.hpp b/extra/yassl/include/socket_wrapper.hpp index c9f1e3af09c..32fd8ab2a07 100644 --- a/extra/yassl/include/socket_wrapper.hpp +++ b/extra/yassl/include/socket_wrapper.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/include/timer.hpp b/extra/yassl/include/timer.hpp index 1587c079ba0..57b4022484b 100644 --- a/extra/yassl/include/timer.hpp +++ b/extra/yassl/include/timer.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* timer.hpp provides a high res and low res timers diff --git a/extra/yassl/include/yassl.hpp b/extra/yassl/include/yassl.hpp index e7b9a6f2526..ff6869a3ec4 100644 --- a/extra/yassl/include/yassl.hpp +++ b/extra/yassl/include/yassl.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/include/yassl_error.hpp b/extra/yassl/include/yassl_error.hpp index d63244dca90..bc97058d881 100644 --- a/extra/yassl/include/yassl_error.hpp +++ b/extra/yassl/include/yassl_error.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/include/yassl_imp.hpp b/extra/yassl/include/yassl_imp.hpp index a952da0d3d9..fbd2ebb93a7 100644 --- a/extra/yassl/include/yassl_imp.hpp +++ b/extra/yassl/include/yassl_imp.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* yaSSL implementation header defines all strucutres from the SSL.v3 diff --git a/extra/yassl/include/yassl_int.hpp b/extra/yassl/include/yassl_int.hpp index d046d4f0743..e844bbb5fcd 100644 --- a/extra/yassl/include/yassl_int.hpp +++ b/extra/yassl/include/yassl_int.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/include/yassl_types.hpp b/extra/yassl/include/yassl_types.hpp index 129661c58ed..3132d75a6ff 100644 --- a/extra/yassl/include/yassl_types.hpp +++ b/extra/yassl/include/yassl_types.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* yaSSL types header defines all constants, enums, and typedefs diff --git a/extra/yassl/src/buffer.cpp b/extra/yassl/src/buffer.cpp index 532da3875a7..919aa9c7436 100644 --- a/extra/yassl/src/buffer.cpp +++ b/extra/yassl/src/buffer.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/src/cert_wrapper.cpp b/extra/yassl/src/cert_wrapper.cpp index f620f5efce0..b7599a22897 100644 --- a/extra/yassl/src/cert_wrapper.cpp +++ b/extra/yassl/src/cert_wrapper.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/src/crypto_wrapper.cpp b/extra/yassl/src/crypto_wrapper.cpp index c40599880b2..e027c507b37 100644 --- a/extra/yassl/src/crypto_wrapper.cpp +++ b/extra/yassl/src/crypto_wrapper.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* The crypto wrapper source implements the policies for the cipher diff --git a/extra/yassl/src/handshake.cpp b/extra/yassl/src/handshake.cpp index bb8e3791552..5e7d5cd9019 100644 --- a/extra/yassl/src/handshake.cpp +++ b/extra/yassl/src/handshake.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/src/lock.cpp b/extra/yassl/src/lock.cpp index c74ea1c6b76..44cbcc1151f 100644 --- a/extra/yassl/src/lock.cpp +++ b/extra/yassl/src/lock.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* Locking functions diff --git a/extra/yassl/src/log.cpp b/extra/yassl/src/log.cpp index c4be306a7b8..5adbe401d7a 100644 --- a/extra/yassl/src/log.cpp +++ b/extra/yassl/src/log.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* Debug logging functions diff --git a/extra/yassl/src/make.bat b/extra/yassl/src/make.bat index cbe5f3f71b2..da7cc315382 100755 --- a/extra/yassl/src/make.bat +++ b/extra/yassl/src/make.bat @@ -11,7 +11,7 @@ REM GNU General Public License for more details. REM REM You should have received a copy of the GNU General Public License REM along with this program; if not, write to the Free Software -REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA REM quick and dirty build file for testing different MSDEVs setlocal diff --git a/extra/yassl/src/socket_wrapper.cpp b/extra/yassl/src/socket_wrapper.cpp index 7afd4d41d1d..315f88bb491 100644 --- a/extra/yassl/src/socket_wrapper.cpp +++ b/extra/yassl/src/socket_wrapper.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp index 1deb827d22e..fa1a65fafd1 100644 --- a/extra/yassl/src/ssl.cpp +++ b/extra/yassl/src/ssl.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* SSL source implements all openssl compatibility API functions diff --git a/extra/yassl/src/template_instnt.cpp b/extra/yassl/src/template_instnt.cpp index f0f0f095f99..bc228e4b948 100644 --- a/extra/yassl/src/template_instnt.cpp +++ b/extra/yassl/src/template_instnt.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/src/timer.cpp b/extra/yassl/src/timer.cpp index 0c3f044c75f..dadb3ebf378 100644 --- a/extra/yassl/src/timer.cpp +++ b/extra/yassl/src/timer.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* timer.cpp implements a high res and low res timer diff --git a/extra/yassl/src/yassl.cpp b/extra/yassl/src/yassl.cpp index b6b9a87e09a..89600359401 100644 --- a/extra/yassl/src/yassl.cpp +++ b/extra/yassl/src/yassl.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/src/yassl_error.cpp b/extra/yassl/src/yassl_error.cpp index fec6a3394ca..5ced3893523 100644 --- a/extra/yassl/src/yassl_error.cpp +++ b/extra/yassl/src/yassl_error.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/src/yassl_imp.cpp b/extra/yassl/src/yassl_imp.cpp index 85bf0afe2db..fbf43de8cb6 100644 --- a/extra/yassl/src/yassl_imp.cpp +++ b/extra/yassl/src/yassl_imp.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* yaSSL source implements all SSL.v3 secification structures. diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp index 312c00442ca..2c1b57fa846 100644 --- a/extra/yassl/src/yassl_int.cpp +++ b/extra/yassl/src/yassl_int.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/CMakeLists.txt b/extra/yassl/taocrypt/CMakeLists.txt index a08089870a3..eb5531fec51 100644 --- a/extra/yassl/taocrypt/CMakeLists.txt +++ b/extra/yassl/taocrypt/CMakeLists.txt @@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include) diff --git a/extra/yassl/taocrypt/COPYING b/extra/yassl/taocrypt/COPYING index d20476ee118..98861a5402d 100644 --- a/extra/yassl/taocrypt/COPYING +++ b/extra/yassl/taocrypt/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. You should have 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 Also add information on how to contact you by electronic and paper mail. diff --git a/extra/yassl/taocrypt/benchmark/benchmark.cpp b/extra/yassl/taocrypt/benchmark/benchmark.cpp index 834f340b651..6afad32ed41 100644 --- a/extra/yassl/taocrypt/benchmark/benchmark.cpp +++ b/extra/yassl/taocrypt/benchmark/benchmark.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ // benchmark.cpp diff --git a/extra/yassl/taocrypt/benchmark/make.bat b/extra/yassl/taocrypt/benchmark/make.bat index f6971f72021..8f445986c7e 100755 --- a/extra/yassl/taocrypt/benchmark/make.bat +++ b/extra/yassl/taocrypt/benchmark/make.bat @@ -11,7 +11,7 @@ REM GNU General Public License for more details. REM REM You should have received a copy of the GNU General Public License REM along with this program; if not, write to the Free Software -REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA REM quick and dirty build file for testing different MSDEVs setlocal diff --git a/extra/yassl/taocrypt/include/aes.hpp b/extra/yassl/taocrypt/include/aes.hpp index bccf6e73fc7..191f294b2b5 100644 --- a/extra/yassl/taocrypt/include/aes.hpp +++ b/extra/yassl/taocrypt/include/aes.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* aes.hpp defines AES diff --git a/extra/yassl/taocrypt/include/algebra.hpp b/extra/yassl/taocrypt/include/algebra.hpp index e084172b93f..b216e5cccca 100644 --- a/extra/yassl/taocrypt/include/algebra.hpp +++ b/extra/yassl/taocrypt/include/algebra.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* based on Wei Dai's algebra.h from CryptoPP */ diff --git a/extra/yassl/taocrypt/include/arc4.hpp b/extra/yassl/taocrypt/include/arc4.hpp index 333d057168f..ed6a35e054a 100644 --- a/extra/yassl/taocrypt/include/arc4.hpp +++ b/extra/yassl/taocrypt/include/arc4.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* arc4.hpp defines ARC4 diff --git a/extra/yassl/taocrypt/include/asn.hpp b/extra/yassl/taocrypt/include/asn.hpp index 9a10064ce02..21b694f8bd4 100644 --- a/extra/yassl/taocrypt/include/asn.hpp +++ b/extra/yassl/taocrypt/include/asn.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* asn.hpp provides ASN1 BER, PublicKey, and x509v3 decoding diff --git a/extra/yassl/taocrypt/include/block.hpp b/extra/yassl/taocrypt/include/block.hpp index 1e4bd454b06..b5958a06955 100644 --- a/extra/yassl/taocrypt/include/block.hpp +++ b/extra/yassl/taocrypt/include/block.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/include/blowfish.hpp b/extra/yassl/taocrypt/include/blowfish.hpp index 347cf05de4b..74ea7f99480 100644 --- a/extra/yassl/taocrypt/include/blowfish.hpp +++ b/extra/yassl/taocrypt/include/blowfish.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* blowfish.hpp defines Blowfish diff --git a/extra/yassl/taocrypt/include/coding.hpp b/extra/yassl/taocrypt/include/coding.hpp index 8c30169c765..758ac452673 100644 --- a/extra/yassl/taocrypt/include/coding.hpp +++ b/extra/yassl/taocrypt/include/coding.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* coding.hpp defines hex and base64 encoding/decoing diff --git a/extra/yassl/taocrypt/include/des.hpp b/extra/yassl/taocrypt/include/des.hpp index d88e9ef2f46..074cc80d3dd 100644 --- a/extra/yassl/taocrypt/include/des.hpp +++ b/extra/yassl/taocrypt/include/des.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* des.hpp defines DES, DES_EDE2, and DES_EDE3 diff --git a/extra/yassl/taocrypt/include/dh.hpp b/extra/yassl/taocrypt/include/dh.hpp index 2dff8dcd58e..84c41004107 100644 --- a/extra/yassl/taocrypt/include/dh.hpp +++ b/extra/yassl/taocrypt/include/dh.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* dh.hpp provides Diffie-Hellman support diff --git a/extra/yassl/taocrypt/include/dsa.hpp b/extra/yassl/taocrypt/include/dsa.hpp index 9dffcbe4460..e35b56a1d91 100644 --- a/extra/yassl/taocrypt/include/dsa.hpp +++ b/extra/yassl/taocrypt/include/dsa.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* dsa.hpp provides Digitial Signautre Algorithm see FIPS 186-2 diff --git a/extra/yassl/taocrypt/include/error.hpp b/extra/yassl/taocrypt/include/error.hpp index 49bc62e6e8d..a749c00d80d 100644 --- a/extra/yassl/taocrypt/include/error.hpp +++ b/extra/yassl/taocrypt/include/error.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* error.hpp provides a taocrypt error numbers diff --git a/extra/yassl/taocrypt/include/file.hpp b/extra/yassl/taocrypt/include/file.hpp index c340c4fa3ea..1e2955d8737 100644 --- a/extra/yassl/taocrypt/include/file.hpp +++ b/extra/yassl/taocrypt/include/file.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* file.hpp provies File Sources and Sinks diff --git a/extra/yassl/taocrypt/include/hash.hpp b/extra/yassl/taocrypt/include/hash.hpp index 4d2f7dd35a1..4ffb305869a 100644 --- a/extra/yassl/taocrypt/include/hash.hpp +++ b/extra/yassl/taocrypt/include/hash.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* hash.hpp provides a base for digest types diff --git a/extra/yassl/taocrypt/include/hc128.hpp b/extra/yassl/taocrypt/include/hc128.hpp index 0449b28d8c7..e1ed337de6a 100644 --- a/extra/yassl/taocrypt/include/hc128.hpp +++ b/extra/yassl/taocrypt/include/hc128.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* hc128.hpp defines HC128 diff --git a/extra/yassl/taocrypt/include/hmac.hpp b/extra/yassl/taocrypt/include/hmac.hpp index 16e208eeda1..a5b16cdaf38 100644 --- a/extra/yassl/taocrypt/include/hmac.hpp +++ b/extra/yassl/taocrypt/include/hmac.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* hamc.hpp implements HMAC, see RFC 2104 diff --git a/extra/yassl/taocrypt/include/integer.hpp b/extra/yassl/taocrypt/include/integer.hpp index 05fe189fd58..613ed44b13d 100644 --- a/extra/yassl/taocrypt/include/integer.hpp +++ b/extra/yassl/taocrypt/include/integer.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* based on Wei Dai's integer.h from CryptoPP */ diff --git a/extra/yassl/taocrypt/include/kernelc.hpp b/extra/yassl/taocrypt/include/kernelc.hpp index 0840b3f2740..5d0ceadc4d0 100644 --- a/extra/yassl/taocrypt/include/kernelc.hpp +++ b/extra/yassl/taocrypt/include/kernelc.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* kernelc.hpp provides support for C std lib when compiled in kernel mode diff --git a/extra/yassl/taocrypt/include/md2.hpp b/extra/yassl/taocrypt/include/md2.hpp index 49fefa9a273..89226fc93a1 100644 --- a/extra/yassl/taocrypt/include/md2.hpp +++ b/extra/yassl/taocrypt/include/md2.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* md2.hpp provides MD2 digest support, see RFC 1319 diff --git a/extra/yassl/taocrypt/include/md4.hpp b/extra/yassl/taocrypt/include/md4.hpp index e27efbe82c3..a4e87b5ccf5 100644 --- a/extra/yassl/taocrypt/include/md4.hpp +++ b/extra/yassl/taocrypt/include/md4.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* md4.hpp provides MD4 digest support diff --git a/extra/yassl/taocrypt/include/md5.hpp b/extra/yassl/taocrypt/include/md5.hpp index 49a411e869a..a065d3d6e52 100644 --- a/extra/yassl/taocrypt/include/md5.hpp +++ b/extra/yassl/taocrypt/include/md5.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* md5.hpp provides MD5 digest support, see RFC 1321 diff --git a/extra/yassl/taocrypt/include/misc.hpp b/extra/yassl/taocrypt/include/misc.hpp index 69c326d7561..e0167d7f855 100644 --- a/extra/yassl/taocrypt/include/misc.hpp +++ b/extra/yassl/taocrypt/include/misc.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* based on Wei Dai's misc.h from CryptoPP */ diff --git a/extra/yassl/taocrypt/include/modarith.hpp b/extra/yassl/taocrypt/include/modarith.hpp index 75bf9b47593..e536b5722e3 100644 --- a/extra/yassl/taocrypt/include/modarith.hpp +++ b/extra/yassl/taocrypt/include/modarith.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/include/modes.hpp b/extra/yassl/taocrypt/include/modes.hpp index bfe8c6ec5d4..db192bf7b59 100644 --- a/extra/yassl/taocrypt/include/modes.hpp +++ b/extra/yassl/taocrypt/include/modes.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* modes.hpp provides ECB and CBC modes for block cipher encryption/decryption diff --git a/extra/yassl/taocrypt/include/pwdbased.hpp b/extra/yassl/taocrypt/include/pwdbased.hpp index 32da429f747..57495d01b50 100644 --- a/extra/yassl/taocrypt/include/pwdbased.hpp +++ b/extra/yassl/taocrypt/include/pwdbased.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/include/rabbit.hpp b/extra/yassl/taocrypt/include/rabbit.hpp index fb4e12c66bc..e9af478fedf 100644 --- a/extra/yassl/taocrypt/include/rabbit.hpp +++ b/extra/yassl/taocrypt/include/rabbit.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* rabbit.hpp defines Rabbit diff --git a/extra/yassl/taocrypt/include/random.hpp b/extra/yassl/taocrypt/include/random.hpp index b51b4c3c369..90d38de7943 100644 --- a/extra/yassl/taocrypt/include/random.hpp +++ b/extra/yassl/taocrypt/include/random.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* random.hpp provides a crypto secure Random Number Generator using an OS diff --git a/extra/yassl/taocrypt/include/ripemd.hpp b/extra/yassl/taocrypt/include/ripemd.hpp index 0599bdc5ac5..d50a1714232 100644 --- a/extra/yassl/taocrypt/include/ripemd.hpp +++ b/extra/yassl/taocrypt/include/ripemd.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* ripemd.hpp provides RIPEMD digest support diff --git a/extra/yassl/taocrypt/include/rsa.hpp b/extra/yassl/taocrypt/include/rsa.hpp index ee3e378a69f..446752c64b6 100644 --- a/extra/yassl/taocrypt/include/rsa.hpp +++ b/extra/yassl/taocrypt/include/rsa.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* rsa.hpp provides RSA ES encrypt/decrypt, SSL (block type 1) sign and verify diff --git a/extra/yassl/taocrypt/include/runtime.hpp b/extra/yassl/taocrypt/include/runtime.hpp index ef2facf32b0..90f084320cb 100644 --- a/extra/yassl/taocrypt/include/runtime.hpp +++ b/extra/yassl/taocrypt/include/runtime.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* runtime.hpp provides C++ runtime support functions when building a pure C diff --git a/extra/yassl/taocrypt/include/sha.hpp b/extra/yassl/taocrypt/include/sha.hpp index cf6d0d09a1d..8b18b7a66ae 100644 --- a/extra/yassl/taocrypt/include/sha.hpp +++ b/extra/yassl/taocrypt/include/sha.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* sha.hpp provides SHA-1 digests, see RFC 3174 diff --git a/extra/yassl/taocrypt/include/twofish.hpp b/extra/yassl/taocrypt/include/twofish.hpp index 236daed5597..c2b0e6f75ad 100644 --- a/extra/yassl/taocrypt/include/twofish.hpp +++ b/extra/yassl/taocrypt/include/twofish.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* twofish.hpp defines Twofish diff --git a/extra/yassl/taocrypt/include/type_traits.hpp b/extra/yassl/taocrypt/include/type_traits.hpp index 3383c23cd1a..f85ae552c18 100644 --- a/extra/yassl/taocrypt/include/type_traits.hpp +++ b/extra/yassl/taocrypt/include/type_traits.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* type_traits defines fundamental types diff --git a/extra/yassl/taocrypt/include/types.hpp b/extra/yassl/taocrypt/include/types.hpp index 973e1d19893..97136970e13 100644 --- a/extra/yassl/taocrypt/include/types.hpp +++ b/extra/yassl/taocrypt/include/types.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* based on Wei Dai's misc.h from CryptoPP, basic crypt types */ diff --git a/extra/yassl/taocrypt/mySTL/algorithm.hpp b/extra/yassl/taocrypt/mySTL/algorithm.hpp index 02a7c8c07d0..06731525bf1 100644 --- a/extra/yassl/taocrypt/mySTL/algorithm.hpp +++ b/extra/yassl/taocrypt/mySTL/algorithm.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/mySTL/helpers.hpp b/extra/yassl/taocrypt/mySTL/helpers.hpp index 10ebb0ac62b..ec9266ddf2a 100644 --- a/extra/yassl/taocrypt/mySTL/helpers.hpp +++ b/extra/yassl/taocrypt/mySTL/helpers.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/mySTL/list.hpp b/extra/yassl/taocrypt/mySTL/list.hpp index d3297db4418..c71ebc8def5 100644 --- a/extra/yassl/taocrypt/mySTL/list.hpp +++ b/extra/yassl/taocrypt/mySTL/list.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/mySTL/memory.hpp b/extra/yassl/taocrypt/mySTL/memory.hpp index 0c57620ff01..fdd34cda125 100644 --- a/extra/yassl/taocrypt/mySTL/memory.hpp +++ b/extra/yassl/taocrypt/mySTL/memory.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/mySTL/memory_array.hpp b/extra/yassl/taocrypt/mySTL/memory_array.hpp index cc49208e9f2..af4c2cdf232 100644 --- a/extra/yassl/taocrypt/mySTL/memory_array.hpp +++ b/extra/yassl/taocrypt/mySTL/memory_array.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/mySTL/pair.hpp b/extra/yassl/taocrypt/mySTL/pair.hpp index 1c9579fa057..9dd97f63bfa 100644 --- a/extra/yassl/taocrypt/mySTL/pair.hpp +++ b/extra/yassl/taocrypt/mySTL/pair.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/mySTL/stdexcept.hpp b/extra/yassl/taocrypt/mySTL/stdexcept.hpp index 79ae6de3380..8c12b51e130 100644 --- a/extra/yassl/taocrypt/mySTL/stdexcept.hpp +++ b/extra/yassl/taocrypt/mySTL/stdexcept.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/mySTL/vector.hpp b/extra/yassl/taocrypt/mySTL/vector.hpp index f3702b75125..0abcf910baf 100644 --- a/extra/yassl/taocrypt/mySTL/vector.hpp +++ b/extra/yassl/taocrypt/mySTL/vector.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/src/aes.cpp b/extra/yassl/taocrypt/src/aes.cpp index 2321c72554c..4e4ea849c21 100644 --- a/extra/yassl/taocrypt/src/aes.cpp +++ b/extra/yassl/taocrypt/src/aes.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* C++ based on Wei Dai's aes.cpp from CryptoPP */ diff --git a/extra/yassl/taocrypt/src/aestables.cpp b/extra/yassl/taocrypt/src/aestables.cpp index 60795a549e4..7c6a53bdcd5 100644 --- a/extra/yassl/taocrypt/src/aestables.cpp +++ b/extra/yassl/taocrypt/src/aestables.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* based on Wei Dai's aestables.cpp from CryptoPP */ diff --git a/extra/yassl/taocrypt/src/algebra.cpp b/extra/yassl/taocrypt/src/algebra.cpp index 8b4ab9c87cd..e2257701ae8 100644 --- a/extra/yassl/taocrypt/src/algebra.cpp +++ b/extra/yassl/taocrypt/src/algebra.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* based on Wei Dai's algebra.cpp from CryptoPP */ diff --git a/extra/yassl/taocrypt/src/arc4.cpp b/extra/yassl/taocrypt/src/arc4.cpp index 10a3a7d6ffc..6d11f5c113a 100644 --- a/extra/yassl/taocrypt/src/arc4.cpp +++ b/extra/yassl/taocrypt/src/arc4.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* based on Wei Dai's arc4.cpp from CryptoPP */ diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp index 7ff3c7167d2..8cb9aee15fd 100644 --- a/extra/yassl/taocrypt/src/asn.cpp +++ b/extra/yassl/taocrypt/src/asn.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* asn.cpp implements ASN1 BER, PublicKey, and x509v3 decoding diff --git a/extra/yassl/taocrypt/src/bftables.cpp b/extra/yassl/taocrypt/src/bftables.cpp index 8e0bde1fed6..088f9778da1 100644 --- a/extra/yassl/taocrypt/src/bftables.cpp +++ b/extra/yassl/taocrypt/src/bftables.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* based on Wei Dai's bfinit.cpp from CryptoPP */ diff --git a/extra/yassl/taocrypt/src/blowfish.cpp b/extra/yassl/taocrypt/src/blowfish.cpp index 87b0556755e..45f6fb793f8 100644 --- a/extra/yassl/taocrypt/src/blowfish.cpp +++ b/extra/yassl/taocrypt/src/blowfish.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* C++ code based on Wei Dai's blowfish.cpp from CryptoPP */ diff --git a/extra/yassl/taocrypt/src/coding.cpp b/extra/yassl/taocrypt/src/coding.cpp index 8f317a484d8..85d657c352d 100644 --- a/extra/yassl/taocrypt/src/coding.cpp +++ b/extra/yassl/taocrypt/src/coding.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* coding.cpp implements hex and base64 encoding/decoing diff --git a/extra/yassl/taocrypt/src/des.cpp b/extra/yassl/taocrypt/src/des.cpp index 673c21ed207..5b6fd9aa05b 100644 --- a/extra/yassl/taocrypt/src/des.cpp +++ b/extra/yassl/taocrypt/src/des.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* C++ part based on Wei Dai's des.cpp from CryptoPP */ diff --git a/extra/yassl/taocrypt/src/dh.cpp b/extra/yassl/taocrypt/src/dh.cpp index b7f1d7e6d4a..cc677cba458 100644 --- a/extra/yassl/taocrypt/src/dh.cpp +++ b/extra/yassl/taocrypt/src/dh.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/src/dsa.cpp b/extra/yassl/taocrypt/src/dsa.cpp index fda01881df5..ccdefa46025 100644 --- a/extra/yassl/taocrypt/src/dsa.cpp +++ b/extra/yassl/taocrypt/src/dsa.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/src/file.cpp b/extra/yassl/taocrypt/src/file.cpp index ab7a5c2b61b..5dfc19ca7bd 100644 --- a/extra/yassl/taocrypt/src/file.cpp +++ b/extra/yassl/taocrypt/src/file.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* file.cpp implements File Sources and Sinks diff --git a/extra/yassl/taocrypt/src/hash.cpp b/extra/yassl/taocrypt/src/hash.cpp index c176e6a68d0..9fa65a36074 100644 --- a/extra/yassl/taocrypt/src/hash.cpp +++ b/extra/yassl/taocrypt/src/hash.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* hash.cpp implements a base for digest types diff --git a/extra/yassl/taocrypt/src/hc128.cpp b/extra/yassl/taocrypt/src/hc128.cpp index 8934c318781..4e1542097d0 100644 --- a/extra/yassl/taocrypt/src/hc128.cpp +++ b/extra/yassl/taocrypt/src/hc128.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/src/integer.cpp b/extra/yassl/taocrypt/src/integer.cpp index d8510066d04..82c09a95765 100644 --- a/extra/yassl/taocrypt/src/integer.cpp +++ b/extra/yassl/taocrypt/src/integer.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/src/make.bat b/extra/yassl/taocrypt/src/make.bat index f302db51065..6572d7f354a 100755 --- a/extra/yassl/taocrypt/src/make.bat +++ b/extra/yassl/taocrypt/src/make.bat @@ -11,7 +11,7 @@ REM GNU General Public License for more details. REM REM You should have received a copy of the GNU General Public License REM along with this program; if not, write to the Free Software -REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA REM quick and dirty build file for testing different MSDEVs setlocal diff --git a/extra/yassl/taocrypt/src/md2.cpp b/extra/yassl/taocrypt/src/md2.cpp index aefe3045279..b1a7190d1f8 100644 --- a/extra/yassl/taocrypt/src/md2.cpp +++ b/extra/yassl/taocrypt/src/md2.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/src/md4.cpp b/extra/yassl/taocrypt/src/md4.cpp index 9364a1c23b1..02613fcf1e3 100644 --- a/extra/yassl/taocrypt/src/md4.cpp +++ b/extra/yassl/taocrypt/src/md4.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/src/md5.cpp b/extra/yassl/taocrypt/src/md5.cpp index 45cfa8a3322..b68be738e83 100644 --- a/extra/yassl/taocrypt/src/md5.cpp +++ b/extra/yassl/taocrypt/src/md5.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/src/misc.cpp b/extra/yassl/taocrypt/src/misc.cpp index 198f1ba17be..41249bcf373 100644 --- a/extra/yassl/taocrypt/src/misc.cpp +++ b/extra/yassl/taocrypt/src/misc.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* based on Wei Dai's misc.cpp from CryptoPP */ diff --git a/extra/yassl/taocrypt/src/rabbit.cpp b/extra/yassl/taocrypt/src/rabbit.cpp index 5e32f383493..d0d4b0ef3ba 100644 --- a/extra/yassl/taocrypt/src/rabbit.cpp +++ b/extra/yassl/taocrypt/src/rabbit.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/src/random.cpp b/extra/yassl/taocrypt/src/random.cpp index 4b89b5b32c5..44ac324dfb5 100644 --- a/extra/yassl/taocrypt/src/random.cpp +++ b/extra/yassl/taocrypt/src/random.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/src/ripemd.cpp b/extra/yassl/taocrypt/src/ripemd.cpp index 5d03dc61cd6..04b8f82ffcc 100644 --- a/extra/yassl/taocrypt/src/ripemd.cpp +++ b/extra/yassl/taocrypt/src/ripemd.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/src/rsa.cpp b/extra/yassl/taocrypt/src/rsa.cpp index 73f678e2674..e458a1adb21 100644 --- a/extra/yassl/taocrypt/src/rsa.cpp +++ b/extra/yassl/taocrypt/src/rsa.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* based on Wei Dai's rsa.cpp from CryptoPP */ diff --git a/extra/yassl/taocrypt/src/sha.cpp b/extra/yassl/taocrypt/src/sha.cpp index 4206f7f64ea..e7ba5582d38 100644 --- a/extra/yassl/taocrypt/src/sha.cpp +++ b/extra/yassl/taocrypt/src/sha.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* based on Wei Dai's sha.cpp from CryptoPP */ diff --git a/extra/yassl/taocrypt/src/template_instnt.cpp b/extra/yassl/taocrypt/src/template_instnt.cpp index de0137dda7c..8bb0c35aa57 100644 --- a/extra/yassl/taocrypt/src/template_instnt.cpp +++ b/extra/yassl/taocrypt/src/template_instnt.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ diff --git a/extra/yassl/taocrypt/src/tftables.cpp b/extra/yassl/taocrypt/src/tftables.cpp index bf9be335b52..1dd4a846abd 100644 --- a/extra/yassl/taocrypt/src/tftables.cpp +++ b/extra/yassl/taocrypt/src/tftables.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* based on Wei Dai's tftables.cpp from CryptoPP */ diff --git a/extra/yassl/taocrypt/src/twofish.cpp b/extra/yassl/taocrypt/src/twofish.cpp index 8eb82210b0f..2e28ae52cd3 100644 --- a/extra/yassl/taocrypt/src/twofish.cpp +++ b/extra/yassl/taocrypt/src/twofish.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ /* C++ based on Wei Dai's twofish.cpp from CryptoPP */ diff --git a/extra/yassl/taocrypt/test/make.bat b/extra/yassl/taocrypt/test/make.bat index 8f22226cade..cfb762ce847 100755 --- a/extra/yassl/taocrypt/test/make.bat +++ b/extra/yassl/taocrypt/test/make.bat @@ -11,7 +11,7 @@ REM GNU General Public License for more details. REM REM You should have received a copy of the GNU General Public License REM along with this program; if not, write to the Free Software -REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA REM quick and dirty build file for testing different MSDEVs setlocal diff --git a/extra/yassl/taocrypt/test/memory.cpp b/extra/yassl/taocrypt/test/memory.cpp index 053d79688a2..99f1fd646d4 100644 --- a/extra/yassl/taocrypt/test/memory.cpp +++ b/extra/yassl/taocrypt/test/memory.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ // memory.cpp diff --git a/extra/yassl/taocrypt/test/test.cpp b/extra/yassl/taocrypt/test/test.cpp index b07a9eb9f29..cf1ec551fe3 100644 --- a/extra/yassl/taocrypt/test/test.cpp +++ b/extra/yassl/taocrypt/test/test.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ // test.cpp diff --git a/extra/yassl/testsuite/make.bat b/extra/yassl/testsuite/make.bat index b2028e7bf46..eddbe90c400 100755 --- a/extra/yassl/testsuite/make.bat +++ b/extra/yassl/testsuite/make.bat @@ -11,7 +11,7 @@ REM GNU General Public License for more details. REM REM You should have received a copy of the GNU General Public License REM along with this program; if not, write to the Free Software -REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +REM Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA REM quick and dirty build file for testing different MSDEVs setlocal diff --git a/extra/yassl/testsuite/test.hpp b/extra/yassl/testsuite/test.hpp index a65a212cf99..12da450fffe 100644 --- a/extra/yassl/testsuite/test.hpp +++ b/extra/yassl/testsuite/test.hpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ // test.hpp diff --git a/extra/yassl/testsuite/testsuite.cpp b/extra/yassl/testsuite/testsuite.cpp index 7973a3704e1..1792a2a3d9a 100644 --- a/extra/yassl/testsuite/testsuite.cpp +++ b/extra/yassl/testsuite/testsuite.cpp @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301 USA. + MA 02110-1335 USA. */ // testsuite.cpp diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 219a2917917..21209bb239c 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -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 SET(HEADERS_GEN_CONFIGURE mysql_version.h diff --git a/include/atomic/gcc_builtins.h b/include/atomic/gcc_builtins.h index fb6a537d204..49b7125fbef 100644 --- a/include/atomic/gcc_builtins.h +++ b/include/atomic/gcc_builtins.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 */ #define make_atomic_add_body(S) \ v= __sync_fetch_and_add(a, v); diff --git a/include/atomic/generic-msvc.h b/include/atomic/generic-msvc.h index 6c5272c98f4..754f0bfa8b4 100644 --- a/include/atomic/generic-msvc.h +++ b/include/atomic/generic-msvc.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 _atomic_h_cleanup_ #define _atomic_h_cleanup_ "atomic/generic-msvc.h" diff --git a/include/atomic/nolock.h b/include/atomic/nolock.h index 56f37644f96..5ee0c513da9 100644 --- a/include/atomic/nolock.h +++ b/include/atomic/nolock.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 */ #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__) \ || defined(HAVE_GCC_ATOMIC_BUILTINS) \ diff --git a/include/atomic/rwlock.h b/include/atomic/rwlock.h index f6bf7d0b76f..15b40621919 100644 --- a/include/atomic/rwlock.h +++ b/include/atomic/rwlock.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 */ #define MY_ATOMIC_MODE_RWLOCKS 1 diff --git a/include/atomic/solaris.h b/include/atomic/solaris.h index 7b6f0561ff0..cac34040993 100644 --- a/include/atomic/solaris.h +++ b/include/atomic/solaris.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 _atomic_h_cleanup_ #define _atomic_h_cleanup_ "atomic/solaris.h" diff --git a/include/atomic/x86-gcc.h b/include/atomic/x86-gcc.h index 173e32e790c..679ecd3679e 100644 --- a/include/atomic/x86-gcc.h +++ b/include/atomic/x86-gcc.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 */ /* XXX 64-bit atomic operations can be implemented using diff --git a/include/base64.h b/include/base64.h index 1069c286a7a..5651298eb9f 100644 --- a/include/base64.h +++ b/include/base64.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 __BASE64_H_INCLUDED__ #define __BASE64_H_INCLUDED__ diff --git a/include/decimal.h b/include/decimal.h index 935d341437d..8fd7f340497 100644 --- a/include/decimal.h +++ b/include/decimal.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 _decimal_h #define _decimal_h diff --git a/include/errmsg.h b/include/errmsg.h index 5655883466c..252c921e896 100644 --- a/include/errmsg.h +++ b/include/errmsg.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 */ /* Error messages for MySQL clients */ /* (Error messages for the daemon are in sql/share/errmsg.txt) */ diff --git a/include/ft_global.h b/include/ft_global.h index 73726018d0a..1fb56217113 100644 --- a/include/ft_global.h +++ b/include/ft_global.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 */ /* Written by Sergei A. Golubchik, who has a shared copyright to this code */ diff --git a/include/hash.h b/include/hash.h index 98bcf911db2..2d1ac3c9cdb 100644 --- a/include/hash.h +++ b/include/hash.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 */ /* Dynamic hashing of record with different key-length */ diff --git a/include/heap.h b/include/heap.h index eecb7084e66..63d961b577a 100644 --- a/include/heap.h +++ b/include/heap.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 */ /* This file should be included when using heap_database_functions */ diff --git a/include/keycache.h b/include/keycache.h index 8fa9bf1cd18..5e2df48ccd1 100644 --- a/include/keycache.h +++ b/include/keycache.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 */ /* Key cache variable structures */ diff --git a/include/lf.h b/include/lf.h index 07769d10943..21f656e3dc9 100644 --- a/include/lf.h +++ b/include/lf.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 _lf_h #define _lf_h diff --git a/include/m_ctype.h b/include/m_ctype.h index 001884afe81..c5e8b379f4a 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.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 */ /* A better inplementation of the UNIX ctype(3) library. diff --git a/include/m_string.h b/include/m_string.h index 1f59fd06084..66de67c7c9d 100644 --- a/include/m_string.h +++ b/include/m_string.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 */ /* There may be prolems include all of theese. Try to test in configure with ones are needed? */ diff --git a/include/my_aes.h b/include/my_aes.h index 58a78919023..1264f42e873 100644 --- a/include/my_aes.h +++ b/include/my_aes.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 */ /* Header file for my_aes.c */ diff --git a/include/my_alarm.h b/include/my_alarm.h index c3707cba395..19a15a8f8e6 100644 --- a/include/my_alarm.h +++ b/include/my_alarm.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 to include when we want to use alarm or a loop_counter to display diff --git a/include/my_alloc.h b/include/my_alloc.h index 85ac75fc666..52c04fe1b7d 100644 --- a/include/my_alloc.h +++ b/include/my_alloc.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 */ /* Data structures for mysys/my_alloc.c (root memory allocator) diff --git a/include/my_atomic.h b/include/my_atomic.h index 7c589cd776a..88fdd0541aa 100644 --- a/include/my_atomic.h +++ b/include/my_atomic.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 */ /* This header defines five atomic operations: diff --git a/include/my_attribute.h b/include/my_attribute.h index 14ed35cfe24..0bdec175fb4 100644 --- a/include/my_attribute.h +++ b/include/my_attribute.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 */ /* Helper macros used for setting different __attributes__ diff --git a/include/my_bit.h b/include/my_bit.h index 174e0f70083..ef8a8c4a2ac 100644 --- a/include/my_bit.h +++ b/include/my_bit.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 MY_BIT_INCLUDED #define MY_BIT_INCLUDED diff --git a/include/my_bitmap.h b/include/my_bitmap.h index 7bed045bd86..967071a207d 100644 --- a/include/my_bitmap.h +++ b/include/my_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 Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #ifndef _my_bitmap_h_ #define _my_bitmap_h_ diff --git a/include/my_check_opt.h b/include/my_check_opt.h index f952792d2c8..6ada51058ba 100644 --- a/include/my_check_opt.h +++ b/include/my_check_opt.h @@ -11,7 +11,7 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA */ +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #ifndef _my_check_opt_h #define _my_check_opt_h diff --git a/include/my_compare.h b/include/my_compare.h index 87f0aa8f3ca..1d45a332f19 100644 --- a/include/my_compare.h +++ b/include/my_compare.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 _my_compare_h #define _my_compare_h diff --git a/include/my_compiler.h b/include/my_compiler.h index 000d4e42848..86ba250da88 100644 --- a/include/my_compiler.h +++ b/include/my_compiler.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 */ /** Header for compiler-dependent features. diff --git a/include/my_dbug.h b/include/my_dbug.h index a7ada40f8bc..7fbdc6e3fb8 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.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 _my_dbug_h #define _my_dbug_h diff --git a/include/my_dir.h b/include/my_dir.h index 1ee002cc380..28036a32244 100644 --- a/include/my_dir.h +++ b/include/my_dir.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 MY_DIR_H #define MY_DIR_H diff --git a/include/my_getopt.h b/include/my_getopt.h index e3318661c83..62ba3e63734 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.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 _my_getopt_h #define _my_getopt_h diff --git a/include/my_global.h b/include/my_global.h index 194e1039c60..01a1dcadb2f 100644 --- a/include/my_global.h +++ b/include/my_global.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 */ /* This is the include file that should be included 'first' in every C file. */ diff --git a/include/my_libwrap.h b/include/my_libwrap.h index 9a017611408..b5200804170 100644 --- a/include/my_libwrap.h +++ b/include/my_libwrap.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 HAVE_LIBWRAP #include diff --git a/include/my_list.h b/include/my_list.h index 294be663d0e..0bb785bdbf3 100644 --- a/include/my_list.h +++ b/include/my_list.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 _list_h_ #define _list_h_ diff --git a/include/my_md5.h b/include/my_md5.h index f8838aa72f7..c89a0f3973d 100644 --- a/include/my_md5.h +++ b/include/my_md5.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 */ /* See md5.c for explanation and copyright information. */ diff --git a/include/my_net.h b/include/my_net.h index f8c4f99bae7..63c9e8fd6df 100644 --- a/include/my_net.h +++ b/include/my_net.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 */ /* This file is also used to make handling of sockets and ioctl() diff --git a/include/my_nosys.h b/include/my_nosys.h index 97f36d00c57..ff13a04d27b 100644 --- a/include/my_nosys.h +++ b/include/my_nosys.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 */ /* Header to remove use of my_functions in functions where we need speed and diff --git a/include/my_pthread.h b/include/my_pthread.h index 9b5703dedb7..200facfb929 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.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 */ /* Defines to make different thread packages compatible */ diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h index 38ab0de8040..13e40bab501 100644 --- a/include/my_rdtsc.h +++ b/include/my_rdtsc.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 */ /* rdtsc3 -- multi-platform timer code diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h index ad05a7df9ab..5b3013441e7 100644 --- a/include/my_stacktrace.h +++ b/include/my_stacktrace.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 _my_stacktrace_h_ #define _my_stacktrace_h_ diff --git a/include/my_sys.h b/include/my_sys.h index 7b229bb52b0..a7142fe548d 100644 --- a/include/my_sys.h +++ b/include/my_sys.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 _my_sys_h #define _my_sys_h diff --git a/include/my_time.h b/include/my_time.h index bcf1a8cb215..898f44b91ea 100644 --- a/include/my_time.h +++ b/include/my_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 */ /* This is a private header of sql-common library, containing diff --git a/include/my_tree.h b/include/my_tree.h index 1069b232360..8eb27a15875 100644 --- a/include/my_tree.h +++ b/include/my_tree.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 _tree_h #define _tree_h diff --git a/include/my_uctype.h b/include/my_uctype.h index 80ef01c079a..82949ffe2ae 100644 --- a/include/my_uctype.h +++ b/include/my_uctype.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 */ /* Unicode ctype data diff --git a/include/my_user.h b/include/my_user.h index 46eb11a500d..b81b69a82da 100644 --- a/include/my_user.h +++ b/include/my_user.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 is a header for libraries containing functions used in both server and diff --git a/include/my_xml.h b/include/my_xml.h index aee301167ff..d4a91696947 100644 --- a/include/my_xml.h +++ b/include/my_xml.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 _my_xml_h diff --git a/include/myisam.h b/include/myisam.h index 186b049b32e..7ed2a292689 100644 --- a/include/myisam.h +++ b/include/myisam.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 */ /* This file should be included when using myisam_funktions */ diff --git a/include/myisammrg.h b/include/myisammrg.h index 84b2d637892..136932c7db1 100644 --- a/include/myisammrg.h +++ b/include/myisammrg.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 */ /* This file should be included when using merge_isam_funktions */ diff --git a/include/myisampack.h b/include/myisampack.h index 0795455dc3e..22820ca7158 100644 --- a/include/myisampack.h +++ b/include/myisampack.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 */ /* Storing of values in high byte first order. diff --git a/include/mysql.h b/include/mysql.h index 1ed6ffe67c8..543e245d1e8 100644 --- a/include/mysql.h +++ b/include/mysql.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 */ /* This file defines the client API to MySQL and also the ABI of the diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h index b2df0019dfe..db25239c7f7 100644 --- a/include/mysql/client_plugin.h +++ b/include/mysql/client_plugin.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 */ /** @file diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 6b2dba46193..74c58ebde6e 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/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 _my_plugin_h #define _my_plugin_h diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h index 31589f071f0..4777d4216ff 100644 --- a/include/mysql/plugin_audit.h +++ b/include/mysql/plugin_audit.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 _my_audit_h #define _my_audit_h diff --git a/include/mysql/plugin_auth.h b/include/mysql/plugin_auth.h index 156fb386aae..5050cbd922e 100644 --- a/include/mysql/plugin_auth.h +++ b/include/mysql/plugin_auth.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 */ /** @file diff --git a/include/mysql/plugin_auth_common.h b/include/mysql/plugin_auth_common.h index c0b61730d0d..475b1e095a4 100644 --- a/include/mysql/plugin_auth_common.h +++ b/include/mysql/plugin_auth_common.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 _WIN32 #include diff --git a/include/mysql/plugin_ftparser.h b/include/mysql/plugin_ftparser.h index 324fce7ae86..0d0375b8b44 100644 --- a/include/mysql/plugin_ftparser.h +++ b/include/mysql/plugin_ftparser.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 _my_plugin_ftparser_h #define _my_plugin_ftparser_h diff --git a/include/mysql/service_debug_sync.h b/include/mysql/service_debug_sync.h index f7bab99ac97..752c27b2c64 100644 --- a/include/mysql/service_debug_sync.h +++ b/include/mysql/service_debug_sync.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 */ /** @file diff --git a/include/mysql/service_kill_statement.h b/include/mysql/service_kill_statement.h index 995b21f0a9f..ad7827e94af 100644 --- a/include/mysql/service_kill_statement.h +++ b/include/mysql/service_kill_statement.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 MYSQL_SERVICE_KILL_STATEMENT_INCLUDED #define MYSQL_SERVICE_KILL_STATEMENT_INCLUDED diff --git a/include/mysql/service_my_snprintf.h b/include/mysql/service_my_snprintf.h index d4ce97076e6..064a50549ba 100644 --- a/include/mysql/service_my_snprintf.h +++ b/include/mysql/service_my_snprintf.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/include/mysql/service_thd_alloc.h b/include/mysql/service_thd_alloc.h index 645fb310cbc..2f783badea3 100644 --- a/include/mysql/service_thd_alloc.h +++ b/include/mysql/service_thd_alloc.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/include/mysql/service_thd_wait.h b/include/mysql/service_thd_wait.h index 6b47a4ff21e..cafb6b926b4 100644 --- a/include/mysql/service_thd_wait.h +++ b/include/mysql/service_thd_wait.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 MYSQL_SERVICE_THD_WAIT_INCLUDED #define MYSQL_SERVICE_THD_WAIT_INCLUDED diff --git a/include/mysql/service_thread_scheduler.h b/include/mysql/service_thread_scheduler.h index 5a5e0e2f520..a03c78e879e 100644 --- a/include/mysql/service_thread_scheduler.h +++ b/include/mysql/service_thread_scheduler.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 SERVICE_THREAD_SCHEDULER_INCLUDED diff --git a/include/mysql/services.h b/include/mysql/services.h index 51d3bd1f909..5644f7034b8 100644 --- a/include/mysql/services.h +++ b/include/mysql/services.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 */ #ifdef __cplusplus extern "C" { diff --git a/include/mysql_com.h b/include/mysql_com.h index d76dc72e2b8..62079d901b7 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.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 */ /* ** Common definition between mysql server & client diff --git a/include/mysql_embed.h b/include/mysql_embed.h index 12b18ff965e..e9cbdb6a275 100644 --- a/include/mysql_embed.h +++ b/include/mysql_embed.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 */ /* Defines that are unique to the embedded version of MySQL */ diff --git a/include/mysql_time.h b/include/mysql_time.h index 6ccae8d5dc2..379a8fa38b6 100644 --- a/include/mysql_time.h +++ b/include/mysql_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 Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #ifndef _mysql_time_h_ #define _mysql_time_h_ diff --git a/include/mysys_err.h b/include/mysys_err.h index f173ccd7a83..e313d82eedf 100644 --- a/include/mysys_err.h +++ b/include/mysys_err.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 _mysys_err_h #define _mysys_err_h diff --git a/include/password.h b/include/password.h index 082f917e7c0..917ec1acc00 100644 --- a/include/password.h +++ b/include/password.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 PASSWORD_INCLUDED #define PASSWORD_INCLUDED diff --git a/include/probes_mysql.d.base b/include/probes_mysql.d.base index 02eb9ec1a6b..68daa5d7fc6 100644 --- a/include/probes_mysql.d.base +++ b/include/probes_mysql.d.base @@ -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 */ /* The actual probe names in DTrace scripts will replace '__' by '-'. Thus diff --git a/include/probes_mysql.h b/include/probes_mysql.h index 6d44b972cb3..ce5be041714 100644 --- a/include/probes_mysql.h +++ b/include/probes_mysql.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 PROBES_MYSQL_H diff --git a/include/rijndael.h b/include/rijndael.h index 474b3250dcb..552430ae803 100644 --- a/include/rijndael.h +++ b/include/rijndael.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/include/service_versions.h b/include/service_versions.h index 21dc9c8f21d..9bb14d55b92 100644 --- a/include/service_versions.h +++ b/include/service_versions.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 */ #ifdef _WIN32 #define SERVICE_VERSION __declspec(dllexport) void * diff --git a/include/sha1.h b/include/sha1.h index c3469333c27..ac6c22ad1c2 100644 --- a/include/sha1.h +++ b/include/sha1.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 */ /* diff --git a/include/sha2.h b/include/sha2.h index 737658e9ced..4b63847e88a 100644 --- a/include/sha2.h +++ b/include/sha2.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 included_sha2_h #define included_sha2_h diff --git a/include/sql_common.h b/include/sql_common.h index ba0e898d526..cc530ecc3ac 100644 --- a/include/sql_common.h +++ b/include/sql_common.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 __cplusplus extern "C" { diff --git a/include/sslopt-case.h b/include/sslopt-case.h index 2da5ff317e1..ea8d82d7471 100644 --- a/include/sslopt-case.h +++ b/include/sslopt-case.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 */ #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) case OPT_SSL_KEY: diff --git a/include/sslopt-longopts.h b/include/sslopt-longopts.h index 81d03e54016..699e07f948d 100644 --- a/include/sslopt-longopts.h +++ b/include/sslopt-longopts.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 */ #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) diff --git a/include/sslopt-vars.h b/include/sslopt-vars.h index 01093feceaf..066f7064f2b 100644 --- a/include/sslopt-vars.h +++ b/include/sslopt-vars.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 */ #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) #ifdef SSL_VARS_NOT_STATIC diff --git a/include/t_ctype.h b/include/t_ctype.h index 7db3b7bbf71..9164c6222bd 100644 --- a/include/t_ctype.h +++ b/include/t_ctype.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 */ /* Copyright (C) 1998, 1999 by Pruet Boonma, all rights reserved. diff --git a/include/thr_alarm.h b/include/thr_alarm.h index 8de70d4cdb8..250590a0e2f 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.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 */ /* Prototypes when using thr_alarm library functions */ diff --git a/include/thr_lock.h b/include/thr_lock.h index 3f7a5ca988f..370b7d6db09 100644 --- a/include/thr_lock.h +++ b/include/thr_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 */ /* For use with thr_lock:s */ diff --git a/include/thread_pool_priv.h b/include/thread_pool_priv.h index a199923ff00..cc6ecf82fe0 100644 --- a/include/thread_pool_priv.h +++ b/include/thread_pool_priv.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 THREAD_POOL_PRIV_INCLUDED diff --git a/include/typelib.h b/include/typelib.h index 4504bea4ff7..dd395d41872 100644 --- a/include/typelib.h +++ b/include/typelib.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 _typelib_h diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 1b4b17cfc0d..22d8d204268 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.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 _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index dc7594846ea..4eabd94b5b0 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/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 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index ecc9a7773ca..3034df5a608 100644 --- a/libmysql/client_settings.h +++ b/libmysql/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 #define CLIENT_SETTINGS_INCLUDED diff --git a/libmysql/conf_to_src.c b/libmysql/conf_to_src.c index 0e92388c93c..57d3ee864ac 100644 --- a/libmysql/conf_to_src.c +++ b/libmysql/conf_to_src.c @@ -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 */ /* can't use -lmysys because this prog is used to create -lstrings */ diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 9c241c2bd67..a091823d9b3 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -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 */ /* Error messages for MySQL clients */ /* (Error messages for the daemon are in share/language/errmsg.sys) */ diff --git a/libmysql/get_password.c b/libmysql/get_password.c index e704aec8337..9ce59d875c7 100644 --- a/libmysql/get_password.c +++ b/libmysql/get_password.c @@ -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 */ /* ** Ask for a password from tty diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 1a736ee7800..e12d8b2bae8 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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 #include diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index d15be662df6..123e4f2987a 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/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 ADD_DEFINITIONS(-DMYSQL_SERVER -DEMBEDDED_LIBRARY ${SSL_DEFINES}) diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc index 53e7ced424c..dd3da15b3c0 100644 --- a/libmysqld/emb_qcache.cc +++ b/libmysqld/emb_qcache.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 "sql_priv.h" #include "my_global.h" // HAVE_* diff --git a/libmysqld/emb_qcache.h b/libmysqld/emb_qcache.h index 8fd166df88d..fc60194d7f5 100644 --- a/libmysqld/emb_qcache.h +++ b/libmysqld/emb_qcache.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 */ #include "sql_cache.h" /* Query_cache_block */ diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h index c096954a460..77955ea499e 100644 --- a/libmysqld/embedded_priv.h +++ b/libmysqld/embedded_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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Prototypes for the embedded version of MySQL */ diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index 559b1d9ae32..98589a0c01e 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libmysqld/include diff --git a/libmysqld/examples/builder-sample/emb_sample.bpr b/libmysqld/examples/builder-sample/emb_sample.bpr index 100e5b98dfd..ab66dce8788 100644 --- a/libmysqld/examples/builder-sample/emb_sample.bpr +++ b/libmysqld/examples/builder-sample/emb_sample.bpr @@ -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 !$d(BCB) diff --git a/libmysqld/examples/builder-sample/emb_sample.cpp b/libmysqld/examples/builder-sample/emb_sample.cpp index 0c8f4fa0598..61b867c91e0 100644 --- a/libmysqld/examples/builder-sample/emb_sample.cpp +++ b/libmysqld/examples/builder-sample/emb_sample.cpp @@ -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 diff --git a/libmysqld/examples/builder-sample/emb_samples.cpp b/libmysqld/examples/builder-sample/emb_samples.cpp index aab1385f6e6..94787d587f1 100644 --- a/libmysqld/examples/builder-sample/emb_samples.cpp +++ b/libmysqld/examples/builder-sample/emb_samples.cpp @@ -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 diff --git a/libmysqld/examples/builder-sample/emb_samples.h b/libmysqld/examples/builder-sample/emb_samples.h index 3024e75d533..310f051af63 100644 --- a/libmysqld/examples/builder-sample/emb_samples.h +++ b/libmysqld/examples/builder-sample/emb_samples.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 emb_samplesH diff --git a/libmysqld/examples/test-run b/libmysqld/examples/test-run index 3b1cff2ddd8..7c221ad9b4f 100755 --- a/libmysqld/examples/test-run +++ b/libmysqld/examples/test-run @@ -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 # This is slapped together as a quick way to run the tests and # is not meant for prime time. Please hack at it and submit diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 36728cf573c..88bf8003fd3 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include #include diff --git a/libservices/CMakeLists.txt b/libservices/CMakeLists.txt index e22c524ca53..6522c5d33c9 100644 --- a/libservices/CMakeLists.txt +++ b/libservices/CMakeLists.txt @@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) diff --git a/libservices/debug_sync_service.c b/libservices/debug_sync_service.c index 8c7f109e95a..e3c25363f31 100644 --- a/libservices/debug_sync_service.c +++ b/libservices/debug_sync_service.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 St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include diff --git a/libservices/kill_statement_service.c b/libservices/kill_statement_service.c index 4c7cacb241d..c3d1e31736a 100644 --- a/libservices/kill_statement_service.c +++ b/libservices/kill_statement_service.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 */ #include SERVICE_VERSION thd_kill_statement_service= (void*)VERSION_kill_statement; diff --git a/libservices/my_snprintf_service.c b/libservices/my_snprintf_service.c index 8ac507394b0..6609cd144a6 100644 --- a/libservices/my_snprintf_service.c +++ b/libservices/my_snprintf_service.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 */ #include SERVICE_VERSION my_snprintf_service= (void*)VERSION_my_snprintf; diff --git a/libservices/my_thread_scheduler_service.c b/libservices/my_thread_scheduler_service.c index 0bbad39dd0a..aca7f1a6308 100644 --- a/libservices/my_thread_scheduler_service.c +++ b/libservices/my_thread_scheduler_service.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 */ #include diff --git a/libservices/thd_alloc_service.c b/libservices/thd_alloc_service.c index 65e3fc490c8..333b6654b69 100644 --- a/libservices/thd_alloc_service.c +++ b/libservices/thd_alloc_service.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 */ #include SERVICE_VERSION *thd_alloc_service= (void*)VERSION_thd_alloc; diff --git a/libservices/thd_wait_service.c b/libservices/thd_wait_service.c index 8cec4eecf77..fd200753211 100644 --- a/libservices/thd_wait_service.c +++ b/libservices/thd_wait_service.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 */ #include diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index c4383b31a17..b5e8c2ae30a 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -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 SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 aria_chk.1 aria_dump_log.1 aria_ftdump.1 aria_pack.1 aria_read_log.1 diff --git a/man/comp_err.1 b/man/comp_err.1 index 817243b84f6..0f55be379f2 100644 --- a/man/comp_err.1 +++ b/man/comp_err.1 @@ -260,7 +260,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/innochecksum.1 b/man/innochecksum.1 index 6ad9b6b6d78..0ce53e8ef43 100644 --- a/man/innochecksum.1 +++ b/man/innochecksum.1 @@ -147,7 +147,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/make_win_bin_dist.1 b/man/make_win_bin_dist.1 index 131e4a5f1c1..3a08301ab63 100644 --- a/man/make_win_bin_dist.1 +++ b/man/make_win_bin_dist.1 @@ -175,7 +175,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/msql2mysql.1 b/man/msql2mysql.1 index 61512e312d9..6d09e3470d6 100644 --- a/man/msql2mysql.1 +++ b/man/msql2mysql.1 @@ -66,7 +66,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/my_print_defaults.1 b/man/my_print_defaults.1 index b44f250f663..6244c8bdad5 100644 --- a/man/my_print_defaults.1 +++ b/man/my_print_defaults.1 @@ -201,7 +201,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/myisam_ftdump.1 b/man/myisam_ftdump.1 index f85467aabe0..55c3d8e66ac 100644 --- a/man/myisam_ftdump.1 +++ b/man/myisam_ftdump.1 @@ -248,7 +248,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/myisamchk.1 b/man/myisamchk.1 index 98ce3805515..1e9212da0c8 100644 --- a/man/myisamchk.1 +++ b/man/myisamchk.1 @@ -2450,7 +2450,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/myisamlog.1 b/man/myisamlog.1 index 1ea424cd949..ae192a2daa7 100644 --- a/man/myisamlog.1 +++ b/man/myisamlog.1 @@ -231,7 +231,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/myisampack.1 b/man/myisampack.1 index 0f5efd0fb8d..b48423326e0 100644 --- a/man/myisampack.1 +++ b/man/myisampack.1 @@ -838,7 +838,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql-stress-test.pl.1 b/man/mysql-stress-test.pl.1 index 78ba75847ad..6557a52a64b 100644 --- a/man/mysql-stress-test.pl.1 +++ b/man/mysql-stress-test.pl.1 @@ -495,7 +495,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql-test-run.pl.1 b/man/mysql-test-run.pl.1 index ebf17746b68..fc9ba21afba 100644 --- a/man/mysql-test-run.pl.1 +++ b/man/mysql-test-run.pl.1 @@ -2058,7 +2058,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql.1 b/man/mysql.1 index b9430ccae6a..a58918d903b 100644 --- a/man/mysql.1 +++ b/man/mysql.1 @@ -2991,7 +2991,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "NOTES" .IP " 1." 4 diff --git a/man/mysql.server.1 b/man/mysql.server.1 index dc965921f6f..77d66e751c4 100644 --- a/man/mysql.server.1 +++ b/man/mysql.server.1 @@ -182,7 +182,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_client_test.1 b/man/mysql_client_test.1 index a366092012c..e7c228b70d0 100644 --- a/man/mysql_client_test.1 +++ b/man/mysql_client_test.1 @@ -332,7 +332,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_config.1 b/man/mysql_config.1 index 86086e15f45..8bd5cd3b820 100644 --- a/man/mysql_config.1 +++ b/man/mysql_config.1 @@ -246,7 +246,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_convert_table_format.1 b/man/mysql_convert_table_format.1 index bb4c76aac56..f373dc45290 100644 --- a/man/mysql_convert_table_format.1 +++ b/man/mysql_convert_table_format.1 @@ -222,7 +222,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_find_rows.1 b/man/mysql_find_rows.1 index 50c3e38be32..4ab4f9f33bd 100644 --- a/man/mysql_find_rows.1 +++ b/man/mysql_find_rows.1 @@ -157,7 +157,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_fix_extensions.1 b/man/mysql_fix_extensions.1 index fa66348d24c..aeb91ad3817 100644 --- a/man/mysql_fix_extensions.1 +++ b/man/mysql_fix_extensions.1 @@ -67,7 +67,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_install_db.1 b/man/mysql_install_db.1 index ff3b216f6da..b343f9821e3 100644 --- a/man/mysql_install_db.1 +++ b/man/mysql_install_db.1 @@ -258,7 +258,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_plugin.1 b/man/mysql_plugin.1 index fe4fd137006..577e661dfcb 100644 --- a/man/mysql_plugin.1 +++ b/man/mysql_plugin.1 @@ -378,7 +378,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_secure_installation.1 b/man/mysql_secure_installation.1 index 6345aa18d9f..f0da8713b3f 100644 --- a/man/mysql_secure_installation.1 +++ b/man/mysql_secure_installation.1 @@ -102,7 +102,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_setpermission.1 b/man/mysql_setpermission.1 index 303d247cc55..4d3165bf1e4 100644 --- a/man/mysql_setpermission.1 +++ b/man/mysql_setpermission.1 @@ -169,7 +169,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_tzinfo_to_sql.1 b/man/mysql_tzinfo_to_sql.1 index 5b85d51acd1..4b25358376c 100644 --- a/man/mysql_tzinfo_to_sql.1 +++ b/man/mysql_tzinfo_to_sql.1 @@ -119,7 +119,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_upgrade.1 b/man/mysql_upgrade.1 index 6349f927e09..daa2b685717 100644 --- a/man/mysql_upgrade.1 +++ b/man/mysql_upgrade.1 @@ -401,7 +401,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_waitpid.1 b/man/mysql_waitpid.1 index b767fd6ad38..98eafb62d18 100644 --- a/man/mysql_waitpid.1 +++ b/man/mysql_waitpid.1 @@ -126,7 +126,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysql_zap.1 b/man/mysql_zap.1 index f2a261b47a0..d6cd14a5e8c 100644 --- a/man/mysql_zap.1 +++ b/man/mysql_zap.1 @@ -122,7 +122,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqlaccess.1 b/man/mysqlaccess.1 index 9833b3f5e6a..bdb21d699e5 100644 --- a/man/mysqlaccess.1 +++ b/man/mysqlaccess.1 @@ -429,7 +429,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqladmin.1 b/man/mysqladmin.1 index 25b561ffdce..769b0e13fe9 100644 --- a/man/mysqladmin.1 +++ b/man/mysqladmin.1 @@ -1169,7 +1169,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqlbinlog.1 b/man/mysqlbinlog.1 index 5e9bc6c2f43..03bb1a78ec2 100644 --- a/man/mysqlbinlog.1 +++ b/man/mysqlbinlog.1 @@ -1958,7 +1958,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "NOTES" .IP " 1." 4 diff --git a/man/mysqlbug.1 b/man/mysqlbug.1 index 32829a073dc..5128cd53bb4 100644 --- a/man/mysqlbug.1 +++ b/man/mysqlbug.1 @@ -68,7 +68,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqlcheck.1 b/man/mysqlcheck.1 index 11e968db18c..8a28bd2d5c0 100644 --- a/man/mysqlcheck.1 +++ b/man/mysqlcheck.1 @@ -931,7 +931,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqld.8 b/man/mysqld.8 index d3f5954d5e4..60f50ed63d1 100644 --- a/man/mysqld.8 +++ b/man/mysqld.8 @@ -59,7 +59,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqld_multi.1 b/man/mysqld_multi.1 index 07ffa2fd6b4..957730ce770 100644 --- a/man/mysqld_multi.1 +++ b/man/mysqld_multi.1 @@ -734,7 +734,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqld_safe.1 b/man/mysqld_safe.1 index 25848aecb9c..21269295fb7 100644 --- a/man/mysqld_safe.1 +++ b/man/mysqld_safe.1 @@ -814,7 +814,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqldump.1 b/man/mysqldump.1 index fdca51f091a..14bf4f66c7d 100644 --- a/man/mysqldump.1 +++ b/man/mysqldump.1 @@ -2303,7 +2303,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "NOTES" .IP " 1." 4 diff --git a/man/mysqldumpslow.1 b/man/mysqldumpslow.1 index d0d48f81747..5c8dac70f9c 100644 --- a/man/mysqldumpslow.1 +++ b/man/mysqldumpslow.1 @@ -315,7 +315,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqlhotcopy.1 b/man/mysqlhotcopy.1 index 73305ad02f6..14ae0cbfef8 100644 --- a/man/mysqlhotcopy.1 +++ b/man/mysqlhotcopy.1 @@ -519,7 +519,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqlimport.1 b/man/mysqlimport.1 index 6cd494a617c..662d12a2a5a 100644 --- a/man/mysqlimport.1 +++ b/man/mysqlimport.1 @@ -716,7 +716,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqlshow.1 b/man/mysqlshow.1 index b8c6fa6a620..6ea9bacaca3 100644 --- a/man/mysqlshow.1 +++ b/man/mysqlshow.1 @@ -554,7 +554,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqlslap.1 b/man/mysqlslap.1 index e795be397a2..58fd5c4641f 100644 --- a/man/mysqlslap.1 +++ b/man/mysqlslap.1 @@ -1094,7 +1094,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/mysqltest.1 b/man/mysqltest.1 index c68d851cbfc..938689d8ba6 100644 --- a/man/mysqltest.1 +++ b/man/mysqltest.1 @@ -835,7 +835,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/ndbd.8 b/man/ndbd.8 index c3c28d7491b..6674ab0ca41 100644 --- a/man/ndbd.8 +++ b/man/ndbd.8 @@ -793,7 +793,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "NOTES" .IP " 1." 4 diff --git a/man/ndbd_redo_log_reader.1 b/man/ndbd_redo_log_reader.1 index f6a2326cab4..b4715877e22 100644 --- a/man/ndbd_redo_log_reader.1 +++ b/man/ndbd_redo_log_reader.1 @@ -160,7 +160,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "NOTES" .IP " 1." 4 diff --git a/man/ndbmtd.8 b/man/ndbmtd.8 index baadd4eaee2..9aa55126cc6 100644 --- a/man/ndbmtd.8 +++ b/man/ndbmtd.8 @@ -362,7 +362,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "NOTES" .IP " 1." 4 diff --git a/man/perror.1 b/man/perror.1 index a37cec6a518..0a399169c68 100644 --- a/man/perror.1 +++ b/man/perror.1 @@ -187,7 +187,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/replace.1 b/man/replace.1 index 453600fb5a1..d17a7d86cf4 100644 --- a/man/replace.1 +++ b/man/replace.1 @@ -166,7 +166,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/resolve_stack_dump.1 b/man/resolve_stack_dump.1 index 956cd12b2da..bc09c946c09 100644 --- a/man/resolve_stack_dump.1 +++ b/man/resolve_stack_dump.1 @@ -123,7 +123,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/man/resolveip.1 b/man/resolveip.1 index 1b35e6b4cff..512c75d8261 100644 --- a/man/resolveip.1 +++ b/man/resolveip.1 @@ -105,7 +105,7 @@ This documentation is free software; you can redistribute it and/or modify it on .PP This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/. +You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. .sp .SH "SEE ALSO" For more information, please refer to the MySQL Reference Manual, diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt index 9e0e49b1294..7076f98964b 100644 --- a/mysql-test/CMakeLists.txt +++ b/mysql-test/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 INSTALL_MYSQL_TEST("." ".") diff --git a/mysql-test/include/default_my.cnf b/mysql-test/include/default_my.cnf index 6b0493cdb08..a46e748daa0 100644 --- a/mysql-test/include/default_my.cnf +++ b/mysql-test/include/default_my.cnf @@ -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 # Use default setting for mysqld processes !include default_mysqld.cnf diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index 40d699ce759..98be65762d1 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -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 # Default values that applies to all MySQL Servers [mysqld] diff --git a/mysql-test/include/have_perfschema.inc b/mysql-test/include/have_perfschema.inc index d932ce0f9bd..6b68d717eb8 100644 --- a/mysql-test/include/have_perfschema.inc +++ b/mysql-test/include/have_perfschema.inc @@ -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 if (!`SELECT count(*) FROM information_schema.engines WHERE (support = 'YES' OR support = 'DEFAULT') AND diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index 7f990431762..b3e9e7498dc 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -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, Fifth Floor, Boston, MA 02110-1301 USA +-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA delimiter ||; diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index f24edcfb996..5cdf4453a7a 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -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, Fifth Floor, Boston, MA 02110-1301 USA +-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA delimiter ||; diff --git a/mysql-test/include/set_binlog_format_mixed.sql b/mysql-test/include/set_binlog_format_mixed.sql index 65c779ef141..9e127cfdab0 100644 --- a/mysql-test/include/set_binlog_format_mixed.sql +++ b/mysql-test/include/set_binlog_format_mixed.sql @@ -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, Fifth Floor, Boston, MA 02110-1301 USA +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA SET GLOBAL BINLOG_FORMAT=MIXED; SET SESSION BINLOG_FORMAT=MIXED; diff --git a/mysql-test/include/set_binlog_format_row.sql b/mysql-test/include/set_binlog_format_row.sql index 0400ed48be9..2fedf941c47 100644 --- a/mysql-test/include/set_binlog_format_row.sql +++ b/mysql-test/include/set_binlog_format_row.sql @@ -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, Fifth Floor, Boston, MA 02110-1301 USA +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA SET GLOBAL BINLOG_FORMAT=ROW; SET SESSION BINLOG_FORMAT=ROW; diff --git a/mysql-test/include/set_binlog_format_statement.sql b/mysql-test/include/set_binlog_format_statement.sql index b582230e648..624df1c898c 100644 --- a/mysql-test/include/set_binlog_format_statement.sql +++ b/mysql-test/include/set_binlog_format_statement.sql @@ -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, Fifth Floor, Boston, MA 02110-1301 USA +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA SET GLOBAL BINLOG_FORMAT=STATEMENT; SET SESSION BINLOG_FORMAT=STATEMENT; diff --git a/mysql-test/lib/My/Config.pm b/mysql-test/lib/My/Config.pm index d6924a3c866..e5469d8c62e 100644 --- a/mysql-test/lib/My/Config.pm +++ b/mysql-test/lib/My/Config.pm @@ -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 package My::Config::Option; diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index e79d97e045e..f43fc9c1f16 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -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 package My::ConfigFactory; diff --git a/mysql-test/lib/My/CoreDump.pm b/mysql-test/lib/My/CoreDump.pm index f9f7b3d8d4b..1d6d85020c8 100644 --- a/mysql-test/lib/My/CoreDump.pm +++ b/mysql-test/lib/My/CoreDump.pm @@ -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 package My::CoreDump; diff --git a/mysql-test/lib/My/File/Path.pm b/mysql-test/lib/My/File/Path.pm index 1b7982d6b36..d60027c909e 100644 --- a/mysql-test/lib/My/File/Path.pm +++ b/mysql-test/lib/My/File/Path.pm @@ -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 package My::File::Path; use strict; diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm index 1d5e0f368bc..b5a07ac8632 100644 --- a/mysql-test/lib/My/Find.pm +++ b/mysql-test/lib/My/Find.pm @@ -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 package My::Find; diff --git a/mysql-test/lib/My/Handles.pm b/mysql-test/lib/My/Handles.pm index d120eb7b1d4..3c9513fec8f 100644 --- a/mysql-test/lib/My/Handles.pm +++ b/mysql-test/lib/My/Handles.pm @@ -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 package My::Handles; diff --git a/mysql-test/lib/My/Options.pm b/mysql-test/lib/My/Options.pm index ff3992ecb2e..6e0efe862e7 100644 --- a/mysql-test/lib/My/Options.pm +++ b/mysql-test/lib/My/Options.pm @@ -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 package My::Options; diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm index 110cf8a20e0..cb2ac3895e3 100644 --- a/mysql-test/lib/My/Platform.pm +++ b/mysql-test/lib/My/Platform.pm @@ -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 package My::Platform; diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm index 7059ceebdad..02467971e77 100644 --- a/mysql-test/lib/My/SafeProcess.pm +++ b/mysql-test/lib/My/SafeProcess.pm @@ -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 package My::SafeProcess; diff --git a/mysql-test/lib/My/SafeProcess/Base.pm b/mysql-test/lib/My/SafeProcess/Base.pm index 1ac0120a735..8a181bb4c0f 100644 --- a/mysql-test/lib/My/SafeProcess/Base.pm +++ b/mysql-test/lib/My/SafeProcess/Base.pm @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/My/SafeProcess/CMakeLists.txt b/mysql-test/lib/My/SafeProcess/CMakeLists.txt index 7d39129d0f5..543e1dfb8f1 100644 --- a/mysql-test/lib/My/SafeProcess/CMakeLists.txt +++ b/mysql-test/lib/My/SafeProcess/CMakeLists.txt @@ -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 IF (NOT INSTALL_MYSQLTESTDIR) RETURN() diff --git a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc index 2ac29c61bc7..a8c4011016b 100644 --- a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_kill_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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* diff --git a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc index feb3eb4df66..147dfdec226 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process.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 */ /* diff --git a/mysql-test/lib/My/SafeProcess/safe_process_win.cc b/mysql-test/lib/My/SafeProcess/safe_process_win.cc index dca2faded71..7d81bf1a1b4 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process_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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* diff --git a/mysql-test/lib/My/SysInfo.pm b/mysql-test/lib/My/SysInfo.pm index 4cca116620e..1e5ac353def 100644 --- a/mysql-test/lib/My/SysInfo.pm +++ b/mysql-test/lib/My/SysInfo.pm @@ -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 package My::SysInfo; diff --git a/mysql-test/lib/My/Test.pm b/mysql-test/lib/My/Test.pm index 806c90734fd..49ce2fb5af9 100644 --- a/mysql-test/lib/My/Test.pm +++ b/mysql-test/lib/My/Test.pm @@ -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/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 642cc6ce282..4ebe12772f0 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/mtr_gcov.pl b/mysql-test/lib/mtr_gcov.pl index a6e1f8efd5f..bad4969f710 100644 --- a/mysql-test/lib/mtr_gcov.pl +++ b/mysql-test/lib/mtr_gcov.pl @@ -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 is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/mtr_gprof.pl b/mysql-test/lib/mtr_gprof.pl index 34e722a251f..eb440e488f0 100644 --- a/mysql-test/lib/mtr_gprof.pl +++ b/mysql-test/lib/mtr_gprof.pl @@ -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 is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/mtr_io.pl b/mysql-test/lib/mtr_io.pl index 0de4d9612ac..0010c1627d4 100644 --- a/mysql-test/lib/mtr_io.pl +++ b/mysql-test/lib/mtr_io.pl @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/mtr_match.pm b/mysql-test/lib/mtr_match.pm index 140885b6273..73cdb3bdc29 100644 --- a/mysql-test/lib/mtr_match.pm +++ b/mysql-test/lib/mtr_match.pm @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/mtr_misc.pl b/mysql-test/lib/mtr_misc.pl index 98f2c27ebce..24085f542f7 100644 --- a/mysql-test/lib/mtr_misc.pl +++ b/mysql-test/lib/mtr_misc.pl @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 4bb6be711f0..cee9f2b6ed6 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -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 is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 97ace54f0fb..9cc942e499f 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/mtr_results.pm b/mysql-test/lib/mtr_results.pm index 92b03756c04..9438b936834 100644 --- a/mysql-test/lib/mtr_results.pm +++ b/mysql-test/lib/mtr_results.pm @@ -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 package mtr_results; use strict; diff --git a/mysql-test/lib/mtr_stress.pl b/mysql-test/lib/mtr_stress.pl index 6ab607e6439..3a9ca8fafcc 100644 --- a/mysql-test/lib/mtr_stress.pl +++ b/mysql-test/lib/mtr_stress.pl @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/mtr_unique.pm b/mysql-test/lib/mtr_unique.pm index 8d719786283..f276e6e1077 100644 --- a/mysql-test/lib/mtr_unique.pm +++ b/mysql-test/lib/mtr_unique.pm @@ -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 package mtr_unique; diff --git a/mysql-test/lib/t/Base.t b/mysql-test/lib/t/Base.t index b540944f3a1..d31670afcfe 100644 --- a/mysql-test/lib/t/Base.t +++ b/mysql-test/lib/t/Base.t @@ -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 use Test::More qw(no_plan); use strict; diff --git a/mysql-test/lib/t/Find.t b/mysql-test/lib/t/Find.t index d609fd86dd9..e6b8f5a898b 100644 --- a/mysql-test/lib/t/Find.t +++ b/mysql-test/lib/t/Find.t @@ -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 use Test::More qw(no_plan); use strict; diff --git a/mysql-test/lib/t/Options.t b/mysql-test/lib/t/Options.t index c832b885cb7..d0a52e0c264 100644 --- a/mysql-test/lib/t/Options.t +++ b/mysql-test/lib/t/Options.t @@ -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 use Test::More qw(no_plan); use strict; diff --git a/mysql-test/lib/t/Platform.t b/mysql-test/lib/t/Platform.t index c78c22ddb5a..4a9df1a5f63 100644 --- a/mysql-test/lib/t/Platform.t +++ b/mysql-test/lib/t/Platform.t @@ -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 use Test::More qw(no_plan); use strict; diff --git a/mysql-test/lib/t/SafeProcess.t b/mysql-test/lib/t/SafeProcess.t index 0fab69b9088..e9f87d8837f 100644 --- a/mysql-test/lib/t/SafeProcess.t +++ b/mysql-test/lib/t/SafeProcess.t @@ -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 use strict; use FindBin; diff --git a/mysql-test/lib/t/SafeProcessStress.pl b/mysql-test/lib/t/SafeProcessStress.pl index a5dbeecfb4b..f591e9665dd 100755 --- a/mysql-test/lib/t/SafeProcessStress.pl +++ b/mysql-test/lib/t/SafeProcessStress.pl @@ -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 use strict; use FindBin; diff --git a/mysql-test/lib/t/copytree.t b/mysql-test/lib/t/copytree.t index cdb99b851c4..15a41081b24 100644 --- a/mysql-test/lib/t/copytree.t +++ b/mysql-test/lib/t/copytree.t @@ -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 use strict; diff --git a/mysql-test/lib/t/dummyd.pl b/mysql-test/lib/t/dummyd.pl index fae747354d7..15164428b95 100644 --- a/mysql-test/lib/t/dummyd.pl +++ b/mysql-test/lib/t/dummyd.pl @@ -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 use strict; use Getopt::Long; diff --git a/mysql-test/lib/t/rmtree.t b/mysql-test/lib/t/rmtree.t index 8c9863a1edd..40c9e96eabd 100644 --- a/mysql-test/lib/t/rmtree.t +++ b/mysql-test/lib/t/rmtree.t @@ -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 use strict; diff --git a/mysql-test/lib/t/testMyConfig.t b/mysql-test/lib/t/testMyConfig.t index f79e8776676..9f7067f436b 100755 --- a/mysql-test/lib/t/testMyConfig.t +++ b/mysql-test/lib/t/testMyConfig.t @@ -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 use strict; use warnings; diff --git a/mysql-test/lib/t/testMyConfigFactory.t b/mysql-test/lib/t/testMyConfigFactory.t index 9f43bed3d98..f38f660e85a 100755 --- a/mysql-test/lib/t/testMyConfigFactory.t +++ b/mysql-test/lib/t/testMyConfigFactory.t @@ -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 use strict; use warnings; diff --git a/mysql-test/lib/t/test_child.pl b/mysql-test/lib/t/test_child.pl index 38d9f906738..efbec4a9620 100755 --- a/mysql-test/lib/t/test_child.pl +++ b/mysql-test/lib/t/test_child.pl @@ -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 use strict; use Getopt::Long; diff --git a/mysql-test/lib/v1/My/Config.pm b/mysql-test/lib/v1/My/Config.pm index cc4c34b2d62..13405dc2834 100644 --- a/mysql-test/lib/v1/My/Config.pm +++ b/mysql-test/lib/v1/My/Config.pm @@ -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 package My::Config::Option; diff --git a/mysql-test/lib/v1/mtr_cases.pl b/mysql-test/lib/v1/mtr_cases.pl index baeab24f519..3747400b093 100644 --- a/mysql-test/lib/v1/mtr_cases.pl +++ b/mysql-test/lib/v1/mtr_cases.pl @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/v1/mtr_gcov.pl b/mysql-test/lib/v1/mtr_gcov.pl index 56942be72a8..b5839fe4dec 100644 --- a/mysql-test/lib/v1/mtr_gcov.pl +++ b/mysql-test/lib/v1/mtr_gcov.pl @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/v1/mtr_gprof.pl b/mysql-test/lib/v1/mtr_gprof.pl index 04c6eced28a..c794eb5f2fe 100644 --- a/mysql-test/lib/v1/mtr_gprof.pl +++ b/mysql-test/lib/v1/mtr_gprof.pl @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/v1/mtr_im.pl b/mysql-test/lib/v1/mtr_im.pl index c34acc9c82f..2aff160d4ef 100644 --- a/mysql-test/lib/v1/mtr_im.pl +++ b/mysql-test/lib/v1/mtr_im.pl @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/v1/mtr_io.pl b/mysql-test/lib/v1/mtr_io.pl index 5769240bf7f..2176c07f560 100644 --- a/mysql-test/lib/v1/mtr_io.pl +++ b/mysql-test/lib/v1/mtr_io.pl @@ -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 is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/v1/mtr_match.pl b/mysql-test/lib/v1/mtr_match.pl index 5cc74efb8c9..f1933cd982c 100644 --- a/mysql-test/lib/v1/mtr_match.pl +++ b/mysql-test/lib/v1/mtr_match.pl @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/v1/mtr_misc.pl b/mysql-test/lib/v1/mtr_misc.pl index 07b50e865ab..e7c652b4281 100644 --- a/mysql-test/lib/v1/mtr_misc.pl +++ b/mysql-test/lib/v1/mtr_misc.pl @@ -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 is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/v1/mtr_process.pl b/mysql-test/lib/v1/mtr_process.pl index f86f9e5dec0..96ad3daf247 100644 --- a/mysql-test/lib/v1/mtr_process.pl +++ b/mysql-test/lib/v1/mtr_process.pl @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/v1/mtr_report.pl b/mysql-test/lib/v1/mtr_report.pl index 7166eb523f2..ab856d68d0c 100644 --- a/mysql-test/lib/v1/mtr_report.pl +++ b/mysql-test/lib/v1/mtr_report.pl @@ -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 is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/v1/mtr_stress.pl b/mysql-test/lib/v1/mtr_stress.pl index 7f92c417271..c248b8089c6 100644 --- a/mysql-test/lib/v1/mtr_stress.pl +++ b/mysql-test/lib/v1/mtr_stress.pl @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/v1/mtr_timer.pl b/mysql-test/lib/v1/mtr_timer.pl index 4fc68afa364..630a93ca7dc 100644 --- a/mysql-test/lib/v1/mtr_timer.pl +++ b/mysql-test/lib/v1/mtr_timer.pl @@ -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 # This is a library file used by the Perl version of mysql-test-run, # and is part of the translation of the Bourne shell script with the diff --git a/mysql-test/lib/v1/mtr_unique.pl b/mysql-test/lib/v1/mtr_unique.pl index 4e4e720e689..b9ed9138d04 100644 --- a/mysql-test/lib/v1/mtr_unique.pl +++ b/mysql-test/lib/v1/mtr_unique.pl @@ -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 # # This file is used from mysql-test-run.pl when choosing diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index 98328ad4e39..ec05660b4d5 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -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 ############################################################################## # diff --git a/mysql-test/mysql-stress-test.pl b/mysql-test/mysql-stress-test.pl index 74394e2afbd..79511273e6f 100755 --- a/mysql-test/mysql-stress-test.pl +++ b/mysql-test/mysql-stress-test.pl @@ -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 # ====================================================================== # MySQL server stress test system diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 5587f918d92..e3e9460f35a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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/mysql-test/purify.supp b/mysql-test/purify.supp index 0bb31d00277..8960151c9a7 100644 --- a/mysql-test/purify.supp +++ b/mysql-test/purify.supp @@ -14,7 +14,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA suppress UMR rw_read_held; mi_open; ha_myisam::open64; handler::ha_open; openfrm suppress UMR my_end; main diff --git a/mysql-test/std_data/checkDBI_DBD-mysql.pl b/mysql-test/std_data/checkDBI_DBD-mysql.pl index d62d2f8bfc0..328a7ad774f 100755 --- a/mysql-test/std_data/checkDBI_DBD-mysql.pl +++ b/mysql-test/std_data/checkDBI_DBD-mysql.pl @@ -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 ################################################################################ diff --git a/mysql-test/std_data/latin1.xml b/mysql-test/std_data/latin1.xml index 5884416c30e..92e838ad2ea 100644 --- a/mysql-test/std_data/latin1.xml +++ b/mysql-test/std_data/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 St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA diff --git a/mysql-test/suite/perfschema_stress/README b/mysql-test/suite/perfschema_stress/README index 25101f429e5..b21de197246 100644 --- a/mysql-test/suite/perfschema_stress/README +++ b/mysql-test/suite/perfschema_stress/README @@ -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 WL#4818 - Stress testing of PERFORMANCE_SCHEMA diff --git a/mysql-test/suite/rpl/extension/checksum.pl b/mysql-test/suite/rpl/extension/checksum.pl index 60dca18c8f8..f94341446cd 100755 --- a/mysql-test/suite/rpl/extension/checksum.pl +++ b/mysql-test/suite/rpl/extension/checksum.pl @@ -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 use File::Basename; use File::Copy qw(copy); diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp index c9c06c2634a..7c3363d2822 100644 --- a/mysql-test/valgrind.supp +++ b/mysql-test/valgrind.supp @@ -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 # # Suppress some common (not fatal) errors in system libraries found by valgrind diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index 3bed6f76fd7..540b1004332 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/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 INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mysys) diff --git a/mysys/array.c b/mysys/array.c index c969da83586..b406ba38645 100644 --- a/mysys/array.c +++ b/mysys/array.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Handling of arrays that can grow dynamicly. */ diff --git a/mysys/base64.c b/mysys/base64.c index b48bcb85e03..2e33b2521be 100644 --- a/mysys/base64.c +++ b/mysys/base64.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 */ #include #include /* strchr() */ diff --git a/mysys/charset-def.c b/mysys/charset-def.c index e9f2ecdea49..f24e9d852d9 100644 --- a/mysys/charset-def.c +++ b/mysys/charset-def.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" diff --git a/mysys/charset.c b/mysys/charset.c index cc1d0a0111e..2a9e85c5005 100644 --- a/mysys/charset.c +++ b/mysys/charset.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 */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/checksum.c b/mysys/checksum.c index 7bc52c6a178..07a9b490b5c 100644 --- a/mysys/checksum.c +++ b/mysys/checksum.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include diff --git a/mysys/default.c b/mysys/default.c index e901fb0b593..f66a35a56c5 100644 --- a/mysys/default.c +++ b/mysys/default.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 */ /**************************************************************************** Add all options from files named "group".cnf from the default_directories diff --git a/mysys/errors.c b/mysys/errors.c index 0f2edbc4ae5..6c78285ccbd 100644 --- a/mysys/errors.c +++ b/mysys/errors.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 */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/hash.c b/mysys/hash.c index b93f6b666d6..c556dbcde0c 100644 --- a/mysys/hash.c +++ b/mysys/hash.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* The hash functions used for saveing keys */ /* One of key_length or key_length_offset must be given */ diff --git a/mysys/lf_alloc-pin.c b/mysys/lf_alloc-pin.c index 59f60f06696..8e2e53d6a3f 100644 --- a/mysys/lf_alloc-pin.c +++ b/mysys/lf_alloc-pin.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 */ /* wait-free concurrent allocator based on pinning addresses diff --git a/mysys/lf_dynarray.c b/mysys/lf_dynarray.c index 3d072fd063e..4928375d7cc 100644 --- a/mysys/lf_dynarray.c +++ b/mysys/lf_dynarray.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Analog of DYNAMIC_ARRAY that never reallocs diff --git a/mysys/lf_hash.c b/mysys/lf_hash.c index 8d74aaf8cc2..c327fdc148a 100644 --- a/mysys/lf_hash.c +++ b/mysys/lf_hash.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 */ /* extensible hash diff --git a/mysys/list.c b/mysys/list.c index fb46120db04..8f4c934f64e 100644 --- a/mysys/list.c +++ b/mysys/list.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Code for handling dubble-linked lists in C diff --git a/mysys/md5.c b/mysys/md5.c index aefc23c1b7a..405272ec0f7 100644 --- a/mysys/md5.c +++ b/mysys/md5.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 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* * This code implements the MD5 message-digest algorithm. diff --git a/mysys/mf_arr_appstr.c b/mysys/mf_arr_appstr.c index d5a0e0707dc..7c105bcf86b 100644 --- a/mysys/mf_arr_appstr.c +++ b/mysys/mf_arr_appstr.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 */ #include "mysys_priv.h" #include /* strcmp() */ diff --git a/mysys/mf_cache.c b/mysys/mf_cache.c index 545084ea97f..7f1316b3ab2 100644 --- a/mysys/mf_cache.c +++ b/mysys/mf_cache.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Open a temporary file and cache it with io_cache. Delete it on close */ diff --git a/mysys/mf_dirname.c b/mysys/mf_dirname.c index 569293f5401..e3a60046c9d 100644 --- a/mysys/mf_dirname.c +++ b/mysys/mf_dirname.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include diff --git a/mysys/mf_fn_ext.c b/mysys/mf_fn_ext.c index b78d73074da..87419333480 100644 --- a/mysys/mf_fn_ext.c +++ b/mysys/mf_fn_ext.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" diff --git a/mysys/mf_format.c b/mysys/mf_format.c index 996fee68bd1..238e5ff6606 100644 --- a/mysys/mf_format.c +++ b/mysys/mf_format.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include diff --git a/mysys/mf_getdate.c b/mysys/mf_getdate.c index ed8544a23fe..3db0398bbfe 100644 --- a/mysys/mf_getdate.c +++ b/mysys/mf_getdate.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 */ /* Get date in a printable form: yyyy-mm-dd hh:mm:ss */ diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 9a051cf6a9e..165889bbca5 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.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 */ /* Cashing of files with only does (sequential) read or writes of fixed- diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index a9a237696d2..7beb539f301 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.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 */ /* More functions to be used with IO_CACHE files diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 8191e92bb27..7fbe2489ebb 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ diff --git a/mysys/mf_keycaches.c b/mysys/mf_keycaches.c index 7dbfc26a365..199fb10988b 100644 --- a/mysys/mf_keycaches.c +++ b/mysys/mf_keycaches.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 */ /* Handling of multiple key caches diff --git a/mysys/mf_loadpath.c b/mysys/mf_loadpath.c index 7bad535585a..0a716aa57a5 100644 --- a/mysys/mf_loadpath.c +++ b/mysys/mf_loadpath.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 */ #include "mysys_priv.h" #include diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c index e246ff17f22..d79aa18dab2 100644 --- a/mysys/mf_pack.c +++ b/mysys/mf_pack.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. */ #include "mysys_priv.h" diff --git a/mysys/mf_path.c b/mysys/mf_path.c index 725cf278f6f..7da925d6f5f 100644 --- a/mysys/mf_path.c +++ b/mysys/mf_path.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c index 3e91c0ac0b0..3f91bb35354 100644 --- a/mysys/mf_qsort.c +++ b/mysys/mf_qsort.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 */ /* qsort implementation optimized for comparison of pointers diff --git a/mysys/mf_qsort2.c b/mysys/mf_qsort2.c index 501f08c5dce..cee460f8de1 100644 --- a/mysys/mf_qsort2.c +++ b/mysys/mf_qsort2.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 */ /* qsort that sends one extra argument to the compare subrutine */ diff --git a/mysys/mf_radix.c b/mysys/mf_radix.c index b0ed419e6c1..4cd657746ad 100644 --- a/mysys/mf_radix.c +++ b/mysys/mf_radix.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 */ /* Radixsort for pointers to fixed length strings. diff --git a/mysys/mf_same.c b/mysys/mf_same.c index 244dc650d8b..fda0710ca16 100644 --- a/mysys/mf_same.c +++ b/mysys/mf_same.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 */ /* Kopierar biblioteksstrukturen och extensionen fr}n ett filnamn */ diff --git a/mysys/mf_sort.c b/mysys/mf_sort.c index 9ef02787716..0d4ec68eab7 100644 --- a/mysys/mf_sort.c +++ b/mysys/mf_sort.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Sort of string pointers in string-order with radix or qsort */ diff --git a/mysys/mf_soundex.c b/mysys/mf_soundex.c index 2784d112805..b686cac89b4 100644 --- a/mysys/mf_soundex.c +++ b/mysys/mf_soundex.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 */ /**************************************************************** * SOUNDEX ALGORITHM in C * diff --git a/mysys/mf_tempdir.c b/mysys/mf_tempdir.c index 34b469b4066..c7a4fa105bb 100644 --- a/mysys/mf_tempdir.c +++ b/mysys/mf_tempdir.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c index 62b3e09747f..a535d35a53f 100644 --- a/mysys/mf_tempfile.c +++ b/mysys/mf_tempfile.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include diff --git a/mysys/mf_unixpath.c b/mysys/mf_unixpath.c index 6777c27bc96..cc2b671ab64 100644 --- a/mysys/mf_unixpath.c +++ b/mysys/mf_unixpath.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include diff --git a/mysys/mf_wcomp.c b/mysys/mf_wcomp.c index fe64d06f2db..6fb19ebae69 100644 --- a/mysys/mf_wcomp.c +++ b/mysys/mf_wcomp.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 */ /* Funktions for comparing with wild-cards */ diff --git a/mysys/mulalloc.c b/mysys/mulalloc.c index 9384ed744ad..38d0e65bd3c 100644 --- a/mysys/mulalloc.c +++ b/mysys/mulalloc.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 */ #include "mysys_priv.h" #include diff --git a/mysys/my_access.c b/mysys/my_access.c index 22f145a75c9..4f1de35ba2a 100644 --- a/mysys/my_access.c +++ b/mysys/my_access.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 */ #include "mysys_priv.h" #include diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c index 02f71fd72bd..7b14a561ba5 100644 --- a/mysys/my_addr_resolve.c +++ b/mysys/my_addr_resolve.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include diff --git a/mysys/my_aes.c b/mysys/my_aes.c index 7074f700413..bb9566bb480 100644 --- a/mysys/my_aes.c +++ b/mysys/my_aes.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 */ /* diff --git a/mysys/my_alarm.c b/mysys/my_alarm.c index 4672627a908..ee11dc9ce85 100644 --- a/mysys/my_alarm.c +++ b/mysys/my_alarm.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 */ /* Function to set a varible when we got a alarm */ /* Used by my_lock samt functions in m_alarm.h */ diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index e727f46be6d..15b96e8a20a 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.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 */ /* Routines to handle mallocing of results which will be freed the same time */ diff --git a/mysys/my_atomic.c b/mysys/my_atomic.c index 26348b518ae..72d7f132988 100644 --- a/mysys/my_atomic.c +++ b/mysys/my_atomic.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include #include diff --git a/mysys/my_basename.c b/mysys/my_basename.c index 9d1eaf53efa..68f5565b269 100644 --- a/mysys/my_basename.c +++ b/mysys/my_basename.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include /** diff --git a/mysys/my_bit.c b/mysys/my_bit.c index d36f52bb3c0..fdf767fa5be 100644 --- a/mysys/my_bit.c +++ b/mysys/my_bit.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index 851fe2b1026..7f65a5d714e 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.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 Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* Handling of uchar arrays as large bitmaps. diff --git a/mysys/my_chsize.c b/mysys/my_chsize.c index 63964916d6f..7f8184e2cf6 100644 --- a/mysys/my_chsize.c +++ b/mysys/my_chsize.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 */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_compare.c b/mysys/my_compare.c index 82b30ab3ed3..2a4c9daeee1 100644 --- a/mysys/my_compare.c +++ b/mysys/my_compare.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 */ #include #include diff --git a/mysys/my_compress.c b/mysys/my_compress.c index ea56900db05..37d6fb01b8c 100644 --- a/mysys/my_compress.c +++ b/mysys/my_compress.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Written by Sinisa Milivojevic */ diff --git a/mysys/my_conio.c b/mysys/my_conio.c index 2480c37d039..8afe4e3f07b 100644 --- a/mysys/my_conio.c +++ b/mysys/my_conio.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 */ #include "mysys_priv.h" diff --git a/mysys/my_copy.c b/mysys/my_copy.c index 82cb2cc2f5f..6963b8ae62c 100644 --- a/mysys/my_copy.c +++ b/mysys/my_copy.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 */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_crc32.c b/mysys/my_crc32.c index 0981c75755d..3fa8c4b83eb 100644 --- a/mysys/my_crc32.c +++ b/mysys/my_crc32.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 */ #include "mysys_priv.h" diff --git a/mysys/my_create.c b/mysys/my_create.c index e9a1365ca19..c65264d9927 100644 --- a/mysys/my_create.c +++ b/mysys/my_create.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 */ #include "mysys_priv.h" #include diff --git a/mysys/my_delete.c b/mysys/my_delete.c index 8487f1d2e5a..462dbee1400 100644 --- a/mysys/my_delete.c +++ b/mysys/my_delete.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_div.c b/mysys/my_div.c index 44eb5392421..3395d1422ca 100644 --- a/mysys/my_div.c +++ b/mysys/my_div.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 */ #include "mysys_priv.h" diff --git a/mysys/my_error.c b/mysys/my_error.c index 23bc06c3d9d..f37d606ed70 100644 --- a/mysys/my_error.c +++ b/mysys/my_error.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_file.c b/mysys/my_file.c index b3aef8494cb..4a2421b0c51 100644 --- a/mysys/my_file.c +++ b/mysys/my_file.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 */ #include "mysys_priv.h" #include "my_static.h" diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c index 9131a2549e0..71d622c45f7 100644 --- a/mysys/my_fopen.c +++ b/mysys/my_fopen.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 */ #include "mysys_priv.h" #include "my_static.h" diff --git a/mysys/my_fstream.c b/mysys/my_fstream.c index e758609741b..c762d4fec8b 100644 --- a/mysys/my_fstream.c +++ b/mysys/my_fstream.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* USE_MY_STREAM isn't set because we can't thrust my_fclose! */ diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index c7aa7f17f1d..8c919de663f 100644 --- a/mysys/my_gethwaddr.c +++ b/mysys/my_gethwaddr.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 */ /* get hardware address for an interface */ /* if there are many available, any non-zero one can be used */ diff --git a/mysys/my_getncpus.c b/mysys/my_getncpus.c index cc2c3843e0e..38585161c22 100644 --- a/mysys/my_getncpus.c +++ b/mysys/my_getncpus.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 */ /* get the number of (online) CPUs */ diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 425a2b13d66..4efc2254aaa 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.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 Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include #include diff --git a/mysys/my_getpagesize.c b/mysys/my_getpagesize.c index e1c1fcb168d..030a62deb61 100644 --- a/mysys/my_getpagesize.c +++ b/mysys/my_getpagesize.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 */ #include "mysys_priv.h" diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c index 1cedeb21d6e..e2e6e8e398a 100644 --- a/mysys/my_getsystime.c +++ b/mysys/my_getsystime.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 */ #include "mysys_priv.h" diff --git a/mysys/my_getwd.c b/mysys/my_getwd.c index 444ed4273b5..ff929de551c 100644 --- a/mysys/my_getwd.c +++ b/mysys/my_getwd.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 */ /* my_setwd() and my_getwd() works with intern_filenames !! */ diff --git a/mysys/my_init.c b/mysys/my_init.c index 5f6650f0ec9..b1126e581de 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.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 */ #include "mysys_priv.h" #include "my_static.h" diff --git a/mysys/my_largepage.c b/mysys/my_largepage.c index 59f815a9d87..c5e33388e2a 100644 --- a/mysys/my_largepage.c +++ b/mysys/my_largepage.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" diff --git a/mysys/my_lib.c b/mysys/my_lib.c index 08ff6a94823..003123c067c 100644 --- a/mysys/my_lib.c +++ b/mysys/my_lib.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 02110-1301, USA. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ /* TODO: check for overun of memory for names. */ diff --git a/mysys/my_libwrap.c b/mysys/my_libwrap.c index 6c69757ec6f..45ab3a7fc76 100644 --- a/mysys/my_libwrap.c +++ b/mysys/my_libwrap.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 */ /* This is needed to be able to compile with original libwrap header diff --git a/mysys/my_lock.c b/mysys/my_lock.c index 54ec3838b58..7a292d63f4d 100644 --- a/mysys/my_lock.c +++ b/mysys/my_lock.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_lockmem.c b/mysys/my_lockmem.c index 3e27564f100..ce569b78c73 100644 --- a/mysys/my_lockmem.c +++ b/mysys/my_lockmem.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Alloc a block of locked memory */ diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 5264210a6b4..40596a047b9 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.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 */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_memmem.c b/mysys/my_memmem.c index 5806c502b2b..98b45fed239 100644 --- a/mysys/my_memmem.c +++ b/mysys/my_memmem.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 */ #include #include diff --git a/mysys/my_mess.c b/mysys/my_mess.c index 8ee816b385a..7bc4c038cb6 100644 --- a/mysys/my_mess.c +++ b/mysys/my_mess.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" diff --git a/mysys/my_mkdir.c b/mysys/my_mkdir.c index 5e9691f5b91..6c0a01abb73 100644 --- a/mysys/my_mkdir.c +++ b/mysys/my_mkdir.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 */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_mmap.c b/mysys/my_mmap.c index acd4862eaca..9d84c1c76f6 100644 --- a/mysys/my_mmap.c +++ b/mysys/my_mmap.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" diff --git a/mysys/my_new.cc b/mysys/my_new.cc index a401ccff135..88080f3e7eb 100644 --- a/mysys/my_new.cc +++ b/mysys/my_new.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 is a replacement of new/delete operators to be used when compiling diff --git a/mysys/my_once.c b/mysys/my_once.c index dfd5de81ac7..28a175579fd 100644 --- a/mysys/my_once.c +++ b/mysys/my_once.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Not MT-SAFE */ diff --git a/mysys/my_open.c b/mysys/my_open.c index cafb94ef558..69f5ae1275a 100644 --- a/mysys/my_open.c +++ b/mysys/my_open.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_pread.c b/mysys/my_pread.c index 52d5c382960..035465f9991 100644 --- a/mysys/my_pread.c +++ b/mysys/my_pread.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 */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 20e53a23ab5..b8121f9a52f 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Functions to get threads more portable */ diff --git a/mysys/my_quick.c b/mysys/my_quick.c index 2d5e9fb95ca..ae7f5cca391 100644 --- a/mysys/my_quick.c +++ b/mysys/my_quick.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 */ /* Quicker interface to read & write. Used with my_nosys.h */ diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c index ad11e8c6a6c..ad3f3b416b8 100644 --- a/mysys/my_rdtsc.c +++ b/mysys/my_rdtsc.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* rdtsc3 -- multi-platform timer code diff --git a/mysys/my_read.c b/mysys/my_read.c index 47f2d725f65..5e33f83a919 100644 --- a/mysys/my_read.c +++ b/mysys/my_read.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_redel.c b/mysys/my_redel.c index e5e4f48d9d5..5ff47e3ae2b 100644 --- a/mysys/my_redel.c +++ b/mysys/my_redel.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 */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_rename.c b/mysys/my_rename.c index b89bc4c8fbd..a5ab55c8aab 100644 --- a/mysys/my_rename.c +++ b/mysys/my_rename.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include diff --git a/mysys/my_seek.c b/mysys/my_seek.c index 1033d7ac806..99b25e024e1 100644 --- a/mysys/my_seek.c +++ b/mysys/my_seek.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 */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_sleep.c b/mysys/my_sleep.c index 77eb466aee8..1c54b696aea 100644 --- a/mysys/my_sleep.c +++ b/mysys/my_sleep.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Wait a given number of microseconds */ diff --git a/mysys/my_static.c b/mysys/my_static.c index 48b1e5b8dd9..97c413bf446 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.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 */ /* Static variables for mysys library. All definied here for easy making of diff --git a/mysys/my_static.h b/mysys/my_static.h index a44a4b26c3d..b30540b1ce4 100644 --- a/mysys/my_static.h +++ b/mysys/my_static.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 */ /* Static variables for mysys library. All definied here for easy making of diff --git a/mysys/my_symlink.c b/mysys/my_symlink.c index 12959f1f24a..b15eed11dc3 100644 --- a/mysys/my_symlink.c +++ b/mysys/my_symlink.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 */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c index c851468ce1b..5fb47e9f7fd 100644 --- a/mysys/my_symlink2.c +++ b/mysys/my_symlink2.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 */ /* Advanced symlink handling. diff --git a/mysys/my_sync.c b/mysys/my_sync.c index 77e7befebed..70e5518eb90 100644 --- a/mysys/my_sync.c +++ b/mysys/my_sync.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 */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 55ee1db657e..201fc71bc8c 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.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 */ /* Functions to handle initializating and allocationg of all mysys & debug diff --git a/mysys/my_timer_cycles.il b/mysys/my_timer_cycles.il index e655cad2a2e..f6eb922c8fc 100644 --- a/mysys/my_timer_cycles.il +++ b/mysys/my_timer_cycles.il @@ -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 */ /* Sun Studio SPARC inline templates for cycle timer */ /* Sun Studio i386 and x86_64 inline templates for cycle timer */ diff --git a/mysys/my_wincond.c b/mysys/my_wincond.c index 07ba4f5c587..d68de3f4d03 100644 --- a/mysys/my_wincond.c +++ b/mysys/my_wincond.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 */ /***************************************************************************** ** The following is a simple implementation of posix conditions diff --git a/mysys/my_windac.c b/mysys/my_windac.c index 51fe22e8f59..f75c4ece444 100644 --- a/mysys/my_windac.c +++ b/mysys/my_windac.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "mysys_priv.h" #include "m_string.h" diff --git a/mysys/my_winerr.c b/mysys/my_winerr.c index 15f52dd7f37..5f7cd62e818 100644 --- a/mysys/my_winerr.c +++ b/mysys/my_winerr.c @@ -12,7 +12,7 @@ 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 */ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Convert Windows API error (GetLastError() to Posix equivalent (errno) diff --git a/mysys/my_winfile.c b/mysys/my_winfile.c index ad87bf718d2..a250b3d2e06 100644 --- a/mysys/my_winfile.c +++ b/mysys/my_winfile.c @@ -11,7 +11,7 @@ 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 */ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* The purpose of this file is to provide implementation of file IO routines on diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c index 81fd0e7277c..725bd6ac31f 100644 --- a/mysys/my_winthread.c +++ b/mysys/my_winthread.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /***************************************************************************** ** Simulation of posix threads calls for Windows diff --git a/mysys/my_write.c b/mysys/my_write.c index 001f7296042..f03c457347f 100644 --- a/mysys/my_write.c +++ b/mysys/my_write.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 */ #include "mysys_priv.h" #include "mysys_err.h" diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index 1004bf8889f..2f39d52a16b 100644 --- a/mysys/mysys_priv.h +++ b/mysys/mysys_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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include #include diff --git a/mysys/ptr_cmp.c b/mysys/ptr_cmp.c index 6e373e98972..6017e045a6f 100644 --- a/mysys/ptr_cmp.c +++ b/mysys/ptr_cmp.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* get_ptr_compare(len) returns a pointer to a optimal byte-compare function diff --git a/mysys/rijndael.c b/mysys/rijndael.c index e893a886726..7d66ab2a01a 100644 --- a/mysys/rijndael.c +++ b/mysys/rijndael.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index 31f0333725f..33f2b595c5a 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /******************************************************************** memory debugger diff --git a/mysys/sha1.c b/mysys/sha1.c index a247d69f5b1..9640c6158ac 100644 --- a/mysys/sha1.c +++ b/mysys/sha1.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 */ /* diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c index ae715c04621..6b0998ed1aa 100644 --- a/mysys/stacktrace.c +++ b/mysys/stacktrace.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 */ #include #include diff --git a/mysys/string.c b/mysys/string.c index a63b1f502e5..a7eef00af45 100644 --- a/mysys/string.c +++ b/mysys/string.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Code for handling strings with can grow dynamicly. diff --git a/mysys/test_charset.c b/mysys/test_charset.c index 49e25b8d5cd..f8392a9d3a9 100644 --- a/mysys/test_charset.c +++ b/mysys/test_charset.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include #include diff --git a/mysys/test_dir.c b/mysys/test_dir.c index 364562a6972..00b0c778605 100644 --- a/mysys/test_dir.c +++ b/mysys/test_dir.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 */ /* TODO: Test all functions */ diff --git a/mysys/test_xml.c b/mysys/test_xml.c index 56b50611498..ac106da6e39 100644 --- a/mysys/test_xml.c +++ b/mysys/test_xml.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 */ #include #include diff --git a/mysys/testhash.c b/mysys/testhash.c index aa78a2d8c40..845efd7938e 100644 --- a/mysys/testhash.c +++ b/mysys/testhash.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Test of hash library: big test */ diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index d0bb2f1ef4c..548644448a2 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.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 */ /* To avoid problems with alarms in debug code, we disable DBUG here */ #define FORCE_DBUG_OFF diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 890140fc34f..fd54b4bdfc5 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.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 */ /* Read and write locks for Posix threads. All tread must acquire diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c index 17cda782b30..85a8c29208a 100644 --- a/mysys/thr_mutex.c +++ b/mysys/thr_mutex.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 */ /* This makes a wrapper for mutex handling to make it easier to debug mutex */ diff --git a/mysys/thr_rwlock.c b/mysys/thr_rwlock.c index dd6c625a286..ea8b73bf8f5 100644 --- a/mysys/thr_rwlock.c +++ b/mysys/thr_rwlock.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Synchronization - readers / writer thread locks */ diff --git a/mysys/tree.c b/mysys/tree.c index 4184fc4634a..2ebe1c5a580 100644 --- a/mysys/tree.c +++ b/mysys/tree.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 */ /* Code for handling red-black (balanced) binary trees. diff --git a/mysys/typelib.c b/mysys/typelib.c index 2c36c97c6d6..e17b9ca586f 100644 --- a/mysys/typelib.c +++ b/mysys/typelib.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 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* Functions to handle typelib */ diff --git a/packaging/WiX/CMakeLists.txt b/packaging/WiX/CMakeLists.txt index a5970703720..ffb72024fea 100644 --- a/packaging/WiX/CMakeLists.txt +++ b/packaging/WiX/CMakeLists.txt @@ -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 IF(NOT WIN32) RETURN() diff --git a/packaging/WiX/CPackWixConfig.cmake b/packaging/WiX/CPackWixConfig.cmake index 9caae8375d8..8eb74d07879 100644 --- a/packaging/WiX/CPackWixConfig.cmake +++ b/packaging/WiX/CPackWixConfig.cmake @@ -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 IF(ESSENTIALS) SET(CPACK_COMPONENTS_USED "Server;Client;DataFiles") diff --git a/packaging/WiX/ca/CMakeLists.txt b/packaging/WiX/ca/CMakeLists.txt index 81622a1d158..7be0d31edc4 100644 --- a/packaging/WiX/ca/CMakeLists.txt +++ b/packaging/WiX/ca/CMakeLists.txt @@ -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_DIRECTORIES(${WIX_DIR}/../SDK/inc ${WIX_DIR}/SDK/inc) LINK_DIRECTORIES(${WIX_DIR}/../SDK/lib ${WIX_DIR}/SDK/lib) diff --git a/packaging/WiX/ca/CustomAction.cpp b/packaging/WiX/ca/CustomAction.cpp index 444e003c3f2..71084fcabca 100644 --- a/packaging/WiX/ca/CustomAction.cpp +++ b/packaging/WiX/ca/CustomAction.cpp @@ -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 UNICODE #define UNICODE diff --git a/packaging/WiX/create_msi.cmake.in b/packaging/WiX/create_msi.cmake.in index d0a8f0046cf..33a164c4e10 100644 --- a/packaging/WiX/create_msi.cmake.in +++ b/packaging/WiX/create_msi.cmake.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 SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@") SET(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@") diff --git a/packaging/WiX/custom_ui.wxs b/packaging/WiX/custom_ui.wxs index 0ccd30f6754..36b62be6762 100644 --- a/packaging/WiX/custom_ui.wxs +++ b/packaging/WiX/custom_ui.wxs @@ -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/packaging/WiX/extra.wxs.in b/packaging/WiX/extra.wxs.in index 92a79064d54..8909a4a73c3 100644 --- a/packaging/WiX/extra.wxs.in +++ b/packaging/WiX/extra.wxs.in @@ -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 diff --git a/plugin/auth_dialog/CMakeLists.txt b/plugin/auth_dialog/CMakeLists.txt index 9b4dcfd99bf..7bde18fbf5d 100644 --- a/plugin/auth_dialog/CMakeLists.txt +++ b/plugin/auth_dialog/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 MYSQL_ADD_PLUGIN(dialog dialog.c ${CMAKE_SOURCE_DIR}/libmysql/get_password.c MODULE_ONLY COMPONENT SharedLibraries) diff --git a/plugin/auth_dialog/dialog.c b/plugin/auth_dialog/dialog.c index 0fa5ab93a35..ac5029ce35e 100644 --- a/plugin/auth_dialog/dialog.c +++ b/plugin/auth_dialog/dialog.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 */ /** @file diff --git a/plugin/auth_examples/CMakeLists.txt b/plugin/auth_examples/CMakeLists.txt index f6c2b637067..53e38ffa907 100644 --- a/plugin/auth_examples/CMakeLists.txt +++ b/plugin/auth_examples/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 MYSQL_ADD_PLUGIN(dialog_examples dialog_examples.c MODULE_ONLY COMPONENT Test) diff --git a/plugin/auth_examples/auth_0x0100.c b/plugin/auth_examples/auth_0x0100.c index d1373b8a0b4..e23f495f43b 100644 --- a/plugin/auth_examples/auth_0x0100.c +++ b/plugin/auth_examples/auth_0x0100.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 */ /** @file diff --git a/plugin/auth_examples/dialog_examples.c b/plugin/auth_examples/dialog_examples.c index 067244d6f7d..096dc3fca08 100644 --- a/plugin/auth_examples/dialog_examples.c +++ b/plugin/auth_examples/dialog_examples.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 */ /** @file diff --git a/plugin/auth_examples/qa_auth_client.c b/plugin/auth_examples/qa_auth_client.c index a7ee2f83a39..4421ceed5a0 100644 --- a/plugin/auth_examples/qa_auth_client.c +++ b/plugin/auth_examples/qa_auth_client.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 */ #include #include diff --git a/plugin/auth_examples/qa_auth_interface.c b/plugin/auth_examples/qa_auth_interface.c index c9bc6c5aae4..6b7e9c42adb 100644 --- a/plugin/auth_examples/qa_auth_interface.c +++ b/plugin/auth_examples/qa_auth_interface.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 */ #include #include diff --git a/plugin/auth_examples/qa_auth_server.c b/plugin/auth_examples/qa_auth_server.c index 59b926b63dc..ff4d957a0a8 100644 --- a/plugin/auth_examples/qa_auth_server.c +++ b/plugin/auth_examples/qa_auth_server.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 */ #include #include diff --git a/plugin/auth_examples/test_plugin.c b/plugin/auth_examples/test_plugin.c index 2b20a8cb56c..ae4e2004bb6 100644 --- a/plugin/auth_examples/test_plugin.c +++ b/plugin/auth_examples/test_plugin.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 */ /** @file diff --git a/plugin/auth_socket/CMakeLists.txt b/plugin/auth_socket/CMakeLists.txt index 8137c6b4529..f95eb8a31da 100644 --- a/plugin/auth_socket/CMakeLists.txt +++ b/plugin/auth_socket/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 CHECK_CXX_SOURCE_COMPILES( "#define _GNU_SOURCE diff --git a/plugin/auth_socket/auth_socket.c b/plugin/auth_socket/auth_socket.c index 508cd1ecf5e..134f72c9a7d 100644 --- a/plugin/auth_socket/auth_socket.c +++ b/plugin/auth_socket/auth_socket.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 */ /** @file diff --git a/plugin/daemon_example/CMakeLists.txt b/plugin/daemon_example/CMakeLists.txt index 3d674c4ef3e..bb3d9a86a7b 100644 --- a/plugin/daemon_example/CMakeLists.txt +++ b/plugin/daemon_example/CMakeLists.txt @@ -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 MYSQL_ADD_PLUGIN(daemon_example daemon_example.cc MODULE_ONLY MODULE_OUTPUT_NAME "libdaemon_example" COMPONENT Test) diff --git a/plugin/daemon_example/daemon_example.cc b/plugin/daemon_example/daemon_example.cc index 35376a8ec32..e3fe4730a12 100644 --- a/plugin/daemon_example/daemon_example.cc +++ b/plugin/daemon_example/daemon_example.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 #include diff --git a/plugin/fulltext/CMakeLists.txt b/plugin/fulltext/CMakeLists.txt index b65fcba0449..23710ee1312 100644 --- a/plugin/fulltext/CMakeLists.txt +++ b/plugin/fulltext/CMakeLists.txt @@ -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 MYSQL_ADD_PLUGIN(ftexample plugin_example.c MODULE_ONLY MODULE_OUTPUT_NAME "mypluglib" COMPONENT Test) diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c index 53a321b473e..8d347f5642f 100644 --- a/plugin/fulltext/plugin_example.c +++ b/plugin/fulltext/plugin_example.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include #include diff --git a/plugin/semisync/CMakeLists.txt b/plugin/semisync/CMakeLists.txt index f1ada507f4f..d2d3327fb2e 100644 --- a/plugin/semisync/CMakeLists.txt +++ b/plugin/semisync/CMakeLists.txt @@ -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 SET(SEMISYNC_MASTER_SOURCES semisync.cc semisync_master.cc semisync_master_plugin.cc diff --git a/plugin/semisync/semisync.cc b/plugin/semisync/semisync.cc index 4a80360ba4d..fe6f1d9b071 100644 --- a/plugin/semisync/semisync.cc +++ b/plugin/semisync/semisync.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 "semisync.h" diff --git a/plugin/semisync/semisync.h b/plugin/semisync/semisync.h index 5d8753d0a93..70ab8ce9cc3 100644 --- a/plugin/semisync/semisync.h +++ b/plugin/semisync/semisync.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 SEMISYNC_H diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc index 16e6b091ca8..5175385b884 100644 --- a/plugin/semisync/semisync_master.cc +++ b/plugin/semisync/semisync_master.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 "semisync_master.h" diff --git a/plugin/semisync/semisync_master.h b/plugin/semisync/semisync_master.h index 841c24197fc..cd1c0507039 100644 --- a/plugin/semisync/semisync_master.h +++ b/plugin/semisync/semisync_master.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 SEMISYNC_MASTER_H diff --git a/plugin/semisync/semisync_master_plugin.cc b/plugin/semisync/semisync_master_plugin.cc index b6ff23cd1ad..4a085233939 100644 --- a/plugin/semisync/semisync_master_plugin.cc +++ b/plugin/semisync/semisync_master_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 "semisync_master.h" diff --git a/plugin/semisync/semisync_slave.cc b/plugin/semisync/semisync_slave.cc index 5f98472d5d7..3223bd932d2 100644 --- a/plugin/semisync/semisync_slave.cc +++ b/plugin/semisync/semisync_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 */ #include "semisync_slave.h" diff --git a/plugin/semisync/semisync_slave.h b/plugin/semisync/semisync_slave.h index 1bf8cf31972..56c0a4ccc9d 100644 --- a/plugin/semisync/semisync_slave.h +++ b/plugin/semisync/semisync_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 SEMISYNC_SLAVE_H diff --git a/plugin/semisync/semisync_slave_plugin.cc b/plugin/semisync/semisync_slave_plugin.cc index f96116eba4f..1d62bbdf7fc 100644 --- a/plugin/semisync/semisync_slave_plugin.cc +++ b/plugin/semisync/semisync_slave_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 "semisync_slave.h" diff --git a/plugin/server_audit/COPYING b/plugin/server_audit/COPYING index d511905c164..6e475df5526 100644 --- a/plugin/server_audit/COPYING +++ b/plugin/server_audit/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. You should have 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. Also add information on how to contact you by electronic and paper mail. diff --git a/plugin/server_audit/plugin_audit_v4.h b/plugin/server_audit/plugin_audit_v4.h index 5f8e43b3811..e9f00d66ee4 100644 --- a/plugin/server_audit/plugin_audit_v4.h +++ b/plugin/server_audit/plugin_audit_v4.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 _my_audit_h #define _my_audit_h diff --git a/plugin/sql_errlog/CMakeLists.txt b/plugin/sql_errlog/CMakeLists.txt index 18fb9f5421d..10754f2a333 100644 --- a/plugin/sql_errlog/CMakeLists.txt +++ b/plugin/sql_errlog/CMakeLists.txt @@ -11,6 +11,6 @@ # # You should have 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 MYSQL_ADD_PLUGIN(sql_errlog sql_errlog.c MODULE_ONLY) diff --git a/plugin/win_auth_client/CMakeLists.txt b/plugin/win_auth_client/CMakeLists.txt index 75ee55117bd..d54a740357e 100644 --- a/plugin/win_auth_client/CMakeLists.txt +++ b/plugin/win_auth_client/CMakeLists.txt @@ -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 IF(WIN32) # diff --git a/plugin/win_auth_client/common.cc b/plugin/win_auth_client/common.cc index 30a8e0b3b13..0cfbb2e802c 100644 --- a/plugin/win_auth_client/common.cc +++ b/plugin/win_auth_client/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 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include "common.h" #include // for ConvertSidToStringSid() diff --git a/plugin/win_auth_client/common.h b/plugin/win_auth_client/common.h index 415294b1ed9..206cb9240c0 100644 --- a/plugin/win_auth_client/common.h +++ b/plugin/win_auth_client/common.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 COMMON_H #define COMMON_H diff --git a/plugin/win_auth_client/handshake.cc b/plugin/win_auth_client/handshake.cc index 8e6af8408ae..cd63ee263a7 100644 --- a/plugin/win_auth_client/handshake.cc +++ b/plugin/win_auth_client/handshake.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 "handshake.h" diff --git a/plugin/win_auth_client/handshake.h b/plugin/win_auth_client/handshake.h index adab4715c99..d495ba5115b 100644 --- a/plugin/win_auth_client/handshake.h +++ b/plugin/win_auth_client/handshake.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 HANDSHAKE_H #define HANDSHAKE_H diff --git a/plugin/win_auth_client/handshake_client.cc b/plugin/win_auth_client/handshake_client.cc index e3435f19de6..a02ba4b4688 100644 --- a/plugin/win_auth_client/handshake_client.cc +++ b/plugin/win_auth_client/handshake_client.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 "handshake.h" diff --git a/plugin/win_auth_client/log_client.cc b/plugin/win_auth_client/log_client.cc index ec7210a8a97..2e878510105 100644 --- a/plugin/win_auth_client/log_client.cc +++ b/plugin/win_auth_client/log_client.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 #include "common.h" diff --git a/plugin/win_auth_client/plugin_client.cc b/plugin/win_auth_client/plugin_client.cc index c7dcb92e62d..37bd1bc5c32 100644 --- a/plugin/win_auth_client/plugin_client.cc +++ b/plugin/win_auth_client/plugin_client.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 #include diff --git a/regex/CMakeLists.txt b/regex/CMakeLists.txt index b4a72620ac5..dc33a972e63 100644 --- a/regex/CMakeLists.txt +++ b/regex/CMakeLists.txt @@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 93ee3e9d2ac..e0d9d0bf75f 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/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 # Build comp_sql - used for embedding SQL in C or C++ programs IF(NOT CMAKE_CROSSCOMPILING) diff --git a/scripts/comp_sql.c b/scripts/comp_sql.c index c79edf1eab7..22316bf2f95 100644 --- a/scripts/comp_sql.c +++ b/scripts/comp_sql.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 */ /* Written by Magnus Svensson diff --git a/scripts/fill_help_tables.sql b/scripts/fill_help_tables.sql index 939f15ed45a..7b8a331aeec 100644 --- a/scripts/fill_help_tables.sql +++ b/scripts/fill_help_tables.sql @@ -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. -- DO NOT EDIT THIS FILE. It is generated automatically. diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 053abb33b2c..19c72bc2cc0 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -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/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index 2415d4017e4..7387dc2c1a6 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -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 # Exit if failing to copy, we want exact specifications, not # just "what happen to be built". diff --git a/scripts/msql2mysql.sh b/scripts/msql2mysql.sh index d5f1e55af34..72a609fa6e7 100644 --- a/scripts/msql2mysql.sh +++ b/scripts/msql2mysql.sh @@ -14,6 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program; see the file COPYING. If not, write to the # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston -# MA 02110-1301 USA. +# MA 02110-1335 USA. @bindir@/replace msqlConnect mysql_connect msqlListDBs mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db msqlFieldSeek mysql_field_seek -- $* diff --git a/scripts/mysql_config.pl.in b/scripts/mysql_config.pl.in index f2c27bc0b84..fec9bc648f5 100644 --- a/scripts/mysql_config.pl.in +++ b/scripts/mysql_config.pl.in @@ -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 ############################################################################## # diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 57bdb4cbd56..a3c6cbecc57 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -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 script reports various configuration settings that may be needed # when using the MySQL client library. diff --git a/scripts/mysql_convert_table_format.sh b/scripts/mysql_convert_table_format.sh index 5042a742d55..17fa6cd34b7 100644 --- a/scripts/mysql_convert_table_format.sh +++ b/scripts/mysql_convert_table_format.sh @@ -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 # Convert given tables in a database to MYISAM diff --git a/scripts/mysql_find_rows.sh b/scripts/mysql_find_rows.sh index 20c3e2c3106..842c0526e40 100644 --- a/scripts/mysql_find_rows.sh +++ b/scripts/mysql_find_rows.sh @@ -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 $version="1.02"; diff --git a/scripts/mysql_fix_extensions.sh b/scripts/mysql_fix_extensions.sh index 7aa07209d4d..f49590cfb4d 100644 --- a/scripts/mysql_fix_extensions.sh +++ b/scripts/mysql_fix_extensions.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # This is a utility for MySQL. It is not needed by any standard part # of MySQL. diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in index 2a65dc94ba8..559812a6936 100644 --- a/scripts/mysql_install_db.pl.in +++ b/scripts/mysql_install_db.pl.in @@ -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 ############################################################################## # diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 9f00562f4bd..e3b4ad88105 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -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 # This scripts creates the MariaDB Server system tables # diff --git a/scripts/mysql_secure_installation.pl.in b/scripts/mysql_secure_installation.pl.in index 01d34c4af4d..e4353e57b35 100644 --- a/scripts/mysql_secure_installation.pl.in +++ b/scripts/mysql_secure_installation.pl.in @@ -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 use Fcntl; use File::Spec; diff --git a/scripts/mysql_secure_installation.sh b/scripts/mysql_secure_installation.sh index f7559c5683b..80aa924d874 100644 --- a/scripts/mysql_secure_installation.sh +++ b/scripts/mysql_secure_installation.sh @@ -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 config=".my.cnf.$$" command=".mysql.$$" diff --git a/scripts/mysql_setpermission.sh b/scripts/mysql_setpermission.sh index 4416551eadd..d8e52ab6963 100644 --- a/scripts/mysql_setpermission.sh +++ b/scripts/mysql_setpermission.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA ## ## Permission setter for MySQL diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql index e9b54f24668..1ee73bfbb60 100644 --- a/scripts/mysql_system_tables.sql +++ b/scripts/mysql_system_tables.sql @@ -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 -- -- The system tables of MySQL Server diff --git a/scripts/mysql_system_tables_data.sql b/scripts/mysql_system_tables_data.sql index 18d2de500a7..18a319c92d8 100644 --- a/scripts/mysql_system_tables_data.sql +++ b/scripts/mysql_system_tables_data.sql @@ -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 inital data for system tables of MySQL Server diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index dd792ce9f2f..518981353be 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -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 part converts any old privilege tables to privilege tables suitable # for current version of MySQL diff --git a/scripts/mysql_test_data_timezone.sql b/scripts/mysql_test_data_timezone.sql index 091d4f00a97..b4902c358ea 100644 --- a/scripts/mysql_test_data_timezone.sql +++ b/scripts/mysql_test_data_timezone.sql @@ -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 INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES ('MET', 1), ('UTC', 2), ('Universal', 2), ('Europe/Moscow',3), ('leap/Europe/Moscow',4), ('Japan', 5); INSERT INTO time_zone (Time_zone_id, Use_leap_seconds) VALUES (1,'N'), (2,'N'), (3,'N'), (4,'Y'), (5,'N'); diff --git a/scripts/mysql_zap.sh b/scripts/mysql_zap.sh index 725a4e247a4..35b0a458ccf 100644 --- a/scripts/mysql_zap.sh +++ b/scripts/mysql_zap.sh @@ -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 is a utility for MySQL. It is not needed by any standard part # of MySQL. diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh index 431c70812cb..b75a8b74ece 100644 --- a/scripts/mysqlaccess.sh +++ b/scripts/mysqlaccess.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # **************************** package MySQLaccess; diff --git a/scripts/mysqlbug.sh b/scripts/mysqlbug.sh index e9df210fa84..4533f8202ae 100644 --- a/scripts/mysqlbug.sh +++ b/scripts/mysqlbug.sh @@ -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 # Create a bug report and mail it to the mysql mailing list # Based on glibc bug reporting script. diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 8f5adfe4842..1953d427769 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA use Getopt::Long; use POSIX qw(strftime getcwd); diff --git a/scripts/mysqldumpslow.sh b/scripts/mysqldumpslow.sh index a7d064904a5..c513c30fb94 100644 --- a/scripts/mysqldumpslow.sh +++ b/scripts/mysqldumpslow.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # mysqldumpslow - parse and summarize the MySQL slow query log diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh index d6184d9ef10..c56cdea470c 100644 --- a/scripts/mysqlhotcopy.sh +++ b/scripts/mysqlhotcopy.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA use strict; use Getopt::Long; diff --git a/sql-bench/CMakeLists.txt b/sql-bench/CMakeLists.txt index a837746bb98..58ae070b387 100644 --- a/sql-bench/CMakeLists.txt +++ b/sql-bench/CMakeLists.txt @@ -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 # Install sql-bench files diff --git a/sql-bench/as3ap.sh b/sql-bench/as3ap.sh index 52e790cafeb..fd2b6ba3b25 100644 --- a/sql-bench/as3ap.sh +++ b/sql-bench/as3ap.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # AS3AP single-user benchmark. # diff --git a/sql-bench/bench-count-distinct.sh b/sql-bench/bench-count-distinct.sh index 923af98648a..9ce9b2fb168 100644 --- a/sql-bench/bench-count-distinct.sh +++ b/sql-bench/bench-count-distinct.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # Test of selecting on keys that consist of many parts # diff --git a/sql-bench/bench-init.pl.sh b/sql-bench/bench-init.pl.sh index a46bb2d7a49..9aab11c90cc 100644 --- a/sql-bench/bench-init.pl.sh +++ b/sql-bench/bench-init.pl.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # ########################################################## # this is the base file every test is using .... diff --git a/sql-bench/compare-results.sh b/sql-bench/compare-results.sh index 91d29685ee3..f0658160db2 100644 --- a/sql-bench/compare-results.sh +++ b/sql-bench/compare-results.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # a little program to generate a table of results # just read all the RUN-*.log files and format them nicely diff --git a/sql-bench/copy-db.sh b/sql-bench/copy-db.sh index 082db2203aa..38a010e52ab 100644 --- a/sql-bench/copy-db.sh +++ b/sql-bench/copy-db.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # start initialition # diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh index 4391a2afb40..a7298c5f9a1 100644 --- a/sql-bench/crash-me.sh +++ b/sql-bench/crash-me.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # Written by Monty for the TCX/Monty Program/Detron benchmark suite. # Empress and PostgreSQL patches by Luuk de Boer diff --git a/sql-bench/run-all-tests.sh b/sql-bench/run-all-tests.sh index 4e4b372b759..5d77c8c388d 100644 --- a/sql-bench/run-all-tests.sh +++ b/sql-bench/run-all-tests.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # This program runs all test that starts with 'test-' and sums # the results that the program prints. diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh index 4cc39481523..9568efcd189 100644 --- a/sql-bench/server-cfg.sh +++ b/sql-bench/server-cfg.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # The configuration file for the DBI/DBD tests on different databases .... # You will need the DBD module for the database you are running. diff --git a/sql-bench/test-ATIS.sh b/sql-bench/test-ATIS.sh index ca1132435ff..d3c242db256 100644 --- a/sql-bench/test-ATIS.sh +++ b/sql-bench/test-ATIS.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # Test of creating the ATIS database and doing many different selects on it # diff --git a/sql-bench/test-alter-table.sh b/sql-bench/test-alter-table.sh index 6dc5ce35841..3a7f325b604 100644 --- a/sql-bench/test-alter-table.sh +++ b/sql-bench/test-alter-table.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # Test of alter table # diff --git a/sql-bench/test-big-tables.sh b/sql-bench/test-big-tables.sh index 68b4afaa429..e2cf983de1c 100644 --- a/sql-bench/test-big-tables.sh +++ b/sql-bench/test-big-tables.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # Test of extreme tables. # diff --git a/sql-bench/test-connect.sh b/sql-bench/test-connect.sh index 50024e7e055..1226301df9b 100644 --- a/sql-bench/test-connect.sh +++ b/sql-bench/test-connect.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # This test is for testing the speed of connections and sending # data to the client. diff --git a/sql-bench/test-create.sh b/sql-bench/test-create.sh index 235cacd86ec..7af6fa13562 100644 --- a/sql-bench/test-create.sh +++ b/sql-bench/test-create.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # This test is for testing how long it takes to create tables, # make a count(*) from them and finally drop the tables. These diff --git a/sql-bench/test-insert.sh b/sql-bench/test-insert.sh index e264c7d529f..be57b04471a 100644 --- a/sql-bench/test-insert.sh +++ b/sql-bench/test-insert.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # Test of creating a simple table and inserting $record_count records in it, # $opt_loop_count rows in order, $opt_loop_count rows in reverse order and diff --git a/sql-bench/test-select.sh b/sql-bench/test-select.sh index 1752c05079b..4c7147b57a4 100644 --- a/sql-bench/test-select.sh +++ b/sql-bench/test-select.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # Test of selecting on keys that consist of many parts # diff --git a/sql-bench/test-transactions.sh b/sql-bench/test-transactions.sh index b0aee8c6d38..4732658c529 100644 --- a/sql-bench/test-transactions.sh +++ b/sql-bench/test-transactions.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # # Test of transactions performance. # diff --git a/sql-bench/test-wisconsin.sh b/sql-bench/test-wisconsin.sh index 4fb3bc65f35..47c9e050304 100644 --- a/sql-bench/test-wisconsin.sh +++ b/sql-bench/test-wisconsin.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Library General Public # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301, USA +# MA 02110-1335 USA # use Cwd; diff --git a/sql-common/client.c b/sql-common/client.c index bec778e7d51..f535b5119b7 100644 --- a/sql-common/client.c +++ b/sql-common/client.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 */ /* This file is included by both libmysql.c (the MySQL client C API) diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c index f31ddb22a6a..f5e1ffbbf5c 100644 --- a/sql-common/client_plugin.c +++ b/sql-common/client_plugin.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 */ /** @file diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 860f69a7f8e..7efd0539206 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.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 */ #include #include diff --git a/sql-common/my_user.c b/sql-common/my_user.c index 8d717ea7131..0b0550910fc 100644 --- a/sql-common/my_user.c +++ b/sql-common/my_user.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 */ #include #include diff --git a/sql-common/pack.c b/sql-common/pack.c index 02e91b5c3e3..7e75af2a882 100644 --- a/sql-common/pack.c +++ b/sql-common/pack.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 */ #include #include diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 6648b7a2612..9d650c35aca 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 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include diff --git a/sql/authors.h b/sql/authors.h index 84c29f8c127..148ae167a47 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/client_settings.h b/sql/client_settings.h index 54cb72f9412..0e418a35019 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/contributors.h b/sql/contributors.h index b1ba2c20997..9b43d22caf9 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/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 4e4fcafa31b..1ed30d2e0a4 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 "datadict.h" #include "sql_priv.h" diff --git a/sql/datadict.h b/sql/datadict.h index f852b02f52c..2dfec633189 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 82203505f50..b1f707b8b46 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, 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 4d29d6e7508..0db807f25af 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 33835992258..d8a49a03de0 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 b2f6331e048..e7b913bd0be 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 b6b6f4536bc..afa21ed53aa 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 b9dba92a780..696efb40ded 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 a663e44128d..5b903d645d1 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/event_data_objects.cc b/sql/event_data_objects.cc index dfd35583581..c97d2212c89 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 2483c564dff..26c00e84ca0 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 481a49bf5b0..fc70e34a69f 100644 --- a/sql/event_db_repository.cc +++ b/sql/event_db_repository.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_priv.h" #include "unireg.h" diff --git a/sql/event_db_repository.h b/sql/event_db_repository.h index a2862790be1..ab53b4152c5 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 ad812a6aa5d..1756508ce3c 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 "sql_priv.h" #include "unireg.h" diff --git a/sql/event_parse_data.h b/sql/event_parse_data.h index faf42db623a..82424833a8d 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 40fddff094c..1a81d981906 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, 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_priv.h" #include "unireg.h" diff --git a/sql/event_queue.h b/sql/event_queue.h index affa306b259..e98dcda0030 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, 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_scheduler.cc b/sql/event_scheduler.cc index a5a3f7110b3..dfb72007ec6 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 "sql_priv.h" #include "unireg.h" diff --git a/sql/event_scheduler.h b/sql/event_scheduler.h index 538514b8b12..8ecb34af308 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, 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/events.cc b/sql/events.cc index 008b6223702..92dab0c073c 100644 --- a/sql/events.cc +++ b/sql/events.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_priv.h" #include "unireg.h" diff --git a/sql/events.h b/sql/events.h index 223f68c8370..c5c5c801b6d 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/examples/CMakeLists.txt b/sql/examples/CMakeLists.txt index c4ea4c25679..a623037edea 100644 --- a/sql/examples/CMakeLists.txt +++ b/sql/examples/CMakeLists.txt @@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/extra/yassl/include diff --git a/sql/field.cc b/sql/field.cc index 28b3d743ed8..31f3c430ecc 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 d484b31d682..e77e173d106 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 new_field() all field classes that have static diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 6e48bf00abc..1ffb0e7f768 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 5674786d8b2..876969299ad 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 8ee8999d055..d72f303e558 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/frm_crypt.cc b/sql/frm_crypt.cc index 5612908aea5..ce5d7b5a10b 100644 --- a/sql/frm_crypt.cc +++ b/sql/frm_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/frm_crypt.h b/sql/frm_crypt.h index 0605644b3e0..d229cffa969 100644 --- a/sql/frm_crypt.h +++ b/sql/frm_crypt.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 FRM_CRYPT_INCLUDED #define FRM_CRYPT_INCLUDED diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc index 3a3273d279b..d488900fb85 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/gstream.cc b/sql/gstream.cc index 3a9e478c376..ff8250acb0c 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_ndbcluster.cc b/sql/ha_ndbcluster.cc index 2878f25ed14..f0cb5df84d1 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.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/ha_ndbcluster.h b/sql/ha_ndbcluster.h index 70e1e9dc7cf..9b55cf3bb3a 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.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 */ /* This file defines the NDB Cluster handler: the interface between MySQL and diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index ae7bd12f229..e4f0b19078c 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_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 St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "sql_priv.h" diff --git a/sql/ha_ndbcluster_binlog.h b/sql/ha_ndbcluster_binlog.h index a02f687d76f..a2a85745375 100644 --- a/sql/ha_ndbcluster_binlog.h +++ b/sql/ha_ndbcluster_binlog.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_class.h" /* THD */ diff --git a/sql/ha_ndbcluster_cond.cc b/sql/ha_ndbcluster_cond.cc index e1bd6271866..43e49f662c6 100644 --- a/sql/ha_ndbcluster_cond.cc +++ b/sql/ha_ndbcluster_cond.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 */ /* diff --git a/sql/ha_ndbcluster_cond.h b/sql/ha_ndbcluster_cond.h index 2387dcaf5ba..ab647f89917 100644 --- a/sql/ha_ndbcluster_cond.h +++ b/sql/ha_ndbcluster_cond.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 */ /* This file defines the data structures used by engine condition pushdown in diff --git a/sql/ha_ndbcluster_tables.h b/sql/ha_ndbcluster_tables.h index 4d97ca2c254..9777a18054e 100644 --- a/sql/ha_ndbcluster_tables.h +++ b/sql/ha_ndbcluster_tables.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 */ #define NDB_REP_DB "mysql" diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index bc2f597d5b0..d12369941db 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 e8e3858d076..d721a0df254 100644 --- a/sql/ha_partition.h +++ b/sql/ha_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 __GNUC__ #pragma interface /* gcc class implementation */ diff --git a/sql/handler.h b/sql/handler.h index 3d6c8dea2bf..32a7686f6c9 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 7c275ffc617..0249be1c165 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 dab54928a55..f3e31d39627 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 f9a6f4b3fcf..03217a9cecd 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 6e9535c2947..bedf33c02c0 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 86915b7aa01..38e50e0b933 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 88cd8e6e178..d0518066f03 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 33ba7b0f5b3..3cd70229fb8 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 d2e3b847f5c..719bdcfaf89 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 38dce1f3b97..f6c3c20516b 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 86e0fd32774..d4c7034e847 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 3af79c23ee7..f77891d305f 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 12a12e05845..b10dc2b8056 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 45de3850fcd..2f734801e86 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 ac6b0f8454f..c0e45f5139d 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 73fc099252b..22d7e8c7bb6 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 64b3b5cfb75..5527631fb60 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 131b54bef8e..3de45178857 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 922593f8b91..91dbc14b899 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_row.cc b/sql/item_row.cc index 9fe34dd00fd..a44dc367707 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 "sql_priv.h" /* diff --git a/sql/item_row.h b/sql/item_row.h index 4d5c20711b5..d21f28a3d88 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 */ class Item_row: public Item { diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index a7ca21b79de..f8f3d913cd8 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 c1138c2a930..b91912cd4ce 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 57dcbd4f540..afc42dc08d5 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 75822ff8c6b..f72ceda627d 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 22fbe2bacfe..cdd33015e4a 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 b0bca5e7ad2..79b5fc368a9 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 2dc704f6873..c49a4caa2d2 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 5be9c5cacbd..16898686e8f 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 a49b5749f88..90d1f598b5b 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 */ #ifdef __GNUC__ #pragma implementation diff --git a/sql/item_xmlfunc.h b/sql/item_xmlfunc.h index 800cf6ed760..c5cc986348d 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 7e5a3309b10..180f643b789 100644 --- a/sql/key.cc +++ b/sql/key.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 handle keys and fields in forms */ diff --git a/sql/key.h b/sql/key.h index f5f9a19178c..ce2b3a943ba 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 26a39808c56..164c004523f 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 04d3f6145e7..72e949676fb 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 diff --git a/sql/lex.h b/sql/lex.h index aec2ec29dca..da2cfe2933d 100644 --- a/sql/lex.h +++ b/sql/lex.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 */ /* 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 31ef1314f5a..fd2d76f5eb0 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, 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/lock.h b/sql/lock.h index a4833cdc38e..e123bb6b484 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 7db4985ad48..54b2975349c 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 c6e5c135b25..e98d234500d 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 56ce3fab416..cd9190c0d4c 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 */ #ifdef MYSQL_CLIENT diff --git a/sql/log_event.h b/sql/log_event.h index 4ae01323b4b..c181b5ce4c6 100644 --- a/sql/log_event.h +++ b/sql/log_event.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 */ /** @addtogroup Replication diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index 55de64ce73c..9b8ab8639d2 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 "sql_priv.h" #ifndef MYSQL_CLIENT diff --git a/sql/log_event_old.h b/sql/log_event_old.h index d9d9f25737b..73a541d130f 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/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 415d56887d5..6b4e8a283bf 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, 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" diff --git a/sql/mdl.h b/sql/mdl.h index 68f24a7a0e8..db762939073 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #if defined(__IBMC__) || defined(__IBMCPP__) /* Further down, "next_in_lock" and "next_in_context" have the same type, diff --git a/sql/mem_root_array.h b/sql/mem_root_array.h index 2dcc475cd7b..763fd35218d 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 d8848c1ee35..b8e7073fb2f 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/my_decimal.cc b/sql/my_decimal.cc index 21611afd87b..1463cfaee2a 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 #include "sql_priv.h" diff --git a/sql/my_decimal.h b/sql/my_decimal.h index 22ae38bef41..91b9b855481 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/mysqld.cc b/sql/mysqld.cc index 528c5d8ecfe..96daeab867d 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 "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */ #include "sql_priv.h" diff --git a/sql/mysqld.h b/sql/mysqld.h index d0679a3fa82..e6d9b904767 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 ea66bb53394..8c02ff757ed 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_range.cc b/sql/opt_range.cc index 04ab8415dfe..ca6f500fec6 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 b8b46ae5ab1..a39712403bc 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_sum.cc b/sql/opt_sum.cc index f717be5ba3f..ef83e0c7544 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/parse_file.cc b/sql/parse_file.cc index a6e3aa7ed66..23e520f544e 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 83a8eabcf5f..6e074b15976 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 75033d3552f..4b5074d0be7 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 740e5087477..b106c414a3c 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 779948eddc9..2f61ed1277c 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 947620ddf7a..7c0719c7cec 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/procedure.cc b/sql/procedure.cc index bdaced20586..570f49b4299 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 6870b97de57..fe2d046f144 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 8602d9131c1..7123fa739bd 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 871d6018458..aa23a071891 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 59ea50bd061..41901d0d1ba 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 57467d665d4..53b05d2c6b6 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 89fb1bb27de..cb443c13e4f 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 9492c54fabd..43106c08ba1 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, 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 3c605d24563..7b5f8fc6b38 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 6205c253ffc..58068c4643e 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 "sql_priv.h" #include "mysqld.h" // system_charset_info diff --git a/sql/rpl_filter.h b/sql/rpl_filter.h index 2eb0340b714..7fa690d54d8 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_handler.cc b/sql/rpl_handler.cc index ca3b57edce3..542403034b5 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 "sql_priv.h" #include "unireg.h" diff --git a/sql/rpl_handler.h b/sql/rpl_handler.h index 362f3c74a4b..036d6166225 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 ec1a96e8a2b..9ce76bef690 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 "sql_priv.h" #include "unireg.h" // REQUIRED by later includes diff --git a/sql/rpl_injector.h b/sql/rpl_injector.h index f4790cc963a..6c8b763687f 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 adaa7cf864f..f876ca39006 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 // For HAVE_REPLICATION #include "sql_priv.h" diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h index f9c8c8ea5b2..c5d8a47ddd7 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 db65cfa8757..fc4e682bc06 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 "sql_priv.h" #include "unireg.h" diff --git a/sql/rpl_record.h b/sql/rpl_record.h index d4eb8986846..00eca54e27d 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 fa0c49b413c..9673d36be82 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 "sql_priv.h" #include "unireg.h" // REQUIRED by other includes diff --git a/sql/rpl_record_old.h b/sql/rpl_record_old.h index ea981fb23c3..43becb6c024 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 ebb0dbec1cb..493552c7b8a 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 "sql_priv.h" #include "rpl_reporting.h" diff --git a/sql/rpl_reporting.h b/sql/rpl_reporting.h index 2b5e0527b9b..66e3d3a8da8 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 52e60c237dc..a9ccb121414 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, 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_priv.h" #include "unireg.h" // HAVE_* diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 5d31a8d1cdc..880e9e6c173 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 b7ac1b2d091..ccbc94661dd 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 "sql_priv.h" #include "my_global.h" // HAVE_REPLICATION diff --git a/sql/rpl_tblmap.h b/sql/rpl_tblmap.h index 9fb1c4afbd7..a7790942de0 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 9a20f71f4f7..8b3cebd2bf5 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 "rpl_utility.h" #include "log_event.h" diff --git a/sql/rpl_utility.h b/sql/rpl_utility.h index 79f4517c492..6f3488cc9a9 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 1cdda089a6b..24105ae248e 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 f7aff377eac..72ab1918b11 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 9efa29d8041..1e80bf0674c 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 */ #ifdef USE_PRAGMA_IMPLEMENTATION #pragma implementation diff --git a/sql/set_var.h b/sql/set_var.h index 32207e834d9..58ee7a21d0b 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/sha2.cc b/sql/sha2.cc index f2201974172..4efe318484a 100644 --- a/sql/sha2.cc +++ b/sql/sha2.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/share/CMakeLists.txt b/sql/share/CMakeLists.txt index e0d5fb6c1a7..b7a6ead04a6 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 9764d629625..3530d95bfa4 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 #
 (
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
 
 
 
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
 
 
 
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
 
 
 
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
 
 
 
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
 
 
 
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
 
 
 
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
 
 
 
diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc
index 81792cc30ac..81235523e73 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 
diff --git a/sql/slave.cc b/sql/slave.cc
index dc499fb1fc2..a8946c69d18 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 ae70f0194fa..99a400ba1ac 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 62ed89f4a02..42f7e2d0433 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 "sql_priv.h"
 #include "unireg.h"
diff --git a/sql/sp.h b/sql/sp.h
index 82d4704cf2c..07daa7c0726 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 14f49ecc077..7cfeb89575c 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 "sql_priv.h"
 #include "unireg.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 e820cfd9d45..5d8ea512e0f 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 409db33ef02..f46f11f9622 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 4c5087eaf27..6f5609b9354 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 "sql_priv.h"
 #include "unireg.h"
diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h
index f1d0d250c47..bf56698c61b 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 30acfebabb2..d7c4cdbc129 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 "sql_priv.h"
 #include "unireg.h"
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h
index 5008a73d96c..8d210e8159c 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 c5dc0c2140c..70d0949c7cb 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 "sql_priv.h"
 #include "my_global.h"                          // REQUIRED for HAVE_* below
diff --git a/sql/spatial.h b/sql/spatial.h
index ee2d6d5ec8d..c3f5f16d39b 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 b916f96300a..ef5fed1fc19 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 3169746419c..b6e83b6f222 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.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 "violite.h"                            /* SSL_type */
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 9897e4b4302..5145e579a26 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
 #include "keycaches.h"                       // get_key_cache
diff --git a/sql/sql_admin.h b/sql/sql_admin.h
index 43d8f70c6f4..7de59176ffc 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 c6c02773286..0bb22a963d0 100644
--- a/sql/sql_alter.cc
+++ b/sql/sql_alter.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 "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 6660748f666..5adbaf91ce6 100644
--- a/sql/sql_alter.h
+++ b/sql/sql_alter.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_ALTER_TABLE_H
 #define SQL_ALTER_TABLE_H
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index 36026a39616..5b3a99afed7 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 34c8e2da3d4..345f2e59a27 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_array.h b/sql/sql_array.h
index 67f1f1c2ad7..e33e8932b42 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 
 
diff --git a/sql/sql_audit.cc b/sql/sql_audit.cc
index 108b74cac5f..c8c8ed9dd9e 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 "sql_priv.h"
 #include "sql_audit.h"
diff --git a/sql/sql_audit.h b/sql/sql_audit.h
index 3f3f97a2730..ce8a6b44367 100644
--- a/sql/sql_audit.h
+++ b/sql/sql_audit.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 
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index c7e356cd09e..4cc7b2fe3b9 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 4d9ccc460e9..8a2317d2386 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_binlog.cc b/sql/sql_binlog.cc
index 420bd0eb2f0..c09d0e56213 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 "sql_priv.h"
 #include "sql_binlog.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 d286d8e1ef0..d4892e79fe4 100644
--- a/sql/sql_bitmap.h
+++ b/sql/sql_bitmap.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 */
 
 /*
   Implementation of a bitmap type.
diff --git a/sql/sql_builtin.cc.in b/sql/sql_builtin.cc.in
index 63850650ac9..4b413a008ae 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 
 #include 
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 6effc376a2f..5ba32e0bbd7 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, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, 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 f35ac889b23..82727ae2e36 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 ff06b7fb3dc..96d56bfda17 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 bff7492ffec..4a390545593 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
diff --git a/sql/sql_client.cc b/sql/sql_client.cc
index eb6c039c065..b1e8692dbc3 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_connect.cc b/sql/sql_connect.cc
index e2e56c48b3b..3270474883a 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 bab171606ba..2b00c2d6e40 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 e8385b537a8..96b64481936 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 bcc8ad0b10f..7e611ee46d0 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 3a12d603601..9630a186f02 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 f7ffd86fe83..34d99be5b4d 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 580590b38a3..c09ad51a824 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 1f447c11a52..70c1203605b 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 ab573df7992..27dd4260ea2 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.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 */
 
 /*
   Delete of records tables.
diff --git a/sql/sql_delete.h b/sql/sql_delete.h
index 6147e0ea367..75963ac8233 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 1709669d8a2..e9004e00965 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.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_derived.h b/sql/sql_derived.h
index 29b898fc65a..ac575c7e995 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_do.cc b/sql/sql_do.cc
index 46bdb421b3a..dd83293bcae 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 e12723402a8..c111ab9086d 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 903ad65521d..e99a2bdc005 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.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 SQL_ERROR_H
 #define SQL_ERROR_H
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index 778507ebc38..01a75316671 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 844810af0f4..57d745a59db 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 "sql_priv.h"
 #include "unireg.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 f3a1467737f..64375756e6f 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 cc040508842..8f5ef0b531c 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 8564f4d103e..a1831ecd472 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_lex.cc b/sql/sql_lex.cc
index 7d694f90aa2..3e20cdb48da 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 c20994d1ff9..615b583897b 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_list.cc b/sql/sql_list.cc
index 2c1b3c47d55..575ad9f13ef 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 8956a786715..21bcb3ef3cf 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 850360c1dba..f61687b3f43 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 3123474a59b..7e49d7cb4fe 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 8559bb55cd9..295add6ec06 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 778c732d443..48f81f5e573 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 13f5f985d01..4ed2bcaed38 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 c5ea38706c4..7aa5e31e081 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 b25a3c2bcf3..dc6b4dc36c2 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 ea3802b49fe..e8fbc519c51 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 __GNUC__
 #pragma interface				/* gcc class implementation */
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc
index a104676a3ff..436bf9ea2b1 100644
--- a/sql/sql_partition_admin.cc
+++ b/sql/sql_partition_admin.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 "sql_parse.h"                      // check_one_table_access
 #include "sql_table.h"                      // mysql_alter_table, etc.
diff --git a/sql/sql_partition_admin.h b/sql/sql_partition_admin.h
index 479371c3b4d..e7c9513eab3 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 e703b4c0f62..1a91e7804ff 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 
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index b378cdc0fa1..46df991639e 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_priv.h"                         // SHOW_MY_BOOL
 #include "unireg.h"
diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h
index fcc73c83adb..9f0d383fd01 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.h b/sql/sql_plugin_services.h
index ede8d9a675e..b419f6a73c1 100644
--- a/sql/sql_plugin_services.h
+++ b/sql/sql_plugin_services.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 */
 
 /* support for Services */
 #include 
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 16923ee5a21..dc5c526aadc 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 e0891bbd188..364661676f8 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 3195c5bb4a4..0e609e41b6b 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 feb7810fa28..0fdb069ffc7 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 f8970bb162a..27d6e076817 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 8cc9dbd45fb..aa502da08a1 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 "sql_reload.h"
 #include "sql_priv.h"
diff --git a/sql/sql_reload.h b/sql/sql_reload.h
index ebb3d78c003..96dfd4c9e82 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 ee7c0fd2f73..1b1d138546c 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 039a3b8b4a1..297af137d98 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 cb4904bb5a6..91acdc27bfb 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 "sql_priv.h"
 #include "unireg.h"
diff --git a/sql/sql_repl.h b/sql/sql_repl.h
index c5a0b31388e..9d415321c54 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 35937f0536f..4886e35c82e 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 e208377e275..54138712da4 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 dad7ab152ed..1a33a91ce24 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 a6186a85ae2..7aedc1cb241 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 a69f7a8b970..0cf992ce25b 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 0a0d4a4d4dd..6d1a952fd1c 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 e671ad9526f..198fe42d74c 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 "sql_priv.h"
 #include "sp_head.h"
diff --git a/sql/sql_signal.h b/sql/sql_signal.h
index 058457a3639..7bd465a3c79 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 f1a3a2f9d8b..1a72b62c675 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_global.h"                          /* uchar */
 #include "my_base.h"                            /* ha_rows */
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_string.cc b/sql/sql_string.cc
index 885f53ae36a..8b00c67c16d 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.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 file is originally from the mysql distribution. Coded by monty */
 
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 3175a6616bf..608e062beb0 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 d3448c167c4..99f2ce580c0 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 838d763cbc8..a1883539efc 100644
--- a/sql/sql_table.h
+++ b/sql/sql_table.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_INCLUDED
 #define SQL_TABLE_INCLUDED
diff --git a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc
index 3f6daf7a9ec..8725bcf2632 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 dc6bc8187ff..3b382bfa50f 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 3c1ee188eeb..f6d89cf554e 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 33bb9a460b0..5f3e9258d48 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 9becdcd4200..5bc2defa563 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 344ebdf8407..dc0c151114e 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 47b1d19ae54..2d7f9311d8d 100644
--- a/sql/sql_trigger.h
+++ b/sql/sql_trigger.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 */
 
 /* Forward declarations */
 
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc
index b225d5f04df..0033772086c 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 0280ecc4932..d09191222ee 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_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 d18498de784..1f3b9618681 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 68c01964687..001281b2eb1 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 e855b64e600..919ed2256a9 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 c6da864c0a1..38444911523 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 8f37c14c2d3..b081e3c8dbb 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 1026c57aaaf..2bfb7982cbe 100644
--- a/sql/sql_view.h
+++ b/sql/sql_view.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 "sql_class.h"     /* Required by sql_lex.h */
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 0da8c87ff93..93ac55592bf 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 06bd92e0bc7..e1e7a1609f6 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 57c5427fcd0..0472914092f 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 9840cec6a35..817eceacebc 100644
--- a/sql/structs.h
+++ b/sql/structs.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 */
 
 
 
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index ffe861ddfbc..c6392e00b64 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 */
 
 /*
   How to add new variables:
diff --git a/sql/sys_vars.h b/sql/sys_vars.h
index dbe27ab107e..c784033c2e4 100644
--- a/sql/sys_vars.h
+++ b/sql/sys_vars.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/sys_vars_shared.h b/sql/sys_vars_shared.h
index ff050f63064..bff59f62c7f 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 c8253649a1f..c50476cce84 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 4725eb96432..c81ee68b0a6 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/thr_malloc.cc b/sql/thr_malloc.cc
index cedcbefc26f..64d1d835262 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 81b7d3cc238..ceb4f255cd9 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/transaction.cc b/sql/transaction.cc
index 6b09bd18d4c..20b2738a1b6 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 54b25f1de2a..73a75c74657 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 079611504cc..5e2699b3309 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 a48801d1c4a..7dd3259d353 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 89ab4682829..3d9456f3b65 100644
--- a/sql/uniques.cc
+++ b/sql/uniques.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 */
 
 /*
   Function to handle quick removal of duplicates
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 936203a78ab..39e0bdcdede 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 a35c25f92ee..5856907952d 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 "my_global.h"                          /* ulonglong */
diff --git a/storage/archive/CMakeLists.txt b/storage/archive/CMakeLists.txt
index 78fb95c0d26..5b6818fc921 100644
--- a/storage/archive/CMakeLists.txt
+++ b/storage/archive/CMakeLists.txt
@@ -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
 
 SET(ARCHIVE_SOURCES  azio.c ha_archive.cc ha_archive.h)
 MYSQL_ADD_PLUGIN(archive ${ARCHIVE_SOURCES} STORAGE_ENGINE LINK_LIBRARIES ${ZLIB_LIBRARY})
diff --git a/storage/archive/archive_reader.c b/storage/archive/archive_reader.c
index 1b15fa16ce4..fb3ccc88852 100644
--- a/storage/archive/archive_reader.c
+++ b/storage/archive/archive_reader.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include "azlib.h"
 #include 
diff --git a/storage/archive/archive_test.c b/storage/archive/archive_test.c
index d01c1e0b22e..e78a61e11ff 100644
--- a/storage/archive/archive_test.c
+++ b/storage/archive/archive_test.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 */
 
 #include "azlib.h"
 #include 
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc
index 3b8e58134b0..41c6ba91791 100644
--- a/storage/archive/ha_archive.cc
+++ b/storage/archive/ha_archive.cc
@@ -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_IMPLEMENTATION
diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h
index 165c7443070..b51378de9ad 100644
--- a/storage/archive/ha_archive.h
+++ b/storage/archive/ha_archive.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 */
 
 #ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
diff --git a/storage/blackhole/CMakeLists.txt b/storage/blackhole/CMakeLists.txt
index bc14fdde0c1..c58ca1250de 100644
--- a/storage/blackhole/CMakeLists.txt
+++ b/storage/blackhole/CMakeLists.txt
@@ -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
 
 SET(BLACKHOLE_SOURCES  ha_blackhole.cc ha_blackhole.h)
 MYSQL_ADD_PLUGIN(blackhole ${BLACKHOLE_SOURCES} STORAGE_ENGINE)
diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc
index 812623314bf..f74d5da3ff0 100644
--- a/storage/blackhole/ha_blackhole.cc
+++ b/storage/blackhole/ha_blackhole.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/storage/blackhole/ha_blackhole.h b/storage/blackhole/ha_blackhole.h
index a7efd261ddb..9032db17f37 100644
--- a/storage/blackhole/ha_blackhole.h
+++ b/storage/blackhole/ha_blackhole.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 */
 
 #ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
diff --git a/storage/csv/CMakeLists.txt b/storage/csv/CMakeLists.txt
index 31e41b6d3f8..3131ebd4a08 100644
--- a/storage/csv/CMakeLists.txt
+++ b/storage/csv/CMakeLists.txt
@@ -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
 
 SET(CSV_SOURCES  ha_tina.cc ha_tina.h transparent_file.cc transparent_file.h)
 MYSQL_ADD_PLUGIN(csv ${CSV_SOURCES} STORAGE_ENGINE MANDATORY)
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index fe39d0e2fa6..765c7f742a9 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.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 */
 
 /*
   Make sure to look at ha_tina.h for more details.
diff --git a/storage/csv/ha_tina.h b/storage/csv/ha_tina.h
index 88af2c9652c..4ea52e3a737 100644
--- a/storage/csv/ha_tina.h
+++ b/storage/csv/ha_tina.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 */
 
 #include 
 #include 
diff --git a/storage/csv/transparent_file.cc b/storage/csv/transparent_file.cc
index a307f9885c0..1be5d3001ed 100644
--- a/storage/csv/transparent_file.cc
+++ b/storage/csv/transparent_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 */
 
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation
diff --git a/storage/csv/transparent_file.h b/storage/csv/transparent_file.h
index 2536ad16a0f..024fc0e3a38 100644
--- a/storage/csv/transparent_file.h
+++ b/storage/csv/transparent_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 */
 
 #include 
 #include 
diff --git a/storage/example/CMakeLists.txt b/storage/example/CMakeLists.txt
index f0ff3e15b4d..5b59d1b1118 100644
--- a/storage/example/CMakeLists.txt
+++ b/storage/example/CMakeLists.txt
@@ -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
 
 SET(EXAMPLE_SOURCES ha_example.cc)
 MYSQL_ADD_PLUGIN(example ${EXAMPLE_SOURCES} STORAGE_ENGINE MODULE_ONLY COMPONENT Test)
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index e865eaae017..25aea112c01 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.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 ha_example.cc
diff --git a/storage/example/ha_example.h b/storage/example/ha_example.h
index ca8ca5ff293..33150bdb418 100644
--- a/storage/example/ha_example.h
+++ b/storage/example/ha_example.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 ha_example.h
 
diff --git a/storage/federated/CMakeLists.txt b/storage/federated/CMakeLists.txt
index 9bd5b6b45d7..fcb1da4aad6 100644
--- a/storage/federated/CMakeLists.txt
+++ b/storage/federated/CMakeLists.txt
@@ -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
 
 SET(FEDERATED_SOURCES  ha_federated.cc)
 IF(NOT WITH_FEDERATED AND NOT WITH_FEDERATED_STORAGE_ENGINE)
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index c621653f9f0..68332f8ba1b 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.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/storage/federated/ha_federated.h b/storage/federated/ha_federated.h
index 52ea8a9a9f4..50db7929cc0 100644
--- a/storage/federated/ha_federated.h
+++ b/storage/federated/ha_federated.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 */
 
 /*
   Please read ha_exmple.cc before reading this file.
diff --git a/storage/heap/CMakeLists.txt b/storage/heap/CMakeLists.txt
index 3a0c2e7271c..f3d10e1f186 100644
--- a/storage/heap/CMakeLists.txt
+++ b/storage/heap/CMakeLists.txt
@@ -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
 
 SET(HEAP_SOURCES  _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create.c
 				ha_heap.cc
diff --git a/storage/heap/_check.c b/storage/heap/_check.c
index f2fd8ab94be..33aa532bd6b 100644
--- a/storage/heap/_check.c
+++ b/storage/heap/_check.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 */
 
 /* Check that heap-structure is ok */
 
diff --git a/storage/heap/_rectest.c b/storage/heap/_rectest.c
index f2cadad4274..f611ad55ad3 100644
--- a/storage/heap/_rectest.c
+++ b/storage/heap/_rectest.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 */
 
 /* Test if a record has changed since last read */
 /* In heap this is only used when debugging */
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc
index ec76d08bf97..a1b8db34453 100644
--- a/storage/heap/ha_heap.cc
+++ b/storage/heap/ha_heap.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 */
 
 
 #ifdef USE_PRAGMA_IMPLEMENTATION
diff --git a/storage/heap/ha_heap.h b/storage/heap/ha_heap.h
index 9216e2e45b4..573fdd31eaa 100644
--- a/storage/heap/ha_heap.h
+++ b/storage/heap/ha_heap.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
diff --git a/storage/heap/heapdef.h b/storage/heap/heapdef.h
index db00ea87a01..fcee810a5f8 100644
--- a/storage/heap/heapdef.h
+++ b/storage/heap/heapdef.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 */
 
 /* This file is included in all heap-files */
 
diff --git a/storage/heap/hp_block.c b/storage/heap/hp_block.c
index 3d92707a98a..a765ab785e6 100644
--- a/storage/heap/hp_block.c
+++ b/storage/heap/hp_block.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* functions on blocks; Keys and records are saved in blocks */
 
diff --git a/storage/heap/hp_clear.c b/storage/heap/hp_clear.c
index 2b1502e6475..cb59048c846 100644
--- a/storage/heap/hp_clear.c
+++ b/storage/heap/hp_clear.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 */
 
 /*
   remove all records from database
diff --git a/storage/heap/hp_close.c b/storage/heap/hp_close.c
index 52663fdaa00..092048a7c1c 100644
--- a/storage/heap/hp_close.c
+++ b/storage/heap/hp_close.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* close a heap-database */
 
diff --git a/storage/heap/hp_create.c b/storage/heap/hp_create.c
index 9bd0132664b..64ec2e81083 100644
--- a/storage/heap/hp_create.c
+++ b/storage/heap/hp_create.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 */
 
 #include "heapdef.h"
 
diff --git a/storage/heap/hp_delete.c b/storage/heap/hp_delete.c
index eb9749601aa..63dffaee349 100644
--- a/storage/heap/hp_delete.c
+++ b/storage/heap/hp_delete.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  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 /* remove current record in heap-database */
 
diff --git a/storage/heap/hp_extra.c b/storage/heap/hp_extra.c
index 9a19f818d3b..3c554fe98e7 100644
--- a/storage/heap/hp_extra.c
+++ b/storage/heap/hp_extra.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 */
 
 /* Extra functions we want to do with a database */
 /* - Set flags for quicker databasehandler */
diff --git a/storage/heap/hp_hash.c b/storage/heap/hp_hash.c
index ce59b79f990..e8e89ac2067 100644
--- a/storage/heap/hp_hash.c
+++ b/storage/heap/hp_hash.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 */
 
 /* The hash functions used for saveing keys */
 
diff --git a/storage/heap/hp_info.c b/storage/heap/hp_info.c
index c30cc010b60..45e64b3557d 100644
--- a/storage/heap/hp_info.c
+++ b/storage/heap/hp_info.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  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 /* Returns info about database status */
 
diff --git a/storage/heap/hp_open.c b/storage/heap/hp_open.c
index 854a8b05698..21d60c5fb5c 100644
--- a/storage/heap/hp_open.c
+++ b/storage/heap/hp_open.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* open a heap-database */
 
diff --git a/storage/heap/hp_panic.c b/storage/heap/hp_panic.c
index e1e421a5115..6872f04adc8 100644
--- a/storage/heap/hp_panic.c
+++ b/storage/heap/hp_panic.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 */
 
 #include "heapdef.h"
 
diff --git a/storage/heap/hp_rename.c b/storage/heap/hp_rename.c
index 34c8218e387..34e82bbc531 100644
--- a/storage/heap/hp_rename.c
+++ b/storage/heap/hp_rename.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /*
   Rename a table
diff --git a/storage/heap/hp_rfirst.c b/storage/heap/hp_rfirst.c
index 685ecdb5456..60596a2c650 100644
--- a/storage/heap/hp_rfirst.c
+++ b/storage/heap/hp_rfirst.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 */
 
 #include "heapdef.h"
 
diff --git a/storage/heap/hp_rkey.c b/storage/heap/hp_rkey.c
index 138d65f9d25..76eb63876a3 100644
--- a/storage/heap/hp_rkey.c
+++ b/storage/heap/hp_rkey.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 */
 
 #include "heapdef.h"
 
diff --git a/storage/heap/hp_rlast.c b/storage/heap/hp_rlast.c
index ff0d57228da..ed9c3499d5e 100644
--- a/storage/heap/hp_rlast.c
+++ b/storage/heap/hp_rlast.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 */
 
 #include "heapdef.h"
 
diff --git a/storage/heap/hp_rnext.c b/storage/heap/hp_rnext.c
index 8fd469a317e..f227ce4d274 100644
--- a/storage/heap/hp_rnext.c
+++ b/storage/heap/hp_rnext.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 */
 
 #include "heapdef.h"
 
diff --git a/storage/heap/hp_rprev.c b/storage/heap/hp_rprev.c
index 6e06607187b..1d9420ba8b6 100644
--- a/storage/heap/hp_rprev.c
+++ b/storage/heap/hp_rprev.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 */
 
 #include "heapdef.h"
 
diff --git a/storage/heap/hp_rrnd.c b/storage/heap/hp_rrnd.c
index d105c5c2e13..9a97bb5fabb 100644
--- a/storage/heap/hp_rrnd.c
+++ b/storage/heap/hp_rrnd.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 */
 
 /* Read a record from a random position */
 
diff --git a/storage/heap/hp_rsame.c b/storage/heap/hp_rsame.c
index 19767fd752b..8bba4cd23a9 100644
--- a/storage/heap/hp_rsame.c
+++ b/storage/heap/hp_rsame.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 */
 
 /* re-read current record */
 
diff --git a/storage/heap/hp_scan.c b/storage/heap/hp_scan.c
index 65726c37e1f..3315cb05b3f 100644
--- a/storage/heap/hp_scan.c
+++ b/storage/heap/hp_scan.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 */
 
 /* Scan through all rows */
 
diff --git a/storage/heap/hp_static.c b/storage/heap/hp_static.c
index c50465cd402..51e5e1c0925 100644
--- a/storage/heap/hp_static.c
+++ b/storage/heap/hp_static.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /*
   Static variables for heap library. All definied here for easy making of
diff --git a/storage/heap/hp_test1.c b/storage/heap/hp_test1.c
index e6283f171c4..f948c88c1fa 100644
--- a/storage/heap/hp_test1.c
+++ b/storage/heap/hp_test1.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Test av heap-database */
 /* Programmet skapar en heap-databas. Till denna skrivs ett antal poster.
diff --git a/storage/heap/hp_test2.c b/storage/heap/hp_test2.c
index 058a2904697..5cd5b5db991 100644
--- a/storage/heap/hp_test2.c
+++ b/storage/heap/hp_test2.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 */
 
 /* Test av isam-databas: stor test */
 
diff --git a/storage/heap/hp_update.c b/storage/heap/hp_update.c
index 8757f8e87c5..dfcb8b1f126 100644
--- a/storage/heap/hp_update.c
+++ b/storage/heap/hp_update.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 */
 
 /* Update current record in heap-database */
 
diff --git a/storage/heap/hp_write.c b/storage/heap/hp_write.c
index 4a9c1ba59c0..0a6a0f8145c 100644
--- a/storage/heap/hp_write.c
+++ b/storage/heap/hp_write.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 */
 
 /* Write a record to heap-databas */
 
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index cc494a7cd7a..6aacd9d11bd 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -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 is the CMakeLists for InnoDB
 
diff --git a/storage/innobase/btr/btr0pcur.c b/storage/innobase/btr/btr0pcur.c
index 53df4768938..281f533903b 100644
--- a/storage/innobase/btr/btr0pcur.c
+++ b/storage/innobase/btr/btr0pcur.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c
index 7b6ff16704c..746b50b1547 100644
--- a/storage/innobase/btr/btr0sea.c
+++ b/storage/innobase/btr/btr0sea.c
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/buf/buf0buddy.c b/storage/innobase/buf/buf0buddy.c
index 6382cf534e1..8e970ed52cb 100644
--- a/storage/innobase/buf/buf0buddy.c
+++ b/storage/innobase/buf/buf0buddy.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
index 80a15ffe0d5..4c085e75d09 100644
--- a/storage/innobase/buf/buf0buf.c
+++ b/storage/innobase/buf/buf0buf.c
@@ -20,7 +20,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
index d15f2e4601e..0f3df649fcb 100644
--- a/storage/innobase/buf/buf0flu.c
+++ b/storage/innobase/buf/buf0flu.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
index c3911c255ad..9e18f015f12 100644
--- a/storage/innobase/buf/buf0lru.c
+++ b/storage/innobase/buf/buf0lru.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
index 8c457dec35d..deefcdde5b2 100644
--- a/storage/innobase/buf/buf0rea.c
+++ b/storage/innobase/buf/buf0rea.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/compile-innodb b/storage/innobase/compile-innodb
index 6b0b2df66da..54d44a12dca 100644
--- a/storage/innobase/compile-innodb
+++ b/storage/innobase/compile-innodb
@@ -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
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 #
 
 # we assume this script is in storage/innobase/
diff --git a/storage/innobase/data/data0data.c b/storage/innobase/data/data0data.c
index 51054679762..daf10404073 100644
--- a/storage/innobase/data/data0data.c
+++ b/storage/innobase/data/data0data.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/data/data0type.c b/storage/innobase/data/data0type.c
index c278cc8821e..bc5288cb1a8 100644
--- a/storage/innobase/data/data0type.c
+++ b/storage/innobase/data/data0type.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/dict/dict0boot.c b/storage/innobase/dict/dict0boot.c
index 428047e13e6..42a90bd26df 100644
--- a/storage/innobase/dict/dict0boot.c
+++ b/storage/innobase/dict/dict0boot.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/dict/dict0crea.c b/storage/innobase/dict/dict0crea.c
index 4e173fb905d..06fcf44f47b 100644
--- a/storage/innobase/dict/dict0crea.c
+++ b/storage/innobase/dict/dict0crea.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c
index 4ee5f4809c4..65ceeb98954 100644
--- a/storage/innobase/dict/dict0load.c
+++ b/storage/innobase/dict/dict0load.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/dict/dict0mem.c b/storage/innobase/dict/dict0mem.c
index e3056df53a5..e865a3cf851 100644
--- a/storage/innobase/dict/dict0mem.c
+++ b/storage/innobase/dict/dict0mem.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/eval/eval0eval.c b/storage/innobase/eval/eval0eval.c
index fc34ce83a0f..12a17be7112 100644
--- a/storage/innobase/eval/eval0eval.c
+++ b/storage/innobase/eval/eval0eval.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/eval/eval0proc.c b/storage/innobase/eval/eval0proc.c
index ba93fdd3977..0a5c2ccfa5b 100644
--- a/storage/innobase/eval/eval0proc.c
+++ b/storage/innobase/eval/eval0proc.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
index 32bf0b8ccd8..452aa472842 100644
--- a/storage/innobase/fil/fil0fil.c
+++ b/storage/innobase/fil/fil0fil.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/fut/fut0fut.c b/storage/innobase/fut/fut0fut.c
index 35dc66b8914..9e16f760cac 100644
--- a/storage/innobase/fut/fut0fut.c
+++ b/storage/innobase/fut/fut0fut.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/fut/fut0lst.c b/storage/innobase/fut/fut0lst.c
index a008b7453a1..f86c7d3b61e 100644
--- a/storage/innobase/fut/fut0lst.c
+++ b/storage/innobase/fut/fut0lst.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/ha/ha0ha.c b/storage/innobase/ha/ha0ha.c
index 22a237d189f..1623563c5b6 100644
--- a/storage/innobase/ha/ha0ha.c
+++ b/storage/innobase/ha/ha0ha.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/ha/ha0storage.c b/storage/innobase/ha/ha0storage.c
index 95973753906..804370ca7cc 100644
--- a/storage/innobase/ha/ha0storage.c
+++ b/storage/innobase/ha/ha0storage.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/ha/hash0hash.c b/storage/innobase/ha/hash0hash.c
index e594b3f6bd2..31feea77dd2 100644
--- a/storage/innobase/ha/hash0hash.c
+++ b/storage/innobase/ha/hash0hash.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h
index f80330d6128..0468e0a90bc 100644
--- a/storage/innobase/handler/ha_innodb.h
+++ b/storage/innobase/handler/ha_innodb.h
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
index afe9c568f18..06f126e4386 100644
--- a/storage/innobase/handler/i_s.cc
+++ b/storage/innobase/handler/i_s.cc
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h
index ed05cdf03ee..1e635d91a5b 100644
--- a/storage/innobase/handler/i_s.h
+++ b/storage/innobase/handler/i_s.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic
index 0f895554373..f5748c66f44 100644
--- a/storage/innobase/include/btr0btr.ic
+++ b/storage/innobase/include/btr0btr.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/btr0pcur.h b/storage/innobase/include/btr0pcur.h
index d9ce02283d7..d79cd466a0e 100644
--- a/storage/innobase/include/btr0pcur.h
+++ b/storage/innobase/include/btr0pcur.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/btr0pcur.ic b/storage/innobase/include/btr0pcur.ic
index 647e8d0cde9..ab132e1415c 100644
--- a/storage/innobase/include/btr0pcur.ic
+++ b/storage/innobase/include/btr0pcur.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h
index 081dc88435e..2898be92042 100644
--- a/storage/innobase/include/btr0sea.h
+++ b/storage/innobase/include/btr0sea.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/btr0sea.ic b/storage/innobase/include/btr0sea.ic
index 1aa55b49a5a..f3261cf5e0e 100644
--- a/storage/innobase/include/btr0sea.ic
+++ b/storage/innobase/include/btr0sea.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/btr0types.h b/storage/innobase/include/btr0types.h
index 4d27c72cf80..858602cd772 100644
--- a/storage/innobase/include/btr0types.h
+++ b/storage/innobase/include/btr0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/buf0buddy.h b/storage/innobase/include/buf0buddy.h
index 9a370f512bc..649a2240330 100644
--- a/storage/innobase/include/buf0buddy.h
+++ b/storage/innobase/include/buf0buddy.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/buf0buddy.ic b/storage/innobase/include/buf0buddy.ic
index 4cebf1b9dca..b7023d8172f 100644
--- a/storage/innobase/include/buf0buddy.ic
+++ b/storage/innobase/include/buf0buddy.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/buf0flu.h b/storage/innobase/include/buf0flu.h
index 2900abe35d9..b5cfcb125e6 100644
--- a/storage/innobase/include/buf0flu.h
+++ b/storage/innobase/include/buf0flu.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/buf0flu.ic b/storage/innobase/include/buf0flu.ic
index feb22685ba3..1492894154e 100644
--- a/storage/innobase/include/buf0flu.ic
+++ b/storage/innobase/include/buf0flu.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h
index 2d9cc3af2e7..49d3461c7f7 100644
--- a/storage/innobase/include/buf0lru.h
+++ b/storage/innobase/include/buf0lru.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/buf0lru.ic b/storage/innobase/include/buf0lru.ic
index d1a89b9fbee..fdec086d4f0 100644
--- a/storage/innobase/include/buf0lru.ic
+++ b/storage/innobase/include/buf0lru.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/buf0rea.h b/storage/innobase/include/buf0rea.h
index e1c7e25b6f3..38f62bbe396 100644
--- a/storage/innobase/include/buf0rea.h
+++ b/storage/innobase/include/buf0rea.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h
index c2716a535d2..134b5579290 100644
--- a/storage/innobase/include/buf0types.h
+++ b/storage/innobase/include/buf0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/data0data.h b/storage/innobase/include/data0data.h
index c6e864dafc9..61e65d98c1b 100644
--- a/storage/innobase/include/data0data.h
+++ b/storage/innobase/include/data0data.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/data0data.ic b/storage/innobase/include/data0data.ic
index 2059eefaf89..961e28fb3fe 100644
--- a/storage/innobase/include/data0data.ic
+++ b/storage/innobase/include/data0data.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/data0type.h b/storage/innobase/include/data0type.h
index 852e18153c2..6b6da11732c 100644
--- a/storage/innobase/include/data0type.h
+++ b/storage/innobase/include/data0type.h
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/data0type.ic b/storage/innobase/include/data0type.ic
index 2b4ae7bcf54..2bf21513c1c 100644
--- a/storage/innobase/include/data0type.ic
+++ b/storage/innobase/include/data0type.ic
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/data0types.h b/storage/innobase/include/data0types.h
index 245aca599c0..3f733d14d0c 100644
--- a/storage/innobase/include/data0types.h
+++ b/storage/innobase/include/data0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/dict0boot.h b/storage/innobase/include/dict0boot.h
index dbb35a0eb8e..5bf4ad39775 100644
--- a/storage/innobase/include/dict0boot.h
+++ b/storage/innobase/include/dict0boot.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/dict0boot.ic b/storage/innobase/include/dict0boot.ic
index 5fa33837640..068cca739b4 100644
--- a/storage/innobase/include/dict0boot.ic
+++ b/storage/innobase/include/dict0boot.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/dict0crea.h b/storage/innobase/include/dict0crea.h
index a58bcb181aa..8aadd85b48a 100644
--- a/storage/innobase/include/dict0crea.h
+++ b/storage/innobase/include/dict0crea.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/dict0crea.ic b/storage/innobase/include/dict0crea.ic
index 36f77e5c7d1..a22ff7d7093 100644
--- a/storage/innobase/include/dict0crea.ic
+++ b/storage/innobase/include/dict0crea.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/dict0load.h b/storage/innobase/include/dict0load.h
index 772f36de850..0bbca755a0e 100644
--- a/storage/innobase/include/dict0load.h
+++ b/storage/innobase/include/dict0load.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/dict0load.ic b/storage/innobase/include/dict0load.ic
index da224db7927..cb53ad32e5c 100644
--- a/storage/innobase/include/dict0load.ic
+++ b/storage/innobase/include/dict0load.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/dict0mem.ic b/storage/innobase/include/dict0mem.ic
index 41dacb1c643..c1788bf2a26 100644
--- a/storage/innobase/include/dict0mem.ic
+++ b/storage/innobase/include/dict0mem.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/dict0types.h b/storage/innobase/include/dict0types.h
index 22407e2408e..6f7a9f3a3c3 100644
--- a/storage/innobase/include/dict0types.h
+++ b/storage/innobase/include/dict0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/eval0eval.h b/storage/innobase/include/eval0eval.h
index c12df320b88..c1fb84c5956 100644
--- a/storage/innobase/include/eval0eval.h
+++ b/storage/innobase/include/eval0eval.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/eval0eval.ic b/storage/innobase/include/eval0eval.ic
index d0ca4c9bea5..f6ad5074452 100644
--- a/storage/innobase/include/eval0eval.ic
+++ b/storage/innobase/include/eval0eval.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/eval0proc.h b/storage/innobase/include/eval0proc.h
index 450fd5a27c3..b2900557cf2 100644
--- a/storage/innobase/include/eval0proc.h
+++ b/storage/innobase/include/eval0proc.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/eval0proc.ic b/storage/innobase/include/eval0proc.ic
index 6949af1557b..e2b94b0bd65 100644
--- a/storage/innobase/include/eval0proc.ic
+++ b/storage/innobase/include/eval0proc.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index 505b619d022..08f77b61af6 100644
--- a/storage/innobase/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/fsp0types.h b/storage/innobase/include/fsp0types.h
index d9e8b946753..f1b5d5354d1 100644
--- a/storage/innobase/include/fsp0types.h
+++ b/storage/innobase/include/fsp0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/fut0fut.h b/storage/innobase/include/fut0fut.h
index 6a68bfffc72..b8098a64a9c 100644
--- a/storage/innobase/include/fut0fut.h
+++ b/storage/innobase/include/fut0fut.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/fut0fut.ic b/storage/innobase/include/fut0fut.ic
index dabb611243c..e639f15ab11 100644
--- a/storage/innobase/include/fut0fut.ic
+++ b/storage/innobase/include/fut0fut.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/fut0lst.h b/storage/innobase/include/fut0lst.h
index c75efd2aab2..5dc246d82d9 100644
--- a/storage/innobase/include/fut0lst.h
+++ b/storage/innobase/include/fut0lst.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/fut0lst.ic b/storage/innobase/include/fut0lst.ic
index 74d00dc488e..cf6e8b9ee81 100644
--- a/storage/innobase/include/fut0lst.ic
+++ b/storage/innobase/include/fut0lst.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ha0ha.h b/storage/innobase/include/ha0ha.h
index 2ca75cd62a9..9ef0d045113 100644
--- a/storage/innobase/include/ha0ha.h
+++ b/storage/innobase/include/ha0ha.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ha0ha.ic b/storage/innobase/include/ha0ha.ic
index dde59f85dca..fdc7c54f23b 100644
--- a/storage/innobase/include/ha0ha.ic
+++ b/storage/innobase/include/ha0ha.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ha0storage.h b/storage/innobase/include/ha0storage.h
index 8109646a8e9..245087591bc 100644
--- a/storage/innobase/include/ha0storage.h
+++ b/storage/innobase/include/ha0storage.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ha0storage.ic b/storage/innobase/include/ha0storage.ic
index 86f2e578090..e50d3f68370 100644
--- a/storage/innobase/include/ha0storage.ic
+++ b/storage/innobase/include/ha0storage.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h
index 83fa1d53f1e..ade09d17681 100644
--- a/storage/innobase/include/ha_prototypes.h
+++ b/storage/innobase/include/ha_prototypes.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/handler0alter.h b/storage/innobase/include/handler0alter.h
index 3107fb32881..31ed836012c 100644
--- a/storage/innobase/include/handler0alter.h
+++ b/storage/innobase/include/handler0alter.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/hash0hash.h b/storage/innobase/include/hash0hash.h
index 05b538ed5f5..c6233d358aa 100644
--- a/storage/innobase/include/hash0hash.h
+++ b/storage/innobase/include/hash0hash.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/hash0hash.ic b/storage/innobase/include/hash0hash.ic
index 2c708cc594b..20b8e4dd5f0 100644
--- a/storage/innobase/include/hash0hash.ic
+++ b/storage/innobase/include/hash0hash.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h
index b34d06ffde3..46472657a73 100644
--- a/storage/innobase/include/ibuf0ibuf.h
+++ b/storage/innobase/include/ibuf0ibuf.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ibuf0ibuf.ic b/storage/innobase/include/ibuf0ibuf.ic
index 043d7c472d8..63cc1e2044c 100644
--- a/storage/innobase/include/ibuf0ibuf.ic
+++ b/storage/innobase/include/ibuf0ibuf.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ibuf0types.h b/storage/innobase/include/ibuf0types.h
index d3e6f9299da..b2d2843a52e 100644
--- a/storage/innobase/include/ibuf0types.h
+++ b/storage/innobase/include/ibuf0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/lock0iter.h b/storage/innobase/include/lock0iter.h
index ce6f28dc514..63363c0b4f4 100644
--- a/storage/innobase/include/lock0iter.h
+++ b/storage/innobase/include/lock0iter.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h
index 01439835aa5..2d1245d5479 100644
--- a/storage/innobase/include/lock0lock.h
+++ b/storage/innobase/include/lock0lock.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/lock0lock.ic b/storage/innobase/include/lock0lock.ic
index 4e6c0c1b78c..45052282a55 100644
--- a/storage/innobase/include/lock0lock.ic
+++ b/storage/innobase/include/lock0lock.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/lock0priv.h b/storage/innobase/include/lock0priv.h
index 491cad95329..599b8aebcdc 100644
--- a/storage/innobase/include/lock0priv.h
+++ b/storage/innobase/include/lock0priv.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/lock0priv.ic b/storage/innobase/include/lock0priv.ic
index 98b2189680c..2117d4d33b3 100644
--- a/storage/innobase/include/lock0priv.ic
+++ b/storage/innobase/include/lock0priv.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/lock0types.h b/storage/innobase/include/lock0types.h
index 2eb71e2939f..89c03d2d497 100644
--- a/storage/innobase/include/lock0types.h
+++ b/storage/innobase/include/lock0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/log0log.ic b/storage/innobase/include/log0log.ic
index 8c8dc096a10..03b14501f03 100644
--- a/storage/innobase/include/log0log.ic
+++ b/storage/innobase/include/log0log.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/log0recv.h b/storage/innobase/include/log0recv.h
index aa5f79aa198..6afe312e719 100644
--- a/storage/innobase/include/log0recv.h
+++ b/storage/innobase/include/log0recv.h
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/log0recv.ic b/storage/innobase/include/log0recv.ic
index 62fd5c18e30..a8f41640d4d 100644
--- a/storage/innobase/include/log0recv.ic
+++ b/storage/innobase/include/log0recv.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/mach0data.h b/storage/innobase/include/mach0data.h
index 81c0866f367..8986f1a1b1f 100644
--- a/storage/innobase/include/mach0data.h
+++ b/storage/innobase/include/mach0data.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/mach0data.ic b/storage/innobase/include/mach0data.ic
index fdcb07ca29b..676d6a50ec7 100644
--- a/storage/innobase/include/mach0data.ic
+++ b/storage/innobase/include/mach0data.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/mem0dbg.h b/storage/innobase/include/mem0dbg.h
index 1c387706c98..8e3b4ec11d9 100644
--- a/storage/innobase/include/mem0dbg.h
+++ b/storage/innobase/include/mem0dbg.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/mem0dbg.ic b/storage/innobase/include/mem0dbg.ic
index 72c63e0a4c4..058383a1ad0 100644
--- a/storage/innobase/include/mem0dbg.ic
+++ b/storage/innobase/include/mem0dbg.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/mem0mem.h b/storage/innobase/include/mem0mem.h
index 7dff3e7a2b8..cd7173948ad 100644
--- a/storage/innobase/include/mem0mem.h
+++ b/storage/innobase/include/mem0mem.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/mem0mem.ic b/storage/innobase/include/mem0mem.ic
index b0b24526031..fb9e565badc 100644
--- a/storage/innobase/include/mem0mem.ic
+++ b/storage/innobase/include/mem0mem.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/mem0pool.h b/storage/innobase/include/mem0pool.h
index 26bac1c814b..4e044d79f65 100644
--- a/storage/innobase/include/mem0pool.h
+++ b/storage/innobase/include/mem0pool.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/mem0pool.ic b/storage/innobase/include/mem0pool.ic
index f0e724648a1..c3e8c4ff402 100644
--- a/storage/innobase/include/mem0pool.ic
+++ b/storage/innobase/include/mem0pool.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/mtr0log.h b/storage/innobase/include/mtr0log.h
index 8cccb982b48..0027c53ced8 100644
--- a/storage/innobase/include/mtr0log.h
+++ b/storage/innobase/include/mtr0log.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic
index 2f60193c799..f5162f0ce2a 100644
--- a/storage/innobase/include/mtr0log.ic
+++ b/storage/innobase/include/mtr0log.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/mtr0types.h b/storage/innobase/include/mtr0types.h
index eb76c824666..5a32e79a8a7 100644
--- a/storage/innobase/include/mtr0types.h
+++ b/storage/innobase/include/mtr0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h
index 9d1b3f18f8a..1806f4e7a17 100644
--- a/storage/innobase/include/os0file.h
+++ b/storage/innobase/include/os0file.h
@@ -21,7 +21,7 @@ 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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
 
 ***********************************************************************/
 
diff --git a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic
index 93c5cec7b83..68614d393d6 100644
--- a/storage/innobase/include/os0file.ic
+++ b/storage/innobase/include/os0file.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/os0proc.h b/storage/innobase/include/os0proc.h
index 7c8d0495149..120c06b4576 100644
--- a/storage/innobase/include/os0proc.h
+++ b/storage/innobase/include/os0proc.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/os0proc.ic b/storage/innobase/include/os0proc.ic
index 6d7eb1be37c..0f2172ce968 100644
--- a/storage/innobase/include/os0proc.ic
+++ b/storage/innobase/include/os0proc.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
index af58a232746..17d7cf36d4b 100644
--- a/storage/innobase/include/os0sync.h
+++ b/storage/innobase/include/os0sync.h
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/os0sync.ic b/storage/innobase/include/os0sync.ic
index 836e51f3399..a59f06b2709 100644
--- a/storage/innobase/include/os0sync.ic
+++ b/storage/innobase/include/os0sync.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/os0thread.h b/storage/innobase/include/os0thread.h
index e8538247d10..8e9a85a427f 100644
--- a/storage/innobase/include/os0thread.h
+++ b/storage/innobase/include/os0thread.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/os0thread.ic b/storage/innobase/include/os0thread.ic
index 5615791c77e..7b5aac8b4f8 100644
--- a/storage/innobase/include/os0thread.ic
+++ b/storage/innobase/include/os0thread.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/page0cur.h b/storage/innobase/include/page0cur.h
index 5081a1de0ab..09a43143fbd 100644
--- a/storage/innobase/include/page0cur.h
+++ b/storage/innobase/include/page0cur.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/page0cur.ic b/storage/innobase/include/page0cur.ic
index 1903fedf9e5..c6739a35adc 100644
--- a/storage/innobase/include/page0cur.ic
+++ b/storage/innobase/include/page0cur.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/page0types.h b/storage/innobase/include/page0types.h
index 68d0726e999..62f52074784 100644
--- a/storage/innobase/include/page0types.h
+++ b/storage/innobase/include/page0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/page0zip.h b/storage/innobase/include/page0zip.h
index 48cd3ddbab9..825d91cead4 100644
--- a/storage/innobase/include/page0zip.h
+++ b/storage/innobase/include/page0zip.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/page0zip.ic b/storage/innobase/include/page0zip.ic
index a2fa13c94df..b9a0130f9cc 100644
--- a/storage/innobase/include/page0zip.ic
+++ b/storage/innobase/include/page0zip.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/pars0grm.h b/storage/innobase/include/pars0grm.h
index abaffb66c1e..2fbdce65239 100644
--- a/storage/innobase/include/pars0grm.h
+++ b/storage/innobase/include/pars0grm.h
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/pars0opt.h b/storage/innobase/include/pars0opt.h
index fd6b9726019..17b6540e2f2 100644
--- a/storage/innobase/include/pars0opt.h
+++ b/storage/innobase/include/pars0opt.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/pars0opt.ic b/storage/innobase/include/pars0opt.ic
index f303fe91d3b..ae89678525d 100644
--- a/storage/innobase/include/pars0opt.ic
+++ b/storage/innobase/include/pars0opt.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/pars0pars.h b/storage/innobase/include/pars0pars.h
index eb79dcb18c1..7b5a9ea398d 100644
--- a/storage/innobase/include/pars0pars.h
+++ b/storage/innobase/include/pars0pars.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/pars0pars.ic b/storage/innobase/include/pars0pars.ic
index 558d1093bfe..f0ad9952def 100644
--- a/storage/innobase/include/pars0pars.ic
+++ b/storage/innobase/include/pars0pars.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/pars0sym.h b/storage/innobase/include/pars0sym.h
index 9241aff3be1..ae9f9f4844b 100644
--- a/storage/innobase/include/pars0sym.h
+++ b/storage/innobase/include/pars0sym.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/pars0sym.ic b/storage/innobase/include/pars0sym.ic
index ecf014908a9..7c3a4da16ae 100644
--- a/storage/innobase/include/pars0sym.ic
+++ b/storage/innobase/include/pars0sym.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/pars0types.h b/storage/innobase/include/pars0types.h
index 4f3b2c06db6..7dd10d99667 100644
--- a/storage/innobase/include/pars0types.h
+++ b/storage/innobase/include/pars0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/que0que.h b/storage/innobase/include/que0que.h
index b0d17d9a96c..4fa7fa68d83 100644
--- a/storage/innobase/include/que0que.h
+++ b/storage/innobase/include/que0que.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/que0que.ic b/storage/innobase/include/que0que.ic
index 2de679e3894..5df9cd197fa 100644
--- a/storage/innobase/include/que0que.ic
+++ b/storage/innobase/include/que0que.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/que0types.h b/storage/innobase/include/que0types.h
index 69fb0557d8b..e210fa5a33d 100644
--- a/storage/innobase/include/que0types.h
+++ b/storage/innobase/include/que0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/read0read.h b/storage/innobase/include/read0read.h
index a4b3a58f671..2d474247cf3 100644
--- a/storage/innobase/include/read0read.h
+++ b/storage/innobase/include/read0read.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/read0read.ic b/storage/innobase/include/read0read.ic
index 42e8462d1be..07692a41b59 100644
--- a/storage/innobase/include/read0read.ic
+++ b/storage/innobase/include/read0read.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/read0types.h b/storage/innobase/include/read0types.h
index 4bb9618448b..7ed740f5bac 100644
--- a/storage/innobase/include/read0types.h
+++ b/storage/innobase/include/read0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/rem0cmp.h b/storage/innobase/include/rem0cmp.h
index c5ef0d5438a..c59c6131c78 100644
--- a/storage/innobase/include/rem0cmp.h
+++ b/storage/innobase/include/rem0cmp.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/rem0cmp.ic b/storage/innobase/include/rem0cmp.ic
index 22db4b0cd47..8e1bf141898 100644
--- a/storage/innobase/include/rem0cmp.ic
+++ b/storage/innobase/include/rem0cmp.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/rem0rec.h b/storage/innobase/include/rem0rec.h
index 9dd96f609ea..92417d9a5e6 100644
--- a/storage/innobase/include/rem0rec.h
+++ b/storage/innobase/include/rem0rec.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/rem0rec.ic b/storage/innobase/include/rem0rec.ic
index 8138552d095..ae33a875c66 100644
--- a/storage/innobase/include/rem0rec.ic
+++ b/storage/innobase/include/rem0rec.ic
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/rem0types.h b/storage/innobase/include/rem0types.h
index 248ce27eee3..d0449ace29f 100644
--- a/storage/innobase/include/rem0types.h
+++ b/storage/innobase/include/rem0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0ext.h b/storage/innobase/include/row0ext.h
index 71c7b6ecce4..1da685de9ed 100644
--- a/storage/innobase/include/row0ext.h
+++ b/storage/innobase/include/row0ext.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0ext.ic b/storage/innobase/include/row0ext.ic
index 56e71d9a968..4432f20a799 100644
--- a/storage/innobase/include/row0ext.ic
+++ b/storage/innobase/include/row0ext.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0ins.h b/storage/innobase/include/row0ins.h
index 1da3ef48a81..b52fe1ad3d4 100644
--- a/storage/innobase/include/row0ins.h
+++ b/storage/innobase/include/row0ins.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0ins.ic b/storage/innobase/include/row0ins.ic
index 6e96e9fd675..8331d76b718 100644
--- a/storage/innobase/include/row0ins.ic
+++ b/storage/innobase/include/row0ins.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0merge.h b/storage/innobase/include/row0merge.h
index 22786fd7e49..87b07c3f8e0 100644
--- a/storage/innobase/include/row0merge.h
+++ b/storage/innobase/include/row0merge.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h
index 0f66644d906..e5859ee9f8c 100644
--- a/storage/innobase/include/row0mysql.h
+++ b/storage/innobase/include/row0mysql.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0mysql.ic b/storage/innobase/include/row0mysql.ic
index 878523528b2..3a44b86732c 100644
--- a/storage/innobase/include/row0mysql.ic
+++ b/storage/innobase/include/row0mysql.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0purge.h b/storage/innobase/include/row0purge.h
index 9a638c80493..256857003ad 100644
--- a/storage/innobase/include/row0purge.h
+++ b/storage/innobase/include/row0purge.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0purge.ic b/storage/innobase/include/row0purge.ic
index 6465c2ca971..628e6047e8c 100644
--- a/storage/innobase/include/row0purge.ic
+++ b/storage/innobase/include/row0purge.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0row.h b/storage/innobase/include/row0row.h
index bf135217bd0..419cf07106a 100644
--- a/storage/innobase/include/row0row.h
+++ b/storage/innobase/include/row0row.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0row.ic b/storage/innobase/include/row0row.ic
index 831c2339d96..d3c3b52a60b 100644
--- a/storage/innobase/include/row0row.ic
+++ b/storage/innobase/include/row0row.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0sel.h b/storage/innobase/include/row0sel.h
index 830615effc2..702cec5c928 100644
--- a/storage/innobase/include/row0sel.h
+++ b/storage/innobase/include/row0sel.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0sel.ic b/storage/innobase/include/row0sel.ic
index 03c30e80dfe..178ede5e67d 100644
--- a/storage/innobase/include/row0sel.ic
+++ b/storage/innobase/include/row0sel.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0types.h b/storage/innobase/include/row0types.h
index b40094d05d6..7593932eb94 100644
--- a/storage/innobase/include/row0types.h
+++ b/storage/innobase/include/row0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0uins.h b/storage/innobase/include/row0uins.h
index 6809c6d9317..fb3ee410dd8 100644
--- a/storage/innobase/include/row0uins.h
+++ b/storage/innobase/include/row0uins.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0uins.ic b/storage/innobase/include/row0uins.ic
index fb8a335191d..91bf4b6ce27 100644
--- a/storage/innobase/include/row0uins.ic
+++ b/storage/innobase/include/row0uins.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0umod.h b/storage/innobase/include/row0umod.h
index aca35ce2170..0c63e907849 100644
--- a/storage/innobase/include/row0umod.h
+++ b/storage/innobase/include/row0umod.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0umod.ic b/storage/innobase/include/row0umod.ic
index dd9e217fa20..60c72da5c56 100644
--- a/storage/innobase/include/row0umod.ic
+++ b/storage/innobase/include/row0umod.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0undo.h b/storage/innobase/include/row0undo.h
index d783c94a110..7bc13afb623 100644
--- a/storage/innobase/include/row0undo.h
+++ b/storage/innobase/include/row0undo.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0undo.ic b/storage/innobase/include/row0undo.ic
index 21723c88ecb..55aeee1b497 100644
--- a/storage/innobase/include/row0undo.ic
+++ b/storage/innobase/include/row0undo.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0upd.h b/storage/innobase/include/row0upd.h
index 16c069d5ae8..babd615154a 100644
--- a/storage/innobase/include/row0upd.h
+++ b/storage/innobase/include/row0upd.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0upd.ic b/storage/innobase/include/row0upd.ic
index 9b699455665..89c2835626a 100644
--- a/storage/innobase/include/row0upd.ic
+++ b/storage/innobase/include/row0upd.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0vers.h b/storage/innobase/include/row0vers.h
index 48d5fc43fd1..ae9f7378f6f 100644
--- a/storage/innobase/include/row0vers.h
+++ b/storage/innobase/include/row0vers.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/row0vers.ic b/storage/innobase/include/row0vers.ic
index 2687d1a9e15..c63c56b79ee 100644
--- a/storage/innobase/include/row0vers.ic
+++ b/storage/innobase/include/row0vers.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
index 2b1a640ae8b..e3ae1003d76 100644
--- a/storage/innobase/include/srv0srv.h
+++ b/storage/innobase/include/srv0srv.h
@@ -28,7 +28,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/srv0srv.ic b/storage/innobase/include/srv0srv.ic
index 19ba62cc3c2..9ae9fbfd5b1 100644
--- a/storage/innobase/include/srv0srv.ic
+++ b/storage/innobase/include/srv0srv.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h
index 6024c7ea59b..aa8042b49d6 100644
--- a/storage/innobase/include/srv0start.h
+++ b/storage/innobase/include/srv0start.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/sync0arr.h b/storage/innobase/include/sync0arr.h
index a31c61a3806..dd230f9740b 100644
--- a/storage/innobase/include/sync0arr.h
+++ b/storage/innobase/include/sync0arr.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/sync0arr.ic b/storage/innobase/include/sync0arr.ic
index b49dce34017..08da53b5f6a 100644
--- a/storage/innobase/include/sync0arr.ic
+++ b/storage/innobase/include/sync0arr.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h
index f65d62a39fa..a31f78cac01 100644
--- a/storage/innobase/include/sync0rw.h
+++ b/storage/innobase/include/sync0rw.h
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic
index a7d81e4b031..7a9a69c6067 100644
--- a/storage/innobase/include/sync0rw.ic
+++ b/storage/innobase/include/sync0rw.ic
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic
index d0f266309fc..672df550381 100644
--- a/storage/innobase/include/sync0sync.ic
+++ b/storage/innobase/include/sync0sync.ic
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/sync0types.h b/storage/innobase/include/sync0types.h
index 5e800240888..00391fdf0f8 100644
--- a/storage/innobase/include/sync0types.h
+++ b/storage/innobase/include/sync0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0i_s.h b/storage/innobase/include/trx0i_s.h
index c67227369a7..3356c7006d1 100644
--- a/storage/innobase/include/trx0i_s.h
+++ b/storage/innobase/include/trx0i_s.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h
index f641a1b7924..7175b5834c7 100644
--- a/storage/innobase/include/trx0purge.h
+++ b/storage/innobase/include/trx0purge.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0purge.ic b/storage/innobase/include/trx0purge.ic
index 800d26ba51b..b461a0a9a86 100644
--- a/storage/innobase/include/trx0purge.ic
+++ b/storage/innobase/include/trx0purge.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0rec.h b/storage/innobase/include/trx0rec.h
index 6e3233c685b..da3e1e869cc 100644
--- a/storage/innobase/include/trx0rec.h
+++ b/storage/innobase/include/trx0rec.h
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0roll.h b/storage/innobase/include/trx0roll.h
index db68ae0a8d6..6368042d939 100644
--- a/storage/innobase/include/trx0roll.h
+++ b/storage/innobase/include/trx0roll.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0roll.ic b/storage/innobase/include/trx0roll.ic
index 6a4a5f54459..40b4dc6d4c1 100644
--- a/storage/innobase/include/trx0roll.ic
+++ b/storage/innobase/include/trx0roll.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0rseg.h b/storage/innobase/include/trx0rseg.h
index 703b6e411a5..027f960fa8a 100644
--- a/storage/innobase/include/trx0rseg.h
+++ b/storage/innobase/include/trx0rseg.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0rseg.ic b/storage/innobase/include/trx0rseg.ic
index bb2684576d3..9a113cbd64c 100644
--- a/storage/innobase/include/trx0rseg.ic
+++ b/storage/innobase/include/trx0rseg.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h
index 69b87e18010..ebefa407c77 100644
--- a/storage/innobase/include/trx0sys.h
+++ b/storage/innobase/include/trx0sys.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0sys.ic b/storage/innobase/include/trx0sys.ic
index 5d33f348822..76d8d547119 100644
--- a/storage/innobase/include/trx0sys.ic
+++ b/storage/innobase/include/trx0sys.ic
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
index 9cbc7987eff..17d16ef24e7 100644
--- a/storage/innobase/include/trx0trx.h
+++ b/storage/innobase/include/trx0trx.h
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0trx.ic b/storage/innobase/include/trx0trx.ic
index 14cf6cf1b1d..a505b99e521 100644
--- a/storage/innobase/include/trx0trx.ic
+++ b/storage/innobase/include/trx0trx.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0types.h b/storage/innobase/include/trx0types.h
index 7303892bec4..c082f2c8a33 100644
--- a/storage/innobase/include/trx0types.h
+++ b/storage/innobase/include/trx0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0undo.ic b/storage/innobase/include/trx0undo.ic
index a12d38116b6..b534ec3c762 100644
--- a/storage/innobase/include/trx0undo.ic
+++ b/storage/innobase/include/trx0undo.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/trx0xa.h b/storage/innobase/include/trx0xa.h
index 97c24c899a7..247f1b95d63 100644
--- a/storage/innobase/include/trx0xa.h
+++ b/storage/innobase/include/trx0xa.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index 25287a57b35..eb926595a65 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -26,7 +26,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/usr0sess.h b/storage/innobase/include/usr0sess.h
index bcc2f0d1d99..edbedc8ce7b 100644
--- a/storage/innobase/include/usr0sess.h
+++ b/storage/innobase/include/usr0sess.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/usr0sess.ic b/storage/innobase/include/usr0sess.ic
index 1dcca8a3853..4151bff50df 100644
--- a/storage/innobase/include/usr0sess.ic
+++ b/storage/innobase/include/usr0sess.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/usr0types.h b/storage/innobase/include/usr0types.h
index 6c224e6db17..0637e2dc449 100644
--- a/storage/innobase/include/usr0types.h
+++ b/storage/innobase/include/usr0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0bh.h b/storage/innobase/include/ut0bh.h
index e89d76a51b3..847f9d103bd 100644
--- a/storage/innobase/include/ut0bh.h
+++ b/storage/innobase/include/ut0bh.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0bh.ic b/storage/innobase/include/ut0bh.ic
index 4d04f9b6f49..91c176b36fa 100644
--- a/storage/innobase/include/ut0bh.ic
+++ b/storage/innobase/include/ut0bh.ic
@@ -11,7 +11,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0byte.h b/storage/innobase/include/ut0byte.h
index 0c23e999268..af36eeba78e 100644
--- a/storage/innobase/include/ut0byte.h
+++ b/storage/innobase/include/ut0byte.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0byte.ic b/storage/innobase/include/ut0byte.ic
index 2892c5429fb..07b7677406c 100644
--- a/storage/innobase/include/ut0byte.ic
+++ b/storage/innobase/include/ut0byte.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0dbg.h b/storage/innobase/include/ut0dbg.h
index 5a854326b7b..0f29cf92379 100644
--- a/storage/innobase/include/ut0dbg.h
+++ b/storage/innobase/include/ut0dbg.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0list.h b/storage/innobase/include/ut0list.h
index 4cfe4b9d8ce..2527449aaf5 100644
--- a/storage/innobase/include/ut0list.h
+++ b/storage/innobase/include/ut0list.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0list.ic b/storage/innobase/include/ut0list.ic
index c8810675ca0..b7fd3139e72 100644
--- a/storage/innobase/include/ut0list.ic
+++ b/storage/innobase/include/ut0list.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0lst.h b/storage/innobase/include/ut0lst.h
index 1fb43fd4805..fad3d994e19 100644
--- a/storage/innobase/include/ut0lst.h
+++ b/storage/innobase/include/ut0lst.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0mem.h b/storage/innobase/include/ut0mem.h
index 16c31c2c36c..f7a33204ea1 100644
--- a/storage/innobase/include/ut0mem.h
+++ b/storage/innobase/include/ut0mem.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0mem.ic b/storage/innobase/include/ut0mem.ic
index de701bd50e3..cce414ce540 100644
--- a/storage/innobase/include/ut0mem.ic
+++ b/storage/innobase/include/ut0mem.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0rbt.h b/storage/innobase/include/ut0rbt.h
index 4fe90a2b08b..2e8cef5e24f 100644
--- a/storage/innobase/include/ut0rbt.h
+++ b/storage/innobase/include/ut0rbt.h
@@ -18,7 +18,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 /******************************************************************//**
diff --git a/storage/innobase/include/ut0rnd.h b/storage/innobase/include/ut0rnd.h
index a2b549910c8..1a47bf9bee6 100644
--- a/storage/innobase/include/ut0rnd.h
+++ b/storage/innobase/include/ut0rnd.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0rnd.ic b/storage/innobase/include/ut0rnd.ic
index 4e7881fee99..2831e705311 100644
--- a/storage/innobase/include/ut0rnd.ic
+++ b/storage/innobase/include/ut0rnd.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0sort.h b/storage/innobase/include/ut0sort.h
index 8cc73e65b2a..9ee709bacdb 100644
--- a/storage/innobase/include/ut0sort.h
+++ b/storage/innobase/include/ut0sort.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h
index 9c091bc1df7..3bc2005c0b3 100644
--- a/storage/innobase/include/ut0ut.h
+++ b/storage/innobase/include/ut0ut.h
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0ut.ic b/storage/innobase/include/ut0ut.ic
index e29720db2d6..05f1d227047 100644
--- a/storage/innobase/include/ut0ut.ic
+++ b/storage/innobase/include/ut0ut.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0vec.h b/storage/innobase/include/ut0vec.h
index 316ae87c2cb..6a55c10df21 100644
--- a/storage/innobase/include/ut0vec.h
+++ b/storage/innobase/include/ut0vec.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0vec.ic b/storage/innobase/include/ut0vec.ic
index fce41362d3a..04a432ae104 100644
--- a/storage/innobase/include/ut0vec.ic
+++ b/storage/innobase/include/ut0vec.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/include/ut0wqueue.h b/storage/innobase/include/ut0wqueue.h
index aedcc2b435d..630c5e842c5 100644
--- a/storage/innobase/include/ut0wqueue.h
+++ b/storage/innobase/include/ut0wqueue.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/lock/lock0iter.c b/storage/innobase/lock/lock0iter.c
index 506ec02875a..a73b1ed4564 100644
--- a/storage/innobase/lock/lock0iter.c
+++ b/storage/innobase/lock/lock0iter.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
index 28ecb30e2b7..4af9706b11c 100644
--- a/storage/innobase/lock/lock0lock.c
+++ b/storage/innobase/lock/lock0lock.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
index a458e47d45d..9f4f28d3dcf 100644
--- a/storage/innobase/log/log0recv.c
+++ b/storage/innobase/log/log0recv.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/mach/mach0data.c b/storage/innobase/mach/mach0data.c
index 9669516244d..376c8ec6130 100644
--- a/storage/innobase/mach/mach0data.c
+++ b/storage/innobase/mach/mach0data.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/mem/mem0dbg.c b/storage/innobase/mem/mem0dbg.c
index 007610c01b7..8776aca3c20 100644
--- a/storage/innobase/mem/mem0dbg.c
+++ b/storage/innobase/mem/mem0dbg.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/mem/mem0mem.c b/storage/innobase/mem/mem0mem.c
index 924231470aa..7d8e13617a8 100644
--- a/storage/innobase/mem/mem0mem.c
+++ b/storage/innobase/mem/mem0mem.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/mem/mem0pool.c b/storage/innobase/mem/mem0pool.c
index 709367266c6..eaaa19653ee 100644
--- a/storage/innobase/mem/mem0pool.c
+++ b/storage/innobase/mem/mem0pool.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/mtr/mtr0log.c b/storage/innobase/mtr/mtr0log.c
index 091fabf732c..065b31d9ed2 100644
--- a/storage/innobase/mtr/mtr0log.c
+++ b/storage/innobase/mtr/mtr0log.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
index 90bebdb2374..a9d90ef2c8c 100644
--- a/storage/innobase/os/os0file.c
+++ b/storage/innobase/os/os0file.c
@@ -22,7 +22,7 @@ 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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
 
 ***********************************************************************/
 
diff --git a/storage/innobase/os/os0proc.c b/storage/innobase/os/os0proc.c
index 0c4c5a9f8ff..14c8c3d481d 100644
--- a/storage/innobase/os/os0proc.c
+++ b/storage/innobase/os/os0proc.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/os/os0sync.c b/storage/innobase/os/os0sync.c
index babae5cf924..e1f181226ce 100644
--- a/storage/innobase/os/os0sync.c
+++ b/storage/innobase/os/os0sync.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/os/os0thread.c b/storage/innobase/os/os0thread.c
index 68a8c973558..3b7b88900db 100644
--- a/storage/innobase/os/os0thread.c
+++ b/storage/innobase/os/os0thread.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/page/page0zip.c b/storage/innobase/page/page0zip.c
index faa004be730..7cd31a1bcd3 100644
--- a/storage/innobase/page/page0zip.c
+++ b/storage/innobase/page/page0zip.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/pars/lexyy.c b/storage/innobase/pars/lexyy.c
index ca24e7ecabe..4ba9cc99b75 100644
--- a/storage/innobase/pars/lexyy.c
+++ b/storage/innobase/pars/lexyy.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/pars/make_bison.sh b/storage/innobase/pars/make_bison.sh
index 6587b6b9f1a..c162a5836e6 100644
--- a/storage/innobase/pars/make_bison.sh
+++ b/storage/innobase/pars/make_bison.sh
@@ -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
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 #
 # generate parser files from bison input files.
 
diff --git a/storage/innobase/pars/make_flex.sh b/storage/innobase/pars/make_flex.sh
index a8d35f8cca4..4808edc99dc 100644
--- a/storage/innobase/pars/make_flex.sh
+++ b/storage/innobase/pars/make_flex.sh
@@ -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
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 #
 # generate lexer files from flex input files.
 
diff --git a/storage/innobase/pars/pars0grm.c b/storage/innobase/pars/pars0grm.c
index da19ccd1136..c901b6e0617 100644
--- a/storage/innobase/pars/pars0grm.c
+++ b/storage/innobase/pars/pars0grm.c
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/pars/pars0grm.y b/storage/innobase/pars/pars0grm.y
index 5b4549d6d37..8701d7217e3 100644
--- a/storage/innobase/pars/pars0grm.y
+++ b/storage/innobase/pars/pars0grm.y
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/pars/pars0lex.l b/storage/innobase/pars/pars0lex.l
index dd72f18d04f..1285632186c 100644
--- a/storage/innobase/pars/pars0lex.l
+++ b/storage/innobase/pars/pars0lex.l
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/pars/pars0opt.c b/storage/innobase/pars/pars0opt.c
index 7f98e95ac3f..d871550e3a2 100644
--- a/storage/innobase/pars/pars0opt.c
+++ b/storage/innobase/pars/pars0opt.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/pars/pars0pars.c b/storage/innobase/pars/pars0pars.c
index 343a1130d0c..eeedc5bc4d1 100644
--- a/storage/innobase/pars/pars0pars.c
+++ b/storage/innobase/pars/pars0pars.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/pars/pars0sym.c b/storage/innobase/pars/pars0sym.c
index 783598fdd1e..7428ea9f4b4 100644
--- a/storage/innobase/pars/pars0sym.c
+++ b/storage/innobase/pars/pars0sym.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/que/que0que.c b/storage/innobase/que/que0que.c
index f53dd602ede..37a970f3837 100644
--- a/storage/innobase/que/que0que.c
+++ b/storage/innobase/que/que0que.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/read/read0read.c b/storage/innobase/read/read0read.c
index 1de78aae708..34782e7b8a8 100644
--- a/storage/innobase/read/read0read.c
+++ b/storage/innobase/read/read0read.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/rem/rem0cmp.c b/storage/innobase/rem/rem0cmp.c
index a49a42e8c3f..5fefb1a5b72 100644
--- a/storage/innobase/rem/rem0cmp.c
+++ b/storage/innobase/rem/rem0cmp.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/rem/rem0rec.c b/storage/innobase/rem/rem0rec.c
index 779a2a0867d..5c568f1a259 100644
--- a/storage/innobase/rem/rem0rec.c
+++ b/storage/innobase/rem/rem0rec.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/row/row0ext.c b/storage/innobase/row/row0ext.c
index aa3b14e06f2..e1b16d32278 100644
--- a/storage/innobase/row/row0ext.c
+++ b/storage/innobase/row/row0ext.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c
index 22ba78a1ef3..43101b198dc 100644
--- a/storage/innobase/row/row0merge.c
+++ b/storage/innobase/row/row0merge.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c
index 9d163158b10..97453be3384 100644
--- a/storage/innobase/row/row0sel.c
+++ b/storage/innobase/row/row0sel.c
@@ -20,7 +20,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/row/row0uins.c b/storage/innobase/row/row0uins.c
index 57c8c512698..f06cf730daf 100644
--- a/storage/innobase/row/row0uins.c
+++ b/storage/innobase/row/row0uins.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/row/row0umod.c b/storage/innobase/row/row0umod.c
index 44509d67c7b..dbc5603ef3b 100644
--- a/storage/innobase/row/row0umod.c
+++ b/storage/innobase/row/row0umod.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/row/row0undo.c b/storage/innobase/row/row0undo.c
index 5a0a99570c4..1fff1417cdd 100644
--- a/storage/innobase/row/row0undo.c
+++ b/storage/innobase/row/row0undo.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/row/row0vers.c b/storage/innobase/row/row0vers.c
index efbc52c8a8f..9f4013efe53 100644
--- a/storage/innobase/row/row0vers.c
+++ b/storage/innobase/row/row0vers.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
index e52134f803f..a66ecccb8ee 100644
--- a/storage/innobase/srv/srv0srv.c
+++ b/storage/innobase/srv/srv0srv.c
@@ -28,7 +28,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
index b9fd52aa833..4e1cbd5d760 100644
--- a/storage/innobase/srv/srv0start.c
+++ b/storage/innobase/srv/srv0start.c
@@ -27,7 +27,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c
index 62d35ccd302..5607ceac4e7 100644
--- a/storage/innobase/sync/sync0arr.c
+++ b/storage/innobase/sync/sync0arr.c
@@ -20,7 +20,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/trx/trx0i_s.c b/storage/innobase/trx/trx0i_s.c
index f3715c5a731..57c80f0b355 100644
--- a/storage/innobase/trx/trx0i_s.c
+++ b/storage/innobase/trx/trx0i_s.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c
index 429c5d3c297..4c29af09684 100644
--- a/storage/innobase/trx/trx0purge.c
+++ b/storage/innobase/trx/trx0purge.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/trx/trx0roll.c b/storage/innobase/trx/trx0roll.c
index a6fa9dc73a9..f2045240eae 100644
--- a/storage/innobase/trx/trx0roll.c
+++ b/storage/innobase/trx/trx0roll.c
@@ -14,7 +14,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/trx/trx0rseg.c b/storage/innobase/trx/trx0rseg.c
index ed3c27326d4..db9f751810a 100644
--- a/storage/innobase/trx/trx0rseg.c
+++ b/storage/innobase/trx/trx0rseg.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
index 7a53a78f2d9..22dada192a3 100644
--- a/storage/innobase/trx/trx0trx.c
+++ b/storage/innobase/trx/trx0trx.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/usr/usr0sess.c b/storage/innobase/usr/usr0sess.c
index eed377ec09e..83896a480b2 100644
--- a/storage/innobase/usr/usr0sess.c
+++ b/storage/innobase/usr/usr0sess.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/ut/ut0bh.c b/storage/innobase/ut/ut0bh.c
index 6d1f881917b..2f68d78c034 100644
--- a/storage/innobase/ut/ut0bh.c
+++ b/storage/innobase/ut/ut0bh.c
@@ -17,7 +17,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/ut/ut0byte.c b/storage/innobase/ut/ut0byte.c
index 3d84df52818..1015af93930 100644
--- a/storage/innobase/ut/ut0byte.c
+++ b/storage/innobase/ut/ut0byte.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/ut/ut0dbg.c b/storage/innobase/ut/ut0dbg.c
index 8c77723bd73..ff0eb4e3365 100644
--- a/storage/innobase/ut/ut0dbg.c
+++ b/storage/innobase/ut/ut0dbg.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/ut/ut0list.c b/storage/innobase/ut/ut0list.c
index e8f1e3a9bff..7663115fa6d 100644
--- a/storage/innobase/ut/ut0list.c
+++ b/storage/innobase/ut/ut0list.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/ut/ut0mem.c b/storage/innobase/ut/ut0mem.c
index 944c1f1e049..5e0ce7c765e 100644
--- a/storage/innobase/ut/ut0mem.c
+++ b/storage/innobase/ut/ut0mem.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/ut/ut0rbt.c b/storage/innobase/ut/ut0rbt.c
index c3404a25624..e1c794e6aaf 100644
--- a/storage/innobase/ut/ut0rbt.c
+++ b/storage/innobase/ut/ut0rbt.c
@@ -18,7 +18,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 /********************************************************************//**
diff --git a/storage/innobase/ut/ut0rnd.c b/storage/innobase/ut/ut0rnd.c
index feaee0d0864..36e1ecfc941 100644
--- a/storage/innobase/ut/ut0rnd.c
+++ b/storage/innobase/ut/ut0rnd.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/ut/ut0vec.c b/storage/innobase/ut/ut0vec.c
index b2f8683bec8..4fecad8136f 100644
--- a/storage/innobase/ut/ut0vec.c
+++ b/storage/innobase/ut/ut0vec.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/innobase/ut/ut0wqueue.c b/storage/innobase/ut/ut0wqueue.c
index e6885b206eb..08b246476bb 100644
--- a/storage/innobase/ut/ut0wqueue.c
+++ b/storage/innobase/ut/ut0wqueue.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt
index 0f30f8f3156..3a91edba9a9 100644
--- a/storage/maria/CMakeLists.txt
+++ b/storage/maria/CMakeLists.txt
@@ -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(CMakeDependentOption)
 
diff --git a/storage/maria/unittest/CMakeLists.txt b/storage/maria/unittest/CMakeLists.txt
index d0cb88b8d9f..a2da1507c97 100644
--- a/storage/maria/unittest/CMakeLists.txt
+++ b/storage/maria/unittest/CMakeLists.txt
@@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
                     ${CMAKE_SOURCE_DIR}/unittest/mytap)
diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt
index f58c942b4d7..52485043e8f 100644
--- a/storage/myisam/CMakeLists.txt
+++ b/storage/myisam/CMakeLists.txt
@@ -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
 
 SET(MYISAM_SOURCES  ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c
                                 ha_myisam.cc
diff --git a/storage/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c
index 16432d0161c..b9ab23b93be 100644
--- a/storage/myisam/ft_boolean_search.c
+++ b/storage/myisam/ft_boolean_search.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Written by Sergei A. Golubchik, who has a shared copyright to this code */
 
diff --git a/storage/myisam/ft_nlq_search.c b/storage/myisam/ft_nlq_search.c
index bafa7064e28..7257b10958d 100644
--- a/storage/myisam/ft_nlq_search.c
+++ b/storage/myisam/ft_nlq_search.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Written by Sergei A. Golubchik, who has a shared copyright to this code */
 
diff --git a/storage/myisam/ft_parser.c b/storage/myisam/ft_parser.c
index c534a9a060b..f2a9370165c 100644
--- a/storage/myisam/ft_parser.c
+++ b/storage/myisam/ft_parser.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Written by Sergei A. Golubchik, who has a shared copyright to this code */
 
diff --git a/storage/myisam/ft_static.c b/storage/myisam/ft_static.c
index aa8adba88a2..de933bdeb6a 100644
--- a/storage/myisam/ft_static.c
+++ b/storage/myisam/ft_static.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 */
 
 /* Written by Sergei A. Golubchik, who has a shared copyright to this code */
 
diff --git a/storage/myisam/ft_stopwords.c b/storage/myisam/ft_stopwords.c
index a04985cd0b8..3b95b747133 100644
--- a/storage/myisam/ft_stopwords.c
+++ b/storage/myisam/ft_stopwords.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  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 /* Written by Sergei A. Golubchik, who has a shared copyright to this code */
 
diff --git a/storage/myisam/ft_update.c b/storage/myisam/ft_update.c
index 19144ff01fb..a688b6704b3 100644
--- a/storage/myisam/ft_update.c
+++ b/storage/myisam/ft_update.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Written by Sergei A. Golubchik, who has a shared copyright to this code */
 
diff --git a/storage/myisam/ftbench/Ecompare.pl b/storage/myisam/ftbench/Ecompare.pl
index c958db6e9a9..07132ef9001 100755
--- a/storage/myisam/ftbench/Ecompare.pl
+++ b/storage/myisam/ftbench/Ecompare.pl
@@ -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
 
 # compares out-files (as created by Ereport.pl) from dir1/*.out and dir2/*.out
 # for each effectiveness column computes the probability of the hypothesis
diff --git a/storage/myisam/ftbench/Ecreate.pl b/storage/myisam/ftbench/Ecreate.pl
index 9e0ef321b74..86af9f9c0a5 100755
--- a/storage/myisam/ftbench/Ecreate.pl
+++ b/storage/myisam/ftbench/Ecreate.pl
@@ -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
 
 $test=shift || die "Usage $0 testname [option]";
 $option=shift;
diff --git a/storage/myisam/ftbench/Ereport.pl b/storage/myisam/ftbench/Ereport.pl
index c3dad3d82be..d3f8961ec85 100755
--- a/storage/myisam/ftbench/Ereport.pl
+++ b/storage/myisam/ftbench/Ereport.pl
@@ -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
 
 die "Use: $0 eval_output qrels_file\n" unless @ARGV==2;
 
diff --git a/storage/myisam/ftbench/ft-test-run.sh b/storage/myisam/ftbench/ft-test-run.sh
index 08e03474dac..08294071b47 100755
--- a/storage/myisam/ftbench/ft-test-run.sh
+++ b/storage/myisam/ftbench/ft-test-run.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 if [ ! -x ./ft-test-run.sh ] ; then
   echo "Usage: ./ft-test-run.sh"
diff --git a/storage/myisam/ftdefs.h b/storage/myisam/ftdefs.h
index 5c7f4c64a51..a7417813c22 100644
--- a/storage/myisam/ftdefs.h
+++ b/storage/myisam/ftdefs.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 */
 
 /* Written by Sergei A. Golubchik, who has a shared copyright to this code */
 
diff --git a/storage/myisam/fulltext.h b/storage/myisam/fulltext.h
index 98b3247ba19..d8f900a605e 100644
--- a/storage/myisam/fulltext.h
+++ b/storage/myisam/fulltext.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 */
 
 /* Written by Sergei A. Golubchik, who has a shared copyright to this code */
 
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index a9e70a7b536..7aab938f383 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.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/storage/myisam/ha_myisam.h b/storage/myisam/ha_myisam.h
index 79324f64370..4c62c2c9677 100644
--- a/storage/myisam/ha_myisam.h
+++ b/storage/myisam/ha_myisam.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 */
 
 
 #ifdef USE_PRAGMA_INTERFACE
diff --git a/storage/myisam/mi_cache.c b/storage/myisam/mi_cache.c
index 6e9feaefb2d..f9f399ec056 100644
--- a/storage/myisam/mi_cache.c
+++ b/storage/myisam/mi_cache.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 */
 
 /*
   Functions for read record cacheing with myisam
diff --git a/storage/myisam/mi_changed.c b/storage/myisam/mi_changed.c
index e7ceff24287..1eb2b5173d5 100644
--- a/storage/myisam/mi_changed.c
+++ b/storage/myisam/mi_changed.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 */
 
 /* Check if somebody has changed table since last check. */
 
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index 8c2411b693f..35ec615d99b 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Describe, check and repair of MyISAM tables */
 
diff --git a/storage/myisam/mi_checksum.c b/storage/myisam/mi_checksum.c
index ec8b51fce7b..0ad24cfff25 100644
--- a/storage/myisam/mi_checksum.c
+++ b/storage/myisam/mi_checksum.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  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 /* Calculate a checksum for a row */
 
diff --git a/storage/myisam/mi_close.c b/storage/myisam/mi_close.c
index e58c2e0f189..882e75b7349 100644
--- a/storage/myisam/mi_close.c
+++ b/storage/myisam/mi_close.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* close a isam-database */
 /*
diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c
index fdc9eeef147..9a3a7788587 100644
--- a/storage/myisam/mi_create.c
+++ b/storage/myisam/mi_create.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 */
 
 /* Create a MyISAM table */
 
diff --git a/storage/myisam/mi_dbug.c b/storage/myisam/mi_dbug.c
index 4606e0af170..6f99d074c3d 100644
--- a/storage/myisam/mi_dbug.c
+++ b/storage/myisam/mi_dbug.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Support rutiner with are using with dbug */
 
diff --git a/storage/myisam/mi_delete.c b/storage/myisam/mi_delete.c
index 907d8e291f6..4930ba78eb1 100644
--- a/storage/myisam/mi_delete.c
+++ b/storage/myisam/mi_delete.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Remove a row from a MyISAM table */
 
diff --git a/storage/myisam/mi_delete_all.c b/storage/myisam/mi_delete_all.c
index 37fdf2dcb04..31801399c7a 100644
--- a/storage/myisam/mi_delete_all.c
+++ b/storage/myisam/mi_delete_all.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 */
 
 /* Remove all rows from a MyISAM table */
 /* This clears the status information and truncates files */
diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c
index ca395ffbef5..f09ce84c2d5 100644
--- a/storage/myisam/mi_delete_table.c
+++ b/storage/myisam/mi_delete_table.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 */
 
 /*
   deletes a table
diff --git a/storage/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c
index 009a2affe0c..cfe5a17c9f0 100644
--- a/storage/myisam/mi_dynrec.c
+++ b/storage/myisam/mi_dynrec.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 */
 
 /*
   Functions to handle space-packed-records and blobs
diff --git a/storage/myisam/mi_extra.c b/storage/myisam/mi_extra.c
index 9c5c1ad0c0d..cc3d7183458 100644
--- a/storage/myisam/mi_extra.c
+++ b/storage/myisam/mi_extra.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 */
 
 #include "myisamdef.h"
 #ifdef HAVE_SYS_MMAN_H
diff --git a/storage/myisam/mi_extrafunc.h b/storage/myisam/mi_extrafunc.h
index 2109796763d..bfefb52caf8 100644
--- a/storage/myisam/mi_extrafunc.h
+++ b/storage/myisam/mi_extrafunc.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 */
 
 void _mi_report_crashed(MI_INFO *file __attribute__((unused)),
                         const char *message __attribute__((unused)),
diff --git a/storage/myisam/mi_info.c b/storage/myisam/mi_info.c
index 3b9288eeb83..29d2283bc85 100644
--- a/storage/myisam/mi_info.c
+++ b/storage/myisam/mi_info.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 */
 
 /* Return useful base information for an open table */
 
diff --git a/storage/myisam/mi_key.c b/storage/myisam/mi_key.c
index 18ecc9e8ba3..b5ca83600e6 100644
--- a/storage/myisam/mi_key.c
+++ b/storage/myisam/mi_key.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Functions to handle keys */
 
diff --git a/storage/myisam/mi_keycache.c b/storage/myisam/mi_keycache.c
index 59a1ca27614..d7f1d8b1745 100644
--- a/storage/myisam/mi_keycache.c
+++ b/storage/myisam/mi_keycache.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 */
 
 /*
   Key cache assignments
diff --git a/storage/myisam/mi_locking.c b/storage/myisam/mi_locking.c
index f34c43cae78..33260ee9fd5 100644
--- a/storage/myisam/mi_locking.c
+++ b/storage/myisam/mi_locking.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 */
 
 /*
   locking of isam-tables.
diff --git a/storage/myisam/mi_log.c b/storage/myisam/mi_log.c
index 7004144c8bc..9b8405d0a9c 100644
--- a/storage/myisam/mi_log.c
+++ b/storage/myisam/mi_log.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /*
   Logging of MyISAM commands and records on logfile for debugging
diff --git a/storage/myisam/mi_open.c b/storage/myisam/mi_open.c
index 86b70129203..70d7a05d77c 100644
--- a/storage/myisam/mi_open.c
+++ b/storage/myisam/mi_open.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 */
 
 /* open a isam-database */
 
diff --git a/storage/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c
index f0a4d764e7a..362c4867e0d 100644
--- a/storage/myisam/mi_packrec.c
+++ b/storage/myisam/mi_packrec.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 	/* Functions to compressed records */
 
diff --git a/storage/myisam/mi_page.c b/storage/myisam/mi_page.c
index bbcacd35d5d..4d199f9e957 100644
--- a/storage/myisam/mi_page.c
+++ b/storage/myisam/mi_page.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 */
 
 /* Read and write key blocks */
 
diff --git a/storage/myisam/mi_panic.c b/storage/myisam/mi_panic.c
index 8607b8aea88..541cf399662 100644
--- a/storage/myisam/mi_panic.c
+++ b/storage/myisam/mi_panic.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 */
 
 #include "fulltext.h"
 
diff --git a/storage/myisam/mi_preload.c b/storage/myisam/mi_preload.c
index 1a2d5aac94f..bd61540c912 100644
--- a/storage/myisam/mi_preload.c
+++ b/storage/myisam/mi_preload.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /*
   Preload indexes into key cache
diff --git a/storage/myisam/mi_range.c b/storage/myisam/mi_range.c
index 2074c873979..de76c4cee93 100644
--- a/storage/myisam/mi_range.c
+++ b/storage/myisam/mi_range.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 */
 
 /*
   Gives a approximated number of how many records there is between two keys.
diff --git a/storage/myisam/mi_rename.c b/storage/myisam/mi_rename.c
index 3c0f2e97216..19df2e54213 100644
--- a/storage/myisam/mi_rename.c
+++ b/storage/myisam/mi_rename.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /*
   Rename a table
diff --git a/storage/myisam/mi_rfirst.c b/storage/myisam/mi_rfirst.c
index 5f656229b3b..7bfe87867ee 100644
--- a/storage/myisam/mi_rfirst.c
+++ b/storage/myisam/mi_rfirst.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 */
 
 #include "myisamdef.h"
 
diff --git a/storage/myisam/mi_rkey.c b/storage/myisam/mi_rkey.c
index b70922b0505..fa56b811313 100644
--- a/storage/myisam/mi_rkey.c
+++ b/storage/myisam/mi_rkey.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 */
 
 /* Read record based on a key */
 
diff --git a/storage/myisam/mi_rlast.c b/storage/myisam/mi_rlast.c
index b5465d2eadd..30cd17d97bb 100644
--- a/storage/myisam/mi_rlast.c
+++ b/storage/myisam/mi_rlast.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 */
 
 #include "myisamdef.h"
 
diff --git a/storage/myisam/mi_rnext.c b/storage/myisam/mi_rnext.c
index 509cd75fbab..4f6bddc01cd 100644
--- a/storage/myisam/mi_rnext.c
+++ b/storage/myisam/mi_rnext.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 */
 
 #include "myisamdef.h"
 
diff --git a/storage/myisam/mi_rnext_same.c b/storage/myisam/mi_rnext_same.c
index d6856459ae7..ed9e3c55b2f 100644
--- a/storage/myisam/mi_rnext_same.c
+++ b/storage/myisam/mi_rnext_same.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 */
 
 #include "myisamdef.h"
 #include "rt_index.h"
diff --git a/storage/myisam/mi_rprev.c b/storage/myisam/mi_rprev.c
index 27fbda95574..765f8a5d79f 100644
--- a/storage/myisam/mi_rprev.c
+++ b/storage/myisam/mi_rprev.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 */
 
 #include "myisamdef.h"
 
diff --git a/storage/myisam/mi_rrnd.c b/storage/myisam/mi_rrnd.c
index dd321e19e00..4e49e7922ce 100644
--- a/storage/myisam/mi_rrnd.c
+++ b/storage/myisam/mi_rrnd.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 */
 
 /* Read a record with random-access. The position to the record must
    get by MI_INFO. The next record can be read with pos= MI_POS_ERROR */
diff --git a/storage/myisam/mi_rsame.c b/storage/myisam/mi_rsame.c
index 8258dcdb809..7511531b26a 100644
--- a/storage/myisam/mi_rsame.c
+++ b/storage/myisam/mi_rsame.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 */
 
 #include "myisamdef.h"
 
diff --git a/storage/myisam/mi_rsamepos.c b/storage/myisam/mi_rsamepos.c
index 9a7d46eab14..4570aa3b4a7 100644
--- a/storage/myisam/mi_rsamepos.c
+++ b/storage/myisam/mi_rsamepos.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 */
 
 /* read record through position and fix key-position */
 /* As mi_rsame but supply a position */
diff --git a/storage/myisam/mi_scan.c b/storage/myisam/mi_scan.c
index 2ccab7ba306..8d436c4eada 100644
--- a/storage/myisam/mi_scan.c
+++ b/storage/myisam/mi_scan.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 */
 
 /* Read through all rows sequntially */
 
diff --git a/storage/myisam/mi_search.c b/storage/myisam/mi_search.c
index be39849afd4..85ea136a4c6 100644
--- a/storage/myisam/mi_search.c
+++ b/storage/myisam/mi_search.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 */
 
 /* key handling functions */
 
diff --git a/storage/myisam/mi_static.c b/storage/myisam/mi_static.c
index a8bff936ad1..b49311ae21f 100644
--- a/storage/myisam/mi_static.c
+++ b/storage/myisam/mi_static.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /*
   Static variables for MyISAM library. All definied here for easy making of
diff --git a/storage/myisam/mi_statrec.c b/storage/myisam/mi_statrec.c
index b8fa7554034..363c9707a4b 100644
--- a/storage/myisam/mi_statrec.c
+++ b/storage/myisam/mi_statrec.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 	/* Functions to handle fixed-length-records */
 
diff --git a/storage/myisam/mi_test1.c b/storage/myisam/mi_test1.c
index 3b2597eb01e..c9feffa20e8 100644
--- a/storage/myisam/mi_test1.c
+++ b/storage/myisam/mi_test1.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 */
 
 /* Testing of the basic functions of a MyISAM table */
 
diff --git a/storage/myisam/mi_test2.c b/storage/myisam/mi_test2.c
index 3ec12ef5cca..a25f9726802 100644
--- a/storage/myisam/mi_test2.c
+++ b/storage/myisam/mi_test2.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 */
 
 /* Test av isam-databas: stor test */
 
diff --git a/storage/myisam/mi_test3.c b/storage/myisam/mi_test3.c
index 885118d4eec..ccd93df23e2 100644
--- a/storage/myisam/mi_test3.c
+++ b/storage/myisam/mi_test3.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Test av locking */
 
diff --git a/storage/myisam/mi_test_all.sh b/storage/myisam/mi_test_all.sh
index 12c28d7d132..af0a3d4e769 100755
--- a/storage/myisam/mi_test_all.sh
+++ b/storage/myisam/mi_test_all.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 #
 # Execute some simple basic test on MyISAM libary to check if things
diff --git a/storage/myisam/mi_unique.c b/storage/myisam/mi_unique.c
index cdf3e618275..1f3a35b1965 100644
--- a/storage/myisam/mi_unique.c
+++ b/storage/myisam/mi_unique.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 */
 
 /* Functions to check if a row is unique */
 
diff --git a/storage/myisam/mi_update.c b/storage/myisam/mi_update.c
index b75bd4bf2aa..89ab5a0aeca 100644
--- a/storage/myisam/mi_update.c
+++ b/storage/myisam/mi_update.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 */
 
 /* Update an old row in a MyISAM table */
 
diff --git a/storage/myisam/mi_write.c b/storage/myisam/mi_write.c
index e8eb2463a23..e6309d08a4f 100644
--- a/storage/myisam/mi_write.c
+++ b/storage/myisam/mi_write.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Write a row to a MyISAM table */
 
diff --git a/storage/myisam/myisam_ftdump.c b/storage/myisam/myisam_ftdump.c
index ce0d7be3f0b..4f5d8241b7f 100644
--- a/storage/myisam/myisam_ftdump.c
+++ b/storage/myisam/myisam_ftdump.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 */
 
 /* Written by Sergei A. Golubchik, who has a shared copyright to this code
    added support for long options (my_getopt) 22.5.2002 by Jani Tolonen */
diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c
index c905ad4048d..bb035e6b157 100644
--- a/storage/myisam/myisamchk.c
+++ b/storage/myisam/myisamchk.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  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 /* Describe, check and repair of MyISAM tables */
 
diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h
index 50439c0859d..a019d7f2351 100644
--- a/storage/myisam/myisamdef.h
+++ b/storage/myisam/myisamdef.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 */
 
 /* This file is included by all internal myisam files */
 
diff --git a/storage/myisam/myisamlog.c b/storage/myisam/myisamlog.c
index 3314f1b94ac..3880826d981 100644
--- a/storage/myisam/myisamlog.c
+++ b/storage/myisam/myisamlog.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 */
 
 /* write whats in isam.log */
 
diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c
index 50622c464ca..f8d76d8770b 100644
--- a/storage/myisam/myisampack.c
+++ b/storage/myisam/myisampack.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Pack MyISAM file */
 
diff --git a/storage/myisam/rt_index.c b/storage/myisam/rt_index.c
index fc0c0345f5e..81ae2612318 100644
--- a/storage/myisam/rt_index.c
+++ b/storage/myisam/rt_index.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  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 #include "myisamdef.h"
 
diff --git a/storage/myisam/rt_index.h b/storage/myisam/rt_index.h
index e7f00b1c5df..2c1009290c6 100644
--- a/storage/myisam/rt_index.h
+++ b/storage/myisam/rt_index.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 _rt_index_h
 #define _rt_index_h
diff --git a/storage/myisam/rt_key.c b/storage/myisam/rt_key.c
index f4dbf06ae2f..3c58a454834 100644
--- a/storage/myisam/rt_key.c
+++ b/storage/myisam/rt_key.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 */
 
 #include "myisamdef.h"
 
diff --git a/storage/myisam/rt_key.h b/storage/myisam/rt_key.h
index 94d79d08feb..56f57d847bf 100644
--- a/storage/myisam/rt_key.h
+++ b/storage/myisam/rt_key.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 */
 
 /* Written by Ramil Kalimullin, who has a shared copyright to this code */
 
diff --git a/storage/myisam/rt_mbr.c b/storage/myisam/rt_mbr.c
index c59b872ae3e..dd137b38bfa 100644
--- a/storage/myisam/rt_mbr.c
+++ b/storage/myisam/rt_mbr.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 */
 
 #include "myisamdef.h"
 
diff --git a/storage/myisam/rt_mbr.h b/storage/myisam/rt_mbr.h
index 597e938758f..43e55d39093 100644
--- a/storage/myisam/rt_mbr.h
+++ b/storage/myisam/rt_mbr.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 _rt_mbr_h
 #define _rt_mbr_h
diff --git a/storage/myisam/rt_split.c b/storage/myisam/rt_split.c
index be61734e01c..91465c5a231 100644
--- a/storage/myisam/rt_split.c
+++ b/storage/myisam/rt_split.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 */
 
 #include "myisamdef.h"
 
diff --git a/storage/myisam/rt_test.c b/storage/myisam/rt_test.c
index 8b537d134ef..78deb80064a 100644
--- a/storage/myisam/rt_test.c
+++ b/storage/myisam/rt_test.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Testing of the basic functions of a MyISAM rtree table         */
 /* Written by Alex Barkov who has a shared copyright to this code */
diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c
index ed9267a6f1f..c07b1347ed4 100644
--- a/storage/myisam/sort.c
+++ b/storage/myisam/sort.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /*
   Creates a index for a database by reading keys, sorting them and outputing
diff --git a/storage/myisam/sp_defs.h b/storage/myisam/sp_defs.h
index e04f0578fd7..d43fa49ed57 100644
--- a/storage/myisam/sp_defs.h
+++ b/storage/myisam/sp_defs.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 _SP_DEFS_H
 #define _SP_DEFS_H
diff --git a/storage/myisam/sp_key.c b/storage/myisam/sp_key.c
index 3837ed01bd2..c3aeb7553f2 100644
--- a/storage/myisam/sp_key.c
+++ b/storage/myisam/sp_key.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include "myisamdef.h"
 
diff --git a/storage/myisam/sp_test.c b/storage/myisam/sp_test.c
index d573d96086e..4e05dec6a26 100644
--- a/storage/myisam/sp_test.c
+++ b/storage/myisam/sp_test.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Testing of the basic functions of a MyISAM spatial table        */
 /* Written by Alex Barkov, who has a shared copyright to this code */
diff --git a/storage/myisammrg/CMakeLists.txt b/storage/myisammrg/CMakeLists.txt
index eec3ca783dc..b4db348d272 100644
--- a/storage/myisammrg/CMakeLists.txt
+++ b/storage/myisammrg/CMakeLists.txt
@@ -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
 
 SET(MYISAMMRG_SOURCES  myrg_close.c myrg_create.c myrg_delete.c myrg_extra.c myrg_info.c
 				ha_myisammrg.cc
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index 35e761d0dbd..b4e36b96d77 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.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/storage/myisammrg/ha_myisammrg.h b/storage/myisammrg/ha_myisammrg.h
index ab2ba3e70c6..dcdbb53713e 100644
--- a/storage/myisammrg/ha_myisammrg.h
+++ b/storage/myisammrg/ha_myisammrg.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 */
 
 
 #ifdef USE_PRAGMA_INTERFACE
diff --git a/storage/myisammrg/myrg_close.c b/storage/myisammrg/myrg_close.c
index 97c35619067..636382f92d0 100644
--- a/storage/myisammrg/myrg_close.c
+++ b/storage/myisammrg/myrg_close.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* close a isam-database */
 
diff --git a/storage/myisammrg/myrg_create.c b/storage/myisammrg/myrg_create.c
index 53c104b4c4a..5a59f03727e 100644
--- a/storage/myisammrg/myrg_create.c
+++ b/storage/myisammrg/myrg_create.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 */
 
 /* Create a MYMERGE_-file */
 
diff --git a/storage/myisammrg/myrg_def.h b/storage/myisammrg/myrg_def.h
index e6fa869ff9b..84a4a9d3de6 100644
--- a/storage/myisammrg/myrg_def.h
+++ b/storage/myisammrg/myrg_def.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 */
 
 /* This file is included by all myisam-merge files */
 
diff --git a/storage/myisammrg/myrg_delete.c b/storage/myisammrg/myrg_delete.c
index a80020d69cd..e13b9b4ef8c 100644
--- a/storage/myisammrg/myrg_delete.c
+++ b/storage/myisammrg/myrg_delete.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 */
 
 /* Delete last read record */
 
diff --git a/storage/myisammrg/myrg_extra.c b/storage/myisammrg/myrg_extra.c
index 18cc66cf937..43dfc18c710 100644
--- a/storage/myisammrg/myrg_extra.c
+++ b/storage/myisammrg/myrg_extra.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 */
 
 /*
   Extra functions we want to do with a database
diff --git a/storage/myisammrg/myrg_info.c b/storage/myisammrg/myrg_info.c
index 53484b430b3..1d78c65066d 100644
--- a/storage/myisammrg/myrg_info.c
+++ b/storage/myisammrg/myrg_info.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 */
 
 #include "myrg_def.h"
 
diff --git a/storage/myisammrg/myrg_locking.c b/storage/myisammrg/myrg_locking.c
index 2c48f51991a..a79e35d2364 100644
--- a/storage/myisammrg/myrg_locking.c
+++ b/storage/myisammrg/myrg_locking.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 */
 
 /*
   Lock databases against read or write.
diff --git a/storage/myisammrg/myrg_open.c b/storage/myisammrg/myrg_open.c
index c4a6857fe07..c0c8b1aa221 100644
--- a/storage/myisammrg/myrg_open.c
+++ b/storage/myisammrg/myrg_open.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 */
 
 /* open a MyISAM MERGE table */
 
diff --git a/storage/myisammrg/myrg_panic.c b/storage/myisammrg/myrg_panic.c
index 63e7462609e..3721b4037f1 100644
--- a/storage/myisammrg/myrg_panic.c
+++ b/storage/myisammrg/myrg_panic.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 */
 
 #include "myrg_def.h"
 
diff --git a/storage/myisammrg/myrg_queue.c b/storage/myisammrg/myrg_queue.c
index 2ec580e4797..08d02bd5b12 100644
--- a/storage/myisammrg/myrg_queue.c
+++ b/storage/myisammrg/myrg_queue.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include "myrg_def.h"
 
diff --git a/storage/myisammrg/myrg_range.c b/storage/myisammrg/myrg_range.c
index 7dddf12657b..893bda20833 100644
--- a/storage/myisammrg/myrg_range.c
+++ b/storage/myisammrg/myrg_range.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 */
 
 #include "myrg_def.h"
 
diff --git a/storage/myisammrg/myrg_records.c b/storage/myisammrg/myrg_records.c
index 40116f8b1c5..4aa33a0870c 100644
--- a/storage/myisammrg/myrg_records.c
+++ b/storage/myisammrg/myrg_records.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 */
 
 #include "myrg_def.h"
 
diff --git a/storage/myisammrg/myrg_rfirst.c b/storage/myisammrg/myrg_rfirst.c
index 157029e5c3d..c8400c0a96f 100644
--- a/storage/myisammrg/myrg_rfirst.c
+++ b/storage/myisammrg/myrg_rfirst.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 */
 
 #include "myrg_def.h"
 
diff --git a/storage/myisammrg/myrg_rkey.c b/storage/myisammrg/myrg_rkey.c
index 95056c09a49..84e8297f508 100644
--- a/storage/myisammrg/myrg_rkey.c
+++ b/storage/myisammrg/myrg_rkey.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 */
 
 /* Read record based on a key */
 
diff --git a/storage/myisammrg/myrg_rlast.c b/storage/myisammrg/myrg_rlast.c
index 8fcb424732c..d9402568f9f 100644
--- a/storage/myisammrg/myrg_rlast.c
+++ b/storage/myisammrg/myrg_rlast.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 */
 
 #include "myrg_def.h"
 
diff --git a/storage/myisammrg/myrg_rnext.c b/storage/myisammrg/myrg_rnext.c
index b19d4d5695d..8b35e40f70f 100644
--- a/storage/myisammrg/myrg_rnext.c
+++ b/storage/myisammrg/myrg_rnext.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 */
 
 #include "myrg_def.h"
 
diff --git a/storage/myisammrg/myrg_rnext_same.c b/storage/myisammrg/myrg_rnext_same.c
index 6b741839a70..f9a114a7cd5 100644
--- a/storage/myisammrg/myrg_rnext_same.c
+++ b/storage/myisammrg/myrg_rnext_same.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 */
 
 #include "myrg_def.h"
 
diff --git a/storage/myisammrg/myrg_rprev.c b/storage/myisammrg/myrg_rprev.c
index 581bc215c52..72765f5d9bd 100644
--- a/storage/myisammrg/myrg_rprev.c
+++ b/storage/myisammrg/myrg_rprev.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 */
 
 #include "myrg_def.h"
 
diff --git a/storage/myisammrg/myrg_rrnd.c b/storage/myisammrg/myrg_rrnd.c
index 2e6a77ee5b9..a97f6d300b9 100644
--- a/storage/myisammrg/myrg_rrnd.c
+++ b/storage/myisammrg/myrg_rrnd.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 */
 
 /*
   Read a record with random-access. The position to the record must
diff --git a/storage/myisammrg/myrg_rsame.c b/storage/myisammrg/myrg_rsame.c
index 34dbbe51007..f76fe79fa6f 100644
--- a/storage/myisammrg/myrg_rsame.c
+++ b/storage/myisammrg/myrg_rsame.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 */
 
 #include "myrg_def.h"
 
diff --git a/storage/myisammrg/myrg_static.c b/storage/myisammrg/myrg_static.c
index b36b7741a64..87413474e0c 100644
--- a/storage/myisammrg/myrg_static.c
+++ b/storage/myisammrg/myrg_static.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 */
 
 /*
   Static variables for pisam library. All definied here for easy making of
diff --git a/storage/myisammrg/myrg_update.c b/storage/myisammrg/myrg_update.c
index add6f9f819b..c70bde07db8 100644
--- a/storage/myisammrg/myrg_update.c
+++ b/storage/myisammrg/myrg_update.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 */
 
 /* Update last read record */
 
diff --git a/storage/myisammrg/myrg_write.c b/storage/myisammrg/myrg_write.c
index dbe3142c43e..eb496911a52 100644
--- a/storage/myisammrg/myrg_write.c
+++ b/storage/myisammrg/myrg_write.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 */
 
 /* Write a row to a MyISAM MERGE table */
 
diff --git a/storage/ndb/Makefile.am b/storage/ndb/Makefile.am
index 4c97046f353..71045e9e1b0 100644
--- a/storage/ndb/Makefile.am
+++ b/storage/ndb/Makefile.am
@@ -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
 
 SUBDIRS = src tools . include @ndb_opt_subdirs@
 DIST_SUBDIRS = src tools include test docs
diff --git a/storage/ndb/config/common.mk.am b/storage/ndb/config/common.mk.am
index 40caeabd3b9..6a2c5de918d 100644
--- a/storage/ndb/config/common.mk.am
+++ b/storage/ndb/config/common.mk.am
@@ -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
 
 ndbbindir        = "$(libexecdir)"
 ndbtoolsdir      = "$(bindir)"
diff --git a/storage/ndb/config/make-win-dsw.sh b/storage/ndb/config/make-win-dsw.sh
index d56914b3450..6eca9e4f94c 100755
--- a/storage/ndb/config/make-win-dsw.sh
+++ b/storage/ndb/config/make-win-dsw.sh
@@ -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
 
 cat <
 #include 
diff --git a/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp b/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp
index 622b90a6f8b..a6a93ea01bd 100644
--- a/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp
+++ b/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp b/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp
index 5821dc88c2c..9b858a4075c 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp
@@ -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 */
 
 
 /**
diff --git a/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp b/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp
index 323ba713a8a..e65e86a01a4 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp
@@ -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 */
 
 //
 //  ndbapi_async1.cpp: Using asynchronous transactions in NDB API
diff --git a/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp b/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp
index 70e899c5d7c..4cdb6b028af 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp
@@ -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 */
 
 /**
  *  ndbapi_event.cpp: Using API level events in NDB API
diff --git a/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp b/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp
index 6a6acb1068c..184bce5ebf8 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp
@@ -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 */
 
 // 
 //  ndbapi_retries.cpp: Error handling and transaction retries
diff --git a/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp b/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp
index 6024d3b349f..e343ccb6056 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp
@@ -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 */
 
 
 /*
diff --git a/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp b/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp
index b72397f20f9..098f856acbc 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp
@@ -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 */
 
 /* 
  *  ndbapi_simple.cpp: Using synchronous transactions in NDB API
diff --git a/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp b/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp
index fb91d1d2120..56ea4fc4162 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp
@@ -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 */
 
 /* 
  *  ndbapi_simple_dual.cpp: Using synchronous transactions in NDB API
diff --git a/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp b/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
index 8504dc3511c..5c568f30257 100644
--- a/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
@@ -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 */
 
 // 
 //  ndbapi_simple_index.cpp: Using secondary indexes in NDB API
diff --git a/storage/ndb/src/Makefile.am b/storage/ndb/src/Makefile.am
index 33bad49575d..f4d2824f4c4 100644
--- a/storage/ndb/src/Makefile.am
+++ b/storage/ndb/src/Makefile.am
@@ -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
 
 SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw
 
diff --git a/storage/ndb/src/common/Makefile.am b/storage/ndb/src/common/Makefile.am
index d9d55b26eed..f2e717e0ecb 100644
--- a/storage/ndb/src/common/Makefile.am
+++ b/storage/ndb/src/common/Makefile.am
@@ -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
 
 SUBDIRS =	portlib debugger util logger transporter mgmcommon
 
diff --git a/storage/ndb/src/common/debugger/BlockNames.cpp b/storage/ndb/src/common/debugger/BlockNames.cpp
index b9e1b5bb617..e2be71dbea6 100644
--- a/storage/ndb/src/common/debugger/BlockNames.cpp
+++ b/storage/ndb/src/common/debugger/BlockNames.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/DebuggerNames.cpp b/storage/ndb/src/common/debugger/DebuggerNames.cpp
index 3c0b113d2f4..56233d4dd94 100644
--- a/storage/ndb/src/common/debugger/DebuggerNames.cpp
+++ b/storage/ndb/src/common/debugger/DebuggerNames.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/debugger/EventLogger.cpp b/storage/ndb/src/common/debugger/EventLogger.cpp
index cb42250dbd8..f36eb446238 100644
--- a/storage/ndb/src/common/debugger/EventLogger.cpp
+++ b/storage/ndb/src/common/debugger/EventLogger.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/GrepError.cpp b/storage/ndb/src/common/debugger/GrepError.cpp
index 8bb2bce64ed..dfbbbdc77bc 100644
--- a/storage/ndb/src/common/debugger/GrepError.cpp
+++ b/storage/ndb/src/common/debugger/GrepError.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/Makefile.am b/storage/ndb/src/common/debugger/Makefile.am
index fa6df2a2626..fc67d6ba2fd 100644
--- a/storage/ndb/src/common/debugger/Makefile.am
+++ b/storage/ndb/src/common/debugger/Makefile.am
@@ -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
 
 SUBDIRS = signaldata
 
diff --git a/storage/ndb/src/common/debugger/SignalLoggerManager.cpp b/storage/ndb/src/common/debugger/SignalLoggerManager.cpp
index a5a4f8a1f89..7184afe5439 100644
--- a/storage/ndb/src/common/debugger/SignalLoggerManager.cpp
+++ b/storage/ndb/src/common/debugger/SignalLoggerManager.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/AccLock.cpp b/storage/ndb/src/common/debugger/signaldata/AccLock.cpp
index 918e1dd4e8a..d595b953d27 100644
--- a/storage/ndb/src/common/debugger/signaldata/AccLock.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AccLock.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp b/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp
index 12bfe687366..e28a694fe7d 100644
--- a/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp b/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp
index a2ea11249a7..8d8abd3c545 100644
--- a/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp b/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp
index e58338122af..d05602be89e 100644
--- a/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp b/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp
index 467ebdbe12c..cdaf458ebe7 100644
--- a/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp b/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp
index c399959830d..d0d3bd3b474 100644
--- a/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp b/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp
index 04d84cc5b34..9372c4e9f94 100644
--- a/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp b/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
index 771f3d884f7..fa6a8da73e9 100644
--- a/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp b/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp
index cc092b478a5..47a5259ea46 100644
--- a/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp b/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp
index c00f9ce274e..5f06806f2a2 100644
--- a/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp b/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp
index 1bce63a3d0f..81d05b2413e 100644
--- a/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp b/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp
index 49cf2d8d4f3..a033f7e0ad2 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp b/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp
index 524b2678c74..1e573eb9d9e 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp b/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp
index 46ea8e27449..7e1657e635d 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp b/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp
index 1ed3b940f29..18012de8721 100644
--- a/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp b/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
index 264997d7766..f1a4dc410e0 100644
--- a/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp b/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp
index 67c6dc2afd0..a78c8cf6c17 100644
--- a/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp b/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp
index 6dc5fb17b26..44401330904 100644
--- a/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp b/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp
index 5fe3d62c22a..c424a20a708 100644
--- a/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp
@@ -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/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp b/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp
index 3c2dd03aafc..5afbb937328 100644
--- a/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/DropTab.cpp b/storage/ndb/src/common/debugger/signaldata/DropTab.cpp
index 0666c6ae5c9..2e10c0bf332 100644
--- a/storage/ndb/src/common/debugger/signaldata/DropTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropTab.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp b/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp
index 6127d7c8d7a..c96161921cd 100644
--- a/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/FailRep.cpp b/storage/ndb/src/common/debugger/signaldata/FailRep.cpp
index f5f053d8ddb..69ba83bee78 100644
--- a/storage/ndb/src/common/debugger/signaldata/FailRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FailRep.cpp
@@ -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/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp b/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp
index 8584003a601..1723de8ffe9 100644
--- a/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp b/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp
index ea00573afbf..f57e2f24782 100644
--- a/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp
@@ -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/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp b/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp
index 44ae70096fa..d68a0761cad 100644
--- a/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp
@@ -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/storage/ndb/src/common/debugger/signaldata/FsConf.cpp b/storage/ndb/src/common/debugger/signaldata/FsConf.cpp
index 338920dffb6..82bb364b13c 100644
--- a/storage/ndb/src/common/debugger/signaldata/FsConf.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsConf.cpp
@@ -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/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp b/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp
index 4c270fee211..e7a4f4ccf52 100644
--- a/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp
@@ -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/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp b/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
index b146b150baf..ee9b13ccfaa 100644
--- a/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
@@ -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/storage/ndb/src/common/debugger/signaldata/FsRef.cpp b/storage/ndb/src/common/debugger/signaldata/FsRef.cpp
index de48b36855e..64c4d669a1a 100644
--- a/storage/ndb/src/common/debugger/signaldata/FsRef.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsRef.cpp
@@ -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/storage/ndb/src/common/debugger/signaldata/GCPSave.cpp b/storage/ndb/src/common/debugger/signaldata/GCPSave.cpp
index c0a13acf783..1205dbda187 100644
--- a/storage/ndb/src/common/debugger/signaldata/GCPSave.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/GCPSave.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp b/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp
index 39197fae04a..ef5b195e1c2 100755
--- a/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp b/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp
index 24abc4e9a1d..2b2dfdb3b1c 100755
--- a/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/LCP.cpp b/storage/ndb/src/common/debugger/signaldata/LCP.cpp
index 7c39322cdf0..4afc85ebbbb 100644
--- a/storage/ndb/src/common/debugger/signaldata/LCP.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LCP.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp b/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp
index 94d83a58d61..dd88ed24f95 100644
--- a/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp b/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp
index 9db9d47d6ac..4dcceb1e637 100644
--- a/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp b/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
index 5f72b6a056d..aa3b3190cae 100644
--- a/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/Makefile.am b/storage/ndb/src/common/debugger/signaldata/Makefile.am
index b6d7dd6736d..176350b3064 100644
--- a/storage/ndb/src/common/debugger/signaldata/Makefile.am
+++ b/storage/ndb/src/common/debugger/signaldata/Makefile.am
@@ -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
 
 noinst_LTLIBRARIES = libsignaldataprint.la
 
diff --git a/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp b/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp
index 77f348a63e0..46b2c1f23a1 100644
--- a/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp b/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp
index 74735546320..2c5b8a2171c 100644
--- a/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp b/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp
index 480ee078d2e..59083f80dd2 100644
--- a/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp b/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp
index 190e755c731..5692cc3457c 100644
--- a/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp b/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
index 62de2a04f08..a6263fb9866 100644
--- a/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp b/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp
index df2f3323795..9f4e8505aee 100644
--- a/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp b/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
index cf4afae6bc2..fb60958c6ec 100644
--- a/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp b/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp
index 6457e2795c9..7d5266c0998 100644
--- a/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp b/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
index f4a63dbdf0c..f2dbbce156f 100644
--- a/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
@@ -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/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp b/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
index ca531c2863c..ec2bd93f228 100644
--- a/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
@@ -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/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp b/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
index 276090f33d7..94d703c850f 100644
--- a/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
@@ -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/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp b/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp
index 2ef807fa28b..ab4a8fb6a3c 100644
--- a/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp b/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
index 789a30931c9..5ff2dbbd1e6 100644
--- a/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/StartRec.cpp b/storage/ndb/src/common/debugger/signaldata/StartRec.cpp
index 387b4085b12..08c360bdbfe 100644
--- a/storage/ndb/src/common/debugger/signaldata/StartRec.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/StartRec.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp b/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
index 34bd8aa41e6..0fdc555d179 100644
--- a/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/SystemError.cpp b/storage/ndb/src/common/debugger/signaldata/SystemError.cpp
index 175ef091aaf..bb632d7eeaf 100644
--- a/storage/ndb/src/common/debugger/signaldata/SystemError.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SystemError.cpp
@@ -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 
diff --git a/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp b/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp
index 0927287d95c..cb3398e430c 100644
--- a/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp b/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp
index 47695d914cc..8ead39a67c3 100644
--- a/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp b/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp
index fdfe10e4a30..f6afa330c37 100644
--- a/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp b/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
index 793fa557dd6..845ed6c2b17 100644
--- a/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
@@ -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/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp b/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp
index c96669303db..f2319ad9728 100644
--- a/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp b/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp
index 51abfb5a2f2..91ebbef0f68 100644
--- a/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp b/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp
index e6dcfef5c8f..28add4c322c 100644
--- a/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/TupKey.cpp b/storage/ndb/src/common/debugger/signaldata/TupKey.cpp
index 9290e942311..0443703fe19 100644
--- a/storage/ndb/src/common/debugger/signaldata/TupKey.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TupKey.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp b/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp
index 6aa5e2a8d06..42b11ebe385 100644
--- a/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp b/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp
index 8cdb6fb38b8..72e4856aefa 100644
--- a/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp b/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
index 1e3cf1f255a..5dd8369ac16 100644
--- a/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp b/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp
index a10e490fa53..01be915b360 100644
--- a/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp b/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp
index ee0234561b6..f26df34cc82 100644
--- a/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp b/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp
index 2533d1b870e..2e134836e0a 100644
--- a/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/debugger/signaldata/print.awk b/storage/ndb/src/common/debugger/signaldata/print.awk
index ac65348170e..477310e7c37 100644
--- a/storage/ndb/src/common/debugger/signaldata/print.awk
+++ b/storage/ndb/src/common/debugger/signaldata/print.awk
@@ -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
 
 BEGIN {
   m_curr="";
diff --git a/storage/ndb/src/common/logger/ConsoleLogHandler.cpp b/storage/ndb/src/common/logger/ConsoleLogHandler.cpp
index ddfc9a85a5b..23224087af1 100644
--- a/storage/ndb/src/common/logger/ConsoleLogHandler.cpp
+++ b/storage/ndb/src/common/logger/ConsoleLogHandler.cpp
@@ -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 "ConsoleLogHandler.hpp"
 
diff --git a/storage/ndb/src/common/logger/FileLogHandler.cpp b/storage/ndb/src/common/logger/FileLogHandler.cpp
index b2b8b7c7b31..1eeadeab2cd 100644
--- a/storage/ndb/src/common/logger/FileLogHandler.cpp
+++ b/storage/ndb/src/common/logger/FileLogHandler.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/logger/LogHandler.cpp b/storage/ndb/src/common/logger/LogHandler.cpp
index 4e8ad49d56d..b3bb90f03b7 100644
--- a/storage/ndb/src/common/logger/LogHandler.cpp
+++ b/storage/ndb/src/common/logger/LogHandler.cpp
@@ -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 "LogHandler.hpp"
 
diff --git a/storage/ndb/src/common/logger/LogHandlerList.cpp b/storage/ndb/src/common/logger/LogHandlerList.cpp
index c954d20cb96..ac0a6b3b221 100644
--- a/storage/ndb/src/common/logger/LogHandlerList.cpp
+++ b/storage/ndb/src/common/logger/LogHandlerList.cpp
@@ -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 "LogHandlerList.hpp"
 
diff --git a/storage/ndb/src/common/logger/LogHandlerList.hpp b/storage/ndb/src/common/logger/LogHandlerList.hpp
index 0552521d108..a828662d48a 100644
--- a/storage/ndb/src/common/logger/LogHandlerList.hpp
+++ b/storage/ndb/src/common/logger/LogHandlerList.hpp
@@ -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 LOGHANDLERLIST_H
 #define LOGHANDLERLIST_H
diff --git a/storage/ndb/src/common/logger/Logger.cpp b/storage/ndb/src/common/logger/Logger.cpp
index 0c8b2aefc7b..c03f82cfa22 100644
--- a/storage/ndb/src/common/logger/Logger.cpp
+++ b/storage/ndb/src/common/logger/Logger.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/logger/Makefile.am b/storage/ndb/src/common/logger/Makefile.am
index 5dd1e14b649..6cc4928323d 100644
--- a/storage/ndb/src/common/logger/Makefile.am
+++ b/storage/ndb/src/common/logger/Makefile.am
@@ -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
 
 noinst_LTLIBRARIES = liblogger.la
 
diff --git a/storage/ndb/src/common/logger/SysLogHandler.cpp b/storage/ndb/src/common/logger/SysLogHandler.cpp
index e4a0de92de5..099b4f6de25 100644
--- a/storage/ndb/src/common/logger/SysLogHandler.cpp
+++ b/storage/ndb/src/common/logger/SysLogHandler.cpp
@@ -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 "SysLogHandler.hpp"
 
diff --git a/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp b/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp
index 725eca59869..88d2482f52e 100644
--- a/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp
+++ b/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp b/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp
index d2d040c25da..aff9f0896d9 100644
--- a/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp
+++ b/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp
@@ -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 LOGHANDLERLISTUNITTEST_H
 #define LOGHANDLERLISTUNITTEST_H
diff --git a/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp b/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp
index 60ad595c50f..f5c5baf0abc 100644
--- a/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp
+++ b/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp
@@ -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 "LoggerUnitTest.hpp"
 
diff --git a/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp b/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp
index 0faab97d2c1..2e4f5f719d0 100644
--- a/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp
+++ b/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp
@@ -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 LOGGERUNITTEST_H
 #define LOGGERUNITTEST_H
diff --git a/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp b/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
index b4409c4ff8e..2629507c584 100644
--- a/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
+++ b/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/mgmcommon/IPCConfig.cpp b/storage/ndb/src/common/mgmcommon/IPCConfig.cpp
index 31444953e70..ec762db8432 100644
--- a/storage/ndb/src/common/mgmcommon/IPCConfig.cpp
+++ b/storage/ndb/src/common/mgmcommon/IPCConfig.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/mgmcommon/Makefile.am b/storage/ndb/src/common/mgmcommon/Makefile.am
index 4dc2d367550..d96df600885 100644
--- a/storage/ndb/src/common/mgmcommon/Makefile.am
+++ b/storage/ndb/src/common/mgmcommon/Makefile.am
@@ -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
 
 noinst_LTLIBRARIES = libmgmsrvcommon.la
 
diff --git a/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp b/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp
index feabc2168ac..98fe0b6d2f1 100644
--- a/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp
+++ b/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp
@@ -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 
diff --git a/storage/ndb/src/common/portlib/Makefile.am b/storage/ndb/src/common/portlib/Makefile.am
index e474764e69f..c7c1acb3c49 100644
--- a/storage/ndb/src/common/portlib/Makefile.am
+++ b/storage/ndb/src/common/portlib/Makefile.am
@@ -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
 
 noinst_LTLIBRARIES = libportlib.la
 
diff --git a/storage/ndb/src/common/portlib/NdbCondition.c b/storage/ndb/src/common/portlib/NdbCondition.c
index 451e5f8ac8c..2c6ca1b334c 100644
--- a/storage/ndb/src/common/portlib/NdbCondition.c
+++ b/storage/ndb/src/common/portlib/NdbCondition.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 */
 
 
 #include 
diff --git a/storage/ndb/src/common/portlib/NdbConfig.c b/storage/ndb/src/common/portlib/NdbConfig.c
index da4fc997750..f0b392d8d94 100644
--- a/storage/ndb/src/common/portlib/NdbConfig.c
+++ b/storage/ndb/src/common/portlib/NdbConfig.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 */
 
 #include 
 #include 
diff --git a/storage/ndb/src/common/portlib/NdbDaemon.c b/storage/ndb/src/common/portlib/NdbDaemon.c
index 22d59925db7..c171abe58fc 100644
--- a/storage/ndb/src/common/portlib/NdbDaemon.c
+++ b/storage/ndb/src/common/portlib/NdbDaemon.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 */
 
 #include 
 #include "NdbDaemon.h"
diff --git a/storage/ndb/src/common/portlib/NdbEnv.c b/storage/ndb/src/common/portlib/NdbEnv.c
index 43a06d8352d..d991bf27502 100644
--- a/storage/ndb/src/common/portlib/NdbEnv.c
+++ b/storage/ndb/src/common/portlib/NdbEnv.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 */
 
 
 #include 
diff --git a/storage/ndb/src/common/portlib/NdbHost.c b/storage/ndb/src/common/portlib/NdbHost.c
index 4ac92d121c1..ed86f3d69f7 100644
--- a/storage/ndb/src/common/portlib/NdbHost.c
+++ b/storage/ndb/src/common/portlib/NdbHost.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 */
 
 
 #include 
diff --git a/storage/ndb/src/common/portlib/NdbMem.c b/storage/ndb/src/common/portlib/NdbMem.c
index c89e0747a8c..2ddc3798459 100644
--- a/storage/ndb/src/common/portlib/NdbMem.c
+++ b/storage/ndb/src/common/portlib/NdbMem.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 */
 
 
 #include 
diff --git a/storage/ndb/src/common/portlib/NdbMutex.c b/storage/ndb/src/common/portlib/NdbMutex.c
index 77a3e55e0b0..6e2aa362a37 100644
--- a/storage/ndb/src/common/portlib/NdbMutex.c
+++ b/storage/ndb/src/common/portlib/NdbMutex.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  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 
 #include 
diff --git a/storage/ndb/src/common/portlib/NdbPortLibTest.cpp b/storage/ndb/src/common/portlib/NdbPortLibTest.cpp
index 87f9246e171..4ffc66e063c 100644
--- a/storage/ndb/src/common/portlib/NdbPortLibTest.cpp
+++ b/storage/ndb/src/common/portlib/NdbPortLibTest.cpp
@@ -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 */
 
 /**
  *  NdbPortLibTest.cpp
diff --git a/storage/ndb/src/common/portlib/NdbSleep.c b/storage/ndb/src/common/portlib/NdbSleep.c
index d15cdd058d2..6fcd5599655 100644
--- a/storage/ndb/src/common/portlib/NdbSleep.c
+++ b/storage/ndb/src/common/portlib/NdbSleep.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 */
 
 
 #include 
diff --git a/storage/ndb/src/common/portlib/NdbTCP.cpp b/storage/ndb/src/common/portlib/NdbTCP.cpp
index d2bfa96e009..4d35bc2e5bb 100644
--- a/storage/ndb/src/common/portlib/NdbTCP.cpp
+++ b/storage/ndb/src/common/portlib/NdbTCP.cpp
@@ -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 
diff --git a/storage/ndb/src/common/portlib/NdbThread.c b/storage/ndb/src/common/portlib/NdbThread.c
index 01f08a2505a..f9c8ea81c46 100644
--- a/storage/ndb/src/common/portlib/NdbThread.c
+++ b/storage/ndb/src/common/portlib/NdbThread.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 */
 
 
 #include 
diff --git a/storage/ndb/src/common/portlib/NdbTick.c b/storage/ndb/src/common/portlib/NdbTick.c
index 1e46664b663..7959279e4fd 100644
--- a/storage/ndb/src/common/portlib/NdbTick.c
+++ b/storage/ndb/src/common/portlib/NdbTick.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 */
 
 
 #include 
diff --git a/storage/ndb/src/common/portlib/memtest.c b/storage/ndb/src/common/portlib/memtest.c
index 37d87de90e7..12ca07729b5 100644
--- a/storage/ndb/src/common/portlib/memtest.c
+++ b/storage/ndb/src/common/portlib/memtest.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 */
 
 
 
diff --git a/storage/ndb/src/common/portlib/mmstest.cpp b/storage/ndb/src/common/portlib/mmstest.cpp
index adfef7b3ccd..4b1383c5bc6 100644
--- a/storage/ndb/src/common/portlib/mmstest.cpp
+++ b/storage/ndb/src/common/portlib/mmstest.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/portlib/munmaptest.cpp b/storage/ndb/src/common/portlib/munmaptest.cpp
index 7977dc88634..b31aa77b875 100644
--- a/storage/ndb/src/common/portlib/munmaptest.cpp
+++ b/storage/ndb/src/common/portlib/munmaptest.cpp
@@ -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/storage/ndb/src/common/portlib/win32/NdbCondition.c b/storage/ndb/src/common/portlib/win32/NdbCondition.c
index e6ad8d2d257..1e1beb0c725 100644
--- a/storage/ndb/src/common/portlib/win32/NdbCondition.c
+++ b/storage/ndb/src/common/portlib/win32/NdbCondition.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 */
 
 
 #include 
diff --git a/storage/ndb/src/common/portlib/win32/NdbDaemon.c b/storage/ndb/src/common/portlib/win32/NdbDaemon.c
index 00fa8ea4591..b8b9ab5d055 100644
--- a/storage/ndb/src/common/portlib/win32/NdbDaemon.c
+++ b/storage/ndb/src/common/portlib/win32/NdbDaemon.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 */
 
 #include "NdbDaemon.h"
 
diff --git a/storage/ndb/src/common/portlib/win32/NdbEnv.c b/storage/ndb/src/common/portlib/win32/NdbEnv.c
index 7ebee73ae02..71ab3d5ef95 100644
--- a/storage/ndb/src/common/portlib/win32/NdbEnv.c
+++ b/storage/ndb/src/common/portlib/win32/NdbEnv.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 */
 
 #include 
 #include "NdbEnv.h"
diff --git a/storage/ndb/src/common/portlib/win32/NdbHost.c b/storage/ndb/src/common/portlib/win32/NdbHost.c
index 220c080ed4b..23c5cdebdac 100644
--- a/storage/ndb/src/common/portlib/win32/NdbHost.c
+++ b/storage/ndb/src/common/portlib/win32/NdbHost.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 */
 
 
 #include 
diff --git a/storage/ndb/src/common/portlib/win32/NdbMem.c b/storage/ndb/src/common/portlib/win32/NdbMem.c
index 0cf1b5f018e..bf233164f5a 100644
--- a/storage/ndb/src/common/portlib/win32/NdbMem.c
+++ b/storage/ndb/src/common/portlib/win32/NdbMem.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 */
 
 #include 
 #include "NdbMem.h"
diff --git a/storage/ndb/src/common/portlib/win32/NdbMutex.c b/storage/ndb/src/common/portlib/win32/NdbMutex.c
index 8ddfd43a283..f9563aba658 100644
--- a/storage/ndb/src/common/portlib/win32/NdbMutex.c
+++ b/storage/ndb/src/common/portlib/win32/NdbMutex.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 */
 
 
 #include 
diff --git a/storage/ndb/src/common/portlib/win32/NdbSleep.c b/storage/ndb/src/common/portlib/win32/NdbSleep.c
index 2d87cd88234..b998d97b2b3 100644
--- a/storage/ndb/src/common/portlib/win32/NdbSleep.c
+++ b/storage/ndb/src/common/portlib/win32/NdbSleep.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 */
 
 #include 
 #include "NdbSleep.h"
diff --git a/storage/ndb/src/common/portlib/win32/NdbTCP.c b/storage/ndb/src/common/portlib/win32/NdbTCP.c
index 75e9345a150..f2ecb935ec0 100644
--- a/storage/ndb/src/common/portlib/win32/NdbTCP.c
+++ b/storage/ndb/src/common/portlib/win32/NdbTCP.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 */
 
 #include 
 #include "NdbTCP.h"
diff --git a/storage/ndb/src/common/portlib/win32/NdbThread.c b/storage/ndb/src/common/portlib/win32/NdbThread.c
index 98c8e472fcd..7ae7a358fa6 100644
--- a/storage/ndb/src/common/portlib/win32/NdbThread.c
+++ b/storage/ndb/src/common/portlib/win32/NdbThread.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 */
 
 #include 
 #include "NdbThread.h"
diff --git a/storage/ndb/src/common/portlib/win32/NdbTick.c b/storage/ndb/src/common/portlib/win32/NdbTick.c
index a4157f14fa4..a28f1b58218 100644
--- a/storage/ndb/src/common/portlib/win32/NdbTick.c
+++ b/storage/ndb/src/common/portlib/win32/NdbTick.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 */
 
 #include 
 #include "NdbTick.h"
diff --git a/storage/ndb/src/common/transporter/Makefile.am b/storage/ndb/src/common/transporter/Makefile.am
index a8374d69662..0b376109dad 100644
--- a/storage/ndb/src/common/transporter/Makefile.am
+++ b/storage/ndb/src/common/transporter/Makefile.am
@@ -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
 
 noinst_LTLIBRARIES = libtransporter.la
 
diff --git a/storage/ndb/src/common/transporter/Packer.cpp b/storage/ndb/src/common/transporter/Packer.cpp
index 9fb9f77fc7c..fcdb1a1164a 100644
--- a/storage/ndb/src/common/transporter/Packer.cpp
+++ b/storage/ndb/src/common/transporter/Packer.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/transporter/Packer.hpp b/storage/ndb/src/common/transporter/Packer.hpp
index f3d93a2d87e..cd2175c5fbb 100644
--- a/storage/ndb/src/common/transporter/Packer.hpp
+++ b/storage/ndb/src/common/transporter/Packer.hpp
@@ -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 PACKER_HPP
 #define PACKER_HPP
diff --git a/storage/ndb/src/common/transporter/SCI_Transporter.cpp b/storage/ndb/src/common/transporter/SCI_Transporter.cpp
index 5e79009c0e7..8230f229c8a 100644
--- a/storage/ndb/src/common/transporter/SCI_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/SCI_Transporter.cpp
@@ -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  
 
diff --git a/storage/ndb/src/common/transporter/SCI_Transporter.hpp b/storage/ndb/src/common/transporter/SCI_Transporter.hpp
index 5135ba7a83b..e8f5c069955 100644
--- a/storage/ndb/src/common/transporter/SCI_Transporter.hpp
+++ b/storage/ndb/src/common/transporter/SCI_Transporter.hpp
@@ -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 SCI_Transporter_H 
 #define SCI_Transporter_H 
diff --git a/storage/ndb/src/common/transporter/SHM_Buffer.hpp b/storage/ndb/src/common/transporter/SHM_Buffer.hpp
index 5e900170318..741a20ad9ad 100644
--- a/storage/ndb/src/common/transporter/SHM_Buffer.hpp
+++ b/storage/ndb/src/common/transporter/SHM_Buffer.hpp
@@ -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 SHM_BUFFER_HPP
 #define SHM_BUFFER_HPP
diff --git a/storage/ndb/src/common/transporter/SHM_Transporter.cpp b/storage/ndb/src/common/transporter/SHM_Transporter.cpp
index 649891a8ad7..e86c57a845d 100644
--- a/storage/ndb/src/common/transporter/SHM_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.cpp
@@ -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 
diff --git a/storage/ndb/src/common/transporter/SHM_Transporter.hpp b/storage/ndb/src/common/transporter/SHM_Transporter.hpp
index d9eef794001..13948ca9a7c 100644
--- a/storage/ndb/src/common/transporter/SHM_Transporter.hpp
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.hpp
@@ -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 SHM_Transporter_H
 #define SHM_Transporter_H
diff --git a/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp b/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp
index cc9c5e7cb19..a622a9f4d0b 100644
--- a/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp
@@ -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 
diff --git a/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp b/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp
index 78b1d367ef5..331c4ab2e6f 100644
--- a/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp
@@ -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 
diff --git a/storage/ndb/src/common/transporter/SendBuffer.cpp b/storage/ndb/src/common/transporter/SendBuffer.cpp
index 7e62ebaa91c..9dd2c1a1c94 100644
--- a/storage/ndb/src/common/transporter/SendBuffer.cpp
+++ b/storage/ndb/src/common/transporter/SendBuffer.cpp
@@ -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 "SendBuffer.hpp"
 #include "TransporterInternalDefinitions.hpp"
diff --git a/storage/ndb/src/common/transporter/SendBuffer.hpp b/storage/ndb/src/common/transporter/SendBuffer.hpp
index 8d772aa4dbc..fe1447fab53 100644
--- a/storage/ndb/src/common/transporter/SendBuffer.hpp
+++ b/storage/ndb/src/common/transporter/SendBuffer.hpp
@@ -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/storage/ndb/src/common/transporter/TCP_Transporter.cpp b/storage/ndb/src/common/transporter/TCP_Transporter.cpp
index 768b4f4a052..bf2fb9a335f 100644
--- a/storage/ndb/src/common/transporter/TCP_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/TCP_Transporter.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/transporter/TCP_Transporter.hpp b/storage/ndb/src/common/transporter/TCP_Transporter.hpp
index 64b48d741a6..1fdb2596b04 100644
--- a/storage/ndb/src/common/transporter/TCP_Transporter.hpp
+++ b/storage/ndb/src/common/transporter/TCP_Transporter.hpp
@@ -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 TCP_TRANSPORTER_HPP
 #define TCP_TRANSPORTER_HPP
diff --git a/storage/ndb/src/common/transporter/Transporter.cpp b/storage/ndb/src/common/transporter/Transporter.cpp
index fe43124ad86..d3c26345aef 100644
--- a/storage/ndb/src/common/transporter/Transporter.cpp
+++ b/storage/ndb/src/common/transporter/Transporter.cpp
@@ -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 
diff --git a/storage/ndb/src/common/transporter/Transporter.hpp b/storage/ndb/src/common/transporter/Transporter.hpp
index 28f99e9170d..ca367d0b520 100644
--- a/storage/ndb/src/common/transporter/Transporter.hpp
+++ b/storage/ndb/src/common/transporter/Transporter.hpp
@@ -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 Transporter_H
 #define Transporter_H
diff --git a/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp b/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp
index 251e46a6f16..a9851149e6e 100644
--- a/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp
+++ b/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp
@@ -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 TransporterInternalDefinitions_H
 #define TransporterInternalDefinitions_H
diff --git a/storage/ndb/src/common/transporter/TransporterRegistry.cpp b/storage/ndb/src/common/transporter/TransporterRegistry.cpp
index e820322f96e..afe7243f3fd 100644
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp b/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp
index b4b3e638935..3b8fa106e65 100644
--- a/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp
+++ b/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/transporter/buddy.cpp b/storage/ndb/src/common/transporter/buddy.cpp
index 342ef88a6d2..3336992b506 100644
--- a/storage/ndb/src/common/transporter/buddy.cpp
+++ b/storage/ndb/src/common/transporter/buddy.cpp
@@ -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 "buddy.hpp"
 
diff --git a/storage/ndb/src/common/transporter/buddy.hpp b/storage/ndb/src/common/transporter/buddy.hpp
index 2494a874f92..f0af6dcc55e 100644
--- a/storage/ndb/src/common/transporter/buddy.hpp
+++ b/storage/ndb/src/common/transporter/buddy.hpp
@@ -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 BUDDY_H
 #define BUDDY_H
diff --git a/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp b/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp
index b32c839c3b4..8c00277d80d 100644
--- a/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp
+++ b/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp b/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp
index 3aca596ea70..ad422358aeb 100644
--- a/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp
+++ b/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp b/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp
index 2d8ee8de979..92e8583dcdb 100644
--- a/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp
+++ b/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp
@@ -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 
diff --git a/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp b/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp
index 4447576987b..470336f53e0 100644
--- a/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp
+++ b/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp
@@ -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 
diff --git a/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp b/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp
index ddd549b9818..a8f71ac6a89 100644
--- a/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp
+++ b/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp
@@ -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 
diff --git a/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp b/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp
index 581bc88ac83..5d0e8f5ca86 100644
--- a/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp
+++ b/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp b/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp
index 518367b69ef..cb5f6deb5f5 100644
--- a/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp
+++ b/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp
@@ -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 PRIO_TRANSPORTER_TEST_HPP
 #define PRIO_TRANSPORTER_TEST_HPP
diff --git a/storage/ndb/src/common/util/BaseString.cpp b/storage/ndb/src/common/util/BaseString.cpp
index 019906c9ec6..12f78d9664f 100644
--- a/storage/ndb/src/common/util/BaseString.cpp
+++ b/storage/ndb/src/common/util/BaseString.cpp
@@ -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 */
 
 /* -*- c-basic-offset: 4; -*- */
 #include 
diff --git a/storage/ndb/src/common/util/Bitmask.cpp b/storage/ndb/src/common/util/Bitmask.cpp
index 7a73276b0a9..8e28afd5bb1 100644
--- a/storage/ndb/src/common/util/Bitmask.cpp
+++ b/storage/ndb/src/common/util/Bitmask.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/util/ConfigValues.cpp b/storage/ndb/src/common/util/ConfigValues.cpp
index 97ce4cccb5b..28212bcdf56 100644
--- a/storage/ndb/src/common/util/ConfigValues.cpp
+++ b/storage/ndb/src/common/util/ConfigValues.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/util/File.cpp b/storage/ndb/src/common/util/File.cpp
index 1aa7e7c8543..567cc268a97 100644
--- a/storage/ndb/src/common/util/File.cpp
+++ b/storage/ndb/src/common/util/File.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/util/InputStream.cpp b/storage/ndb/src/common/util/InputStream.cpp
index 2033cc6fb0c..2002c562512 100644
--- a/storage/ndb/src/common/util/InputStream.cpp
+++ b/storage/ndb/src/common/util/InputStream.cpp
@@ -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 
diff --git a/storage/ndb/src/common/util/Makefile.am b/storage/ndb/src/common/util/Makefile.am
index 4c469187645..ffbd1554d6e 100644
--- a/storage/ndb/src/common/util/Makefile.am
+++ b/storage/ndb/src/common/util/Makefile.am
@@ -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
 
 noinst_LTLIBRARIES = libgeneral.la
 
diff --git a/storage/ndb/src/common/util/NdbOut.cpp b/storage/ndb/src/common/util/NdbOut.cpp
index 8c6f94cec6c..08774b47ef8 100644
--- a/storage/ndb/src/common/util/NdbOut.cpp
+++ b/storage/ndb/src/common/util/NdbOut.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/util/NdbSqlUtil.cpp b/storage/ndb/src/common/util/NdbSqlUtil.cpp
index c50d3a93e3c..969f7bd9722 100644
--- a/storage/ndb/src/common/util/NdbSqlUtil.cpp
+++ b/storage/ndb/src/common/util/NdbSqlUtil.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/util/OutputStream.cpp b/storage/ndb/src/common/util/OutputStream.cpp
index 37487be29f0..e91caed7013 100644
--- a/storage/ndb/src/common/util/OutputStream.cpp
+++ b/storage/ndb/src/common/util/OutputStream.cpp
@@ -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 
diff --git a/storage/ndb/src/common/util/Parser.cpp b/storage/ndb/src/common/util/Parser.cpp
index b497b320a36..293b8e54163 100644
--- a/storage/ndb/src/common/util/Parser.cpp
+++ b/storage/ndb/src/common/util/Parser.cpp
@@ -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 
diff --git a/storage/ndb/src/common/util/Properties.cpp b/storage/ndb/src/common/util/Properties.cpp
index 8e36062dcea..5c7b1bedbae 100644
--- a/storage/ndb/src/common/util/Properties.cpp
+++ b/storage/ndb/src/common/util/Properties.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/util/SimpleProperties.cpp b/storage/ndb/src/common/util/SimpleProperties.cpp
index bb8c5821cd9..cb316d6d4a0 100644
--- a/storage/ndb/src/common/util/SimpleProperties.cpp
+++ b/storage/ndb/src/common/util/SimpleProperties.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/util/SocketAuthenticator.cpp b/storage/ndb/src/common/util/SocketAuthenticator.cpp
index 6741ff17d02..db1b9398c23 100644
--- a/storage/ndb/src/common/util/SocketAuthenticator.cpp
+++ b/storage/ndb/src/common/util/SocketAuthenticator.cpp
@@ -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 
diff --git a/storage/ndb/src/common/util/SocketClient.cpp b/storage/ndb/src/common/util/SocketClient.cpp
index 2c2a39a4b01..fcd56886a45 100644
--- a/storage/ndb/src/common/util/SocketClient.cpp
+++ b/storage/ndb/src/common/util/SocketClient.cpp
@@ -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 
diff --git a/storage/ndb/src/common/util/SocketServer.cpp b/storage/ndb/src/common/util/SocketServer.cpp
index 6c634886ad8..d2dde986755 100644
--- a/storage/ndb/src/common/util/SocketServer.cpp
+++ b/storage/ndb/src/common/util/SocketServer.cpp
@@ -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 
diff --git a/storage/ndb/src/common/util/basestring_vsnprintf.c b/storage/ndb/src/common/util/basestring_vsnprintf.c
index bfe7d7ca7a2..3f73dcaf709 100644
--- a/storage/ndb/src/common/util/basestring_vsnprintf.c
+++ b/storage/ndb/src/common/util/basestring_vsnprintf.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 */
 
 #ifdef __sgi
 /* define on IRIX to get posix compliant vsnprintf */
diff --git a/storage/ndb/src/common/util/filetest/FileUnitTest.cpp b/storage/ndb/src/common/util/filetest/FileUnitTest.cpp
index 8549fa26c7c..bf5fa1fd60f 100644
--- a/storage/ndb/src/common/util/filetest/FileUnitTest.cpp
+++ b/storage/ndb/src/common/util/filetest/FileUnitTest.cpp
@@ -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 "FileUnitTest.hpp"
 #include 
diff --git a/storage/ndb/src/common/util/filetest/FileUnitTest.hpp b/storage/ndb/src/common/util/filetest/FileUnitTest.hpp
index dc88c8984af..64127732d2b 100644
--- a/storage/ndb/src/common/util/filetest/FileUnitTest.hpp
+++ b/storage/ndb/src/common/util/filetest/FileUnitTest.hpp
@@ -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 FILEUNITTEST_H
 #define FILEUNITTEST_H
diff --git a/storage/ndb/src/common/util/md5_hash.cpp b/storage/ndb/src/common/util/md5_hash.cpp
index cf8c1bb86f0..13b2e1d0ac1 100644
--- a/storage/ndb/src/common/util/md5_hash.cpp
+++ b/storage/ndb/src/common/util/md5_hash.cpp
@@ -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/storage/ndb/src/common/util/ndb_init.c b/storage/ndb/src/common/util/ndb_init.c
index 4cf924840ff..30fe3e203c0 100644
--- a/storage/ndb/src/common/util/ndb_init.c
+++ b/storage/ndb/src/common/util/ndb_init.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 */
 
 #include 
 #include 
diff --git a/storage/ndb/src/common/util/ndb_rand.c b/storage/ndb/src/common/util/ndb_rand.c
index a8e922e8bc7..3e6afc8cef1 100644
--- a/storage/ndb/src/common/util/ndb_rand.c
+++ b/storage/ndb/src/common/util/ndb_rand.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 */
 
 #include 
 
diff --git a/storage/ndb/src/common/util/new.cpp b/storage/ndb/src/common/util/new.cpp
index e307e00d510..85cc8b0ec60 100644
--- a/storage/ndb/src/common/util/new.cpp
+++ b/storage/ndb/src/common/util/new.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/util/random.c b/storage/ndb/src/common/util/random.c
index e53501507c6..e33b136f85f 100644
--- a/storage/ndb/src/common/util/random.c
+++ b/storage/ndb/src/common/util/random.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 */
 
 /***************************************************************
 * I N C L U D E D   F I L E S                                  *
diff --git a/storage/ndb/src/common/util/socket_io.cpp b/storage/ndb/src/common/util/socket_io.cpp
index 2e0d9828fa0..b18c893e0a6 100644
--- a/storage/ndb/src/common/util/socket_io.cpp
+++ b/storage/ndb/src/common/util/socket_io.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/util/strdup.c b/storage/ndb/src/common/util/strdup.c
index 96b6df37712..7c2a45a03ab 100644
--- a/storage/ndb/src/common/util/strdup.c
+++ b/storage/ndb/src/common/util/strdup.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 */
 
 
 #include 
diff --git a/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp b/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp
index b21133a438a..e8c9c45f4a8 100644
--- a/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp
+++ b/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/common/util/testProperties/testProperties.cpp b/storage/ndb/src/common/util/testProperties/testProperties.cpp
index b6f7fcb84d5..26fd980e8b5 100644
--- a/storage/ndb/src/common/util/testProperties/testProperties.cpp
+++ b/storage/ndb/src/common/util/testProperties/testProperties.cpp
@@ -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 
 #include "Properties.hpp"
diff --git a/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp b/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp
index d3278c63b9d..2265e7d41d6 100644
--- a/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp
+++ b/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp
@@ -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 
 
diff --git a/storage/ndb/src/common/util/uucode.c b/storage/ndb/src/common/util/uucode.c
index b861e040a5e..281b26e514d 100644
--- a/storage/ndb/src/common/util/uucode.c
+++ b/storage/ndb/src/common/util/uucode.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 */
 
 
 #include 
diff --git a/storage/ndb/src/common/util/version.c b/storage/ndb/src/common/util/version.c
index 241d071b603..6cbb98a2357 100644
--- a/storage/ndb/src/common/util/version.c
+++ b/storage/ndb/src/common/util/version.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 */
 
 #include 
 #include 
diff --git a/storage/ndb/src/cw/Makefile.am b/storage/ndb/src/cw/Makefile.am
index f354846a5b6..a18c43afc28 100644
--- a/storage/ndb/src/cw/Makefile.am
+++ b/storage/ndb/src/cw/Makefile.am
@@ -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
 
 SUBDIRS = cpcd
 
diff --git a/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp
index 068416b2f15..8578d31fbda 100644
--- a/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp
+++ b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp
@@ -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 "stdafx.h"
 
diff --git a/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h
index bbf5115510a..0c5b4787750 100644
--- a/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h
+++ b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.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 */
 
 
 #if !defined(AFX_CPC_GUI_H__EA01C861_C56D_48F1_856F_4935E20620B1__INCLUDED_)
diff --git a/storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp b/storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp
index 63383ad0990..000a24efd75 100644
--- a/storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp
+++ b/storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp
@@ -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 "stdafx.h"
 #include "NdbControls.h"
diff --git a/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp b/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp
index d2b002c3d90..7c2372a61eb 100644
--- a/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp
+++ b/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp
@@ -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 */
 
 // stdafx.cpp : source file that includes just the standard includes
 //	CPC_GUI.pch will be the pre-compiled header
diff --git a/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h b/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h
index aedd535b205..5b1d03ccbd5 100644
--- a/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h
+++ b/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.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 */
 
 // stdafx.h : include file for standard system include files,
 //  or project specific include files that are used frequently, but
diff --git a/storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp b/storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp
index bcc7e67d06f..eeff4f516c0 100644
--- a/storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp
+++ b/storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp
@@ -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 "StdAfx.h"
 #include "resource.h"
diff --git a/storage/ndb/src/cw/cpcc-win32/C++/TreeView.h b/storage/ndb/src/cw/cpcc-win32/C++/TreeView.h
index 68859693228..d09d4c83318 100644
--- a/storage/ndb/src/cw/cpcc-win32/C++/TreeView.h
+++ b/storage/ndb/src/cw/cpcc-win32/C++/TreeView.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 */
 
 
 
diff --git a/storage/ndb/src/cw/cpcc-win32/C++/resource.h b/storage/ndb/src/cw/cpcc-win32/C++/resource.h
index 8270a3e9962..c37fa9a029f 100644
--- a/storage/ndb/src/cw/cpcc-win32/C++/resource.h
+++ b/storage/ndb/src/cw/cpcc-win32/C++/resource.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 */
 
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs b/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs
index c29998ff178..c2947922286 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs
@@ -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 */
 
 using System;
 using System.Drawing;
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs b/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs
index 879605dbd23..aeff8728e0f 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs
@@ -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 */
 
 using System;
 using System.Drawing;
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs
index bdd8b04c0ae..3e2696daf19 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs
@@ -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 */
 
 using System;
 using System.Drawing;
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs
index e2f32637a8c..46f932e839a 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs
@@ -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 */
 
 using System;
 using System.Drawing;
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs b/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs
index d08d3464b18..1166b214bda 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs
@@ -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 */
 
 using System;
 using System.Drawing;
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs b/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs
index e4cfc37e850..180960992a4 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs
@@ -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 */
 
 //author:Arun
 //date:Nov 13,2002
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs b/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs
index d861781c737..daa554d9a21 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs
@@ -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 */
 
 using System;
 using System.Drawing;
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs b/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs
index 814b820c53d..12da8de8b03 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs
@@ -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 */
 
 using System;
 using System.Drawing;
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs b/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs
index 246c108c661..ffd10d76a67 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs
@@ -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 */
 
 using System;
 using System.Text;
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs b/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs
index 1b55d2c2ab8..35f908738fc 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs
@@ -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 */
 
 using System;
 using System.Collections;
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs
index 34678086057..8438b3cc97d 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs
@@ -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 */
 
 using System;
 using System.Net;
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs
index 20d86477b3a..823d217946a 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs
@@ -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 */
 
 using System;
 using System.Net;
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs b/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs
index 9a702b9fc9e..0b6365bdeef 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs
@@ -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 */
 
 using System;
 using System.Drawing;
diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
index fda0fc937e1..1d21e9f2dc9 100644
--- a/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
@@ -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 */
 
 using System;
 using System.Drawing;
diff --git a/storage/ndb/src/cw/cpcd/APIService.cpp b/storage/ndb/src/cw/cpcd/APIService.cpp
index b8f2b7d5f05..be16e4dc512 100644
--- a/storage/ndb/src/cw/cpcd/APIService.cpp
+++ b/storage/ndb/src/cw/cpcd/APIService.cpp
@@ -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 
diff --git a/storage/ndb/src/cw/cpcd/APIService.hpp b/storage/ndb/src/cw/cpcd/APIService.hpp
index d6a45dc26a4..459b2e0705b 100644
--- a/storage/ndb/src/cw/cpcd/APIService.hpp
+++ b/storage/ndb/src/cw/cpcd/APIService.hpp
@@ -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 CPCD_API_HPP
 #define CPCD_API_HPP
diff --git a/storage/ndb/src/cw/cpcd/CPCD.cpp b/storage/ndb/src/cw/cpcd/CPCD.cpp
index 48e946f58b8..b4f87b0a6c5 100644
--- a/storage/ndb/src/cw/cpcd/CPCD.cpp
+++ b/storage/ndb/src/cw/cpcd/CPCD.cpp
@@ -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 
diff --git a/storage/ndb/src/cw/cpcd/CPCD.hpp b/storage/ndb/src/cw/cpcd/CPCD.hpp
index 3c2934c0f49..36cb180b0c9 100644
--- a/storage/ndb/src/cw/cpcd/CPCD.hpp
+++ b/storage/ndb/src/cw/cpcd/CPCD.hpp
@@ -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 CPCD_HPP
 #define CPCD_HPP
diff --git a/storage/ndb/src/cw/cpcd/Makefile.am b/storage/ndb/src/cw/cpcd/Makefile.am
index 58092dd6025..ef1dbd96112 100644
--- a/storage/ndb/src/cw/cpcd/Makefile.am
+++ b/storage/ndb/src/cw/cpcd/Makefile.am
@@ -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
 
 ndbbin_PROGRAMS = ndb_cpcd
 
diff --git a/storage/ndb/src/cw/cpcd/Monitor.cpp b/storage/ndb/src/cw/cpcd/Monitor.cpp
index c096bb85029..8a4c4e53b72 100644
--- a/storage/ndb/src/cw/cpcd/Monitor.cpp
+++ b/storage/ndb/src/cw/cpcd/Monitor.cpp
@@ -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 
 
diff --git a/storage/ndb/src/cw/cpcd/Process.cpp b/storage/ndb/src/cw/cpcd/Process.cpp
index c2e24cecd77..35e85155f7a 100644
--- a/storage/ndb/src/cw/cpcd/Process.cpp
+++ b/storage/ndb/src/cw/cpcd/Process.cpp
@@ -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 
 
diff --git a/storage/ndb/src/cw/cpcd/common.cpp b/storage/ndb/src/cw/cpcd/common.cpp
index 1a799bc2bd5..9825fb0aa17 100644
--- a/storage/ndb/src/cw/cpcd/common.cpp
+++ b/storage/ndb/src/cw/cpcd/common.cpp
@@ -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 
 
diff --git a/storage/ndb/src/cw/cpcd/common.hpp b/storage/ndb/src/cw/cpcd/common.hpp
index eb984696f00..d7f889879ae 100644
--- a/storage/ndb/src/cw/cpcd/common.hpp
+++ b/storage/ndb/src/cw/cpcd/common.hpp
@@ -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 __CPCD_COMMON_HPP_INCLUDED__
 #define __CPCD_COMMON_HPP_INCLUDED__
diff --git a/storage/ndb/src/cw/cpcd/main.cpp b/storage/ndb/src/cw/cpcd/main.cpp
index c90d0f43f1b..502aac347a7 100644
--- a/storage/ndb/src/cw/cpcd/main.cpp
+++ b/storage/ndb/src/cw/cpcd/main.cpp
@@ -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 	/* Needed for mkdir(2) */
 #include 
diff --git a/storage/ndb/src/cw/test/socketclient/socketClientTest.cpp b/storage/ndb/src/cw/test/socketclient/socketClientTest.cpp
index 6b17d072f64..e6cac1232e9 100644
--- a/storage/ndb/src/cw/test/socketclient/socketClientTest.cpp
+++ b/storage/ndb/src/cw/test/socketclient/socketClientTest.cpp
@@ -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 
diff --git a/storage/ndb/src/cw/util/ClientInterface.cpp b/storage/ndb/src/cw/util/ClientInterface.cpp
index 725a9d47d43..4249cb9cbb0 100644
--- a/storage/ndb/src/cw/util/ClientInterface.cpp
+++ b/storage/ndb/src/cw/util/ClientInterface.cpp
@@ -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 "ClientInterface.hpp"
 
diff --git a/storage/ndb/src/cw/util/ClientInterface.hpp b/storage/ndb/src/cw/util/ClientInterface.hpp
index 798f9c80a3a..5f610a5902c 100644
--- a/storage/ndb/src/cw/util/ClientInterface.hpp
+++ b/storage/ndb/src/cw/util/ClientInterface.hpp
@@ -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 CLIENT_IF_HPP
 #define CLIENT_IF_HPP
diff --git a/storage/ndb/src/cw/util/SocketRegistry.cpp b/storage/ndb/src/cw/util/SocketRegistry.cpp
index 0bda227be6e..1de3224989f 100644
--- a/storage/ndb/src/cw/util/SocketRegistry.cpp
+++ b/storage/ndb/src/cw/util/SocketRegistry.cpp
@@ -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 "SocketRegistry.hpp"
 #include 
diff --git a/storage/ndb/src/cw/util/SocketRegistry.hpp b/storage/ndb/src/cw/util/SocketRegistry.hpp
index 9e1b737f224..959288e0f32 100644
--- a/storage/ndb/src/cw/util/SocketRegistry.hpp
+++ b/storage/ndb/src/cw/util/SocketRegistry.hpp
@@ -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 SocketClientRegistry_H
 #define SocketClientRegistry_H
diff --git a/storage/ndb/src/cw/util/SocketService.cpp b/storage/ndb/src/cw/util/SocketService.cpp
index ee64f3bc4f1..d6c18dd645e 100644
--- a/storage/ndb/src/cw/util/SocketService.cpp
+++ b/storage/ndb/src/cw/util/SocketService.cpp
@@ -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 
diff --git a/storage/ndb/src/cw/util/SocketService.hpp b/storage/ndb/src/cw/util/SocketService.hpp
index 5a860f3aee1..96e6d04ad11 100644
--- a/storage/ndb/src/cw/util/SocketService.hpp
+++ b/storage/ndb/src/cw/util/SocketService.hpp
@@ -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 SOCKET_SERVICE_HPP
 #define SOCKET_SERVICE_HPP
diff --git a/storage/ndb/src/kernel/Makefile.am b/storage/ndb/src/kernel/Makefile.am
index 7652c5f3ade..0b5c1cb6553 100644
--- a/storage/ndb/src/kernel/Makefile.am
+++ b/storage/ndb/src/kernel/Makefile.am
@@ -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
 
 SUBDIRS = vm error blocks
 
diff --git a/storage/ndb/src/kernel/SimBlockList.cpp b/storage/ndb/src/kernel/SimBlockList.cpp
index 68c0b4a4642..62a9e2876d9 100644
--- a/storage/ndb/src/kernel/SimBlockList.cpp
+++ b/storage/ndb/src/kernel/SimBlockList.cpp
@@ -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 "SimBlockList.hpp"
 #include 
diff --git a/storage/ndb/src/kernel/blocks/Makefile.am b/storage/ndb/src/kernel/blocks/Makefile.am
index 9b806638837..d3acf9e9c22 100644
--- a/storage/ndb/src/kernel/blocks/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/Makefile.am
@@ -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
 
 SUBDIRS = \
 	dbdict		\
diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.cpp b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
index 3aa19644491..712d516b670 100644
--- a/storage/ndb/src/kernel/blocks/backup/Backup.cpp
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
@@ -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 
 #include "Backup.hpp"
diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.hpp b/storage/ndb/src/kernel/blocks/backup/Backup.hpp
index 7a3280f2ba6..3e07303e9a8 100644
--- a/storage/ndb/src/kernel/blocks/backup/Backup.hpp
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.hpp
@@ -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 BACKUP_H
 #define BACKUP_H
diff --git a/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp b/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
index f48d0ed09d3..d5e3956748d 100644
--- a/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
+++ b/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
@@ -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 BACKUP_FORMAT_HPP
 #define BACKUP_FORMAT_HPP
diff --git a/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp b/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
index 00a2a258085..8ae1f3037d2 100644
--- a/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
+++ b/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
@@ -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/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp b/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp
index 1349ddf6282..11f9da4518a 100644
--- a/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp
+++ b/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp
@@ -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 FS_BUFFER_HPP
 #define FS_BUFFER_HPP
diff --git a/storage/ndb/src/kernel/blocks/backup/Makefile.am b/storage/ndb/src/kernel/blocks/backup/Makefile.am
index d8a82014445..2340c25b183 100644
--- a/storage/ndb/src/kernel/blocks/backup/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/backup/Makefile.am
@@ -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
 
 ndbtools_PROGRAMS = ndb_print_backup_file
 ndb_print_backup_file_SOURCES = read.cpp
diff --git a/storage/ndb/src/kernel/blocks/backup/read.cpp b/storage/ndb/src/kernel/blocks/backup/read.cpp
index 3d4780f5eb4..d1d95f55739 100644
--- a/storage/ndb/src/kernel/blocks/backup/read.cpp
+++ b/storage/ndb/src/kernel/blocks/backup/read.cpp
@@ -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 
diff --git a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
index a99ae597f00..87015778a1b 100644
--- a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
@@ -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 "Cmvmi.hpp"
 
diff --git a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
index 8e4f140ea4d..adaef7c4815 100644
--- a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
@@ -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 Cmvmi_H_
 #define Cmvmi_H_
diff --git a/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp b/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
index 267fc2ec8ef..49b00b8c4b8 100644
--- a/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
@@ -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 DBACC_H
 #define DBACC_H
diff --git a/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
index 29ea4801b7b..f277dc2732c 100644
--- a/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
@@ -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/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
index da614b0276c..1e678c86c86 100644
--- a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
@@ -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 DBACC_C
 #include "Dbacc.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
index e0e0a496e0a..45e080dced7 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
index 6d738740e87..59b4d55aed4 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
@@ -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 DBDICT_H
 #define DBDICT_H
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am
index 6b900369b10..7b77419ff57 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am
@@ -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 $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl b/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl
index 69fbb973133..ff4cea09568 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl
+++ b/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl
@@ -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 contains a signal log trace for DBDICT at the master for a
 // create table. Another file contains the signal log for the participant
diff --git a/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp b/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
index 42c6e30792f..34e85d88766 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
@@ -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 DBDICT_SCHEMA_FILE_HPP
 #define DBDICT_SCHEMA_FILE_HPP
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl b/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl
index 20512b6f975..6c0e94a8f7b 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl
+++ b/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl
@@ -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 contains a signal log trace for DBDICT at the master for a
 // create table. Another file contains the signal log for the participant
diff --git a/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp b/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
index 55c42ee88e7..79d0c105908 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
@@ -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 
diff --git a/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp b/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
index f27287b79a4..9d8e74defe4 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
@@ -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 DBDIH_H
 #define DBDIH_H
diff --git a/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
index 5560c94cbfa..272d9c40a52 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
@@ -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 DBDIH_C
diff --git a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
index fb936fed464..344b450fe29 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
@@ -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 DBDIH_C
 #include 
diff --git a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am
index 7e667878d83..e5e07391b57 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am
@@ -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
 
 ndbtools_PROGRAMS = ndb_print_sys_file
 ndb_print_sys_file_SOURCES = printSysfile.cpp
diff --git a/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp b/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
index ae489bafa90..bec4e629cf0 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
@@ -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 SYSFILE_HPP
 #define SYSFILE_HPP
diff --git a/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp b/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp
index 13aeac81f81..8c231a05069 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp
@@ -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 
diff --git a/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp b/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp
index 49322252349..c0b5dfe33bb 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp
@@ -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 
diff --git a/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
index 399460078c2..7659df7551e 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
@@ -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 DBLQH_H
 #define DBLQH_H
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
index 79b3c6ce8d8..98e5a64ec71 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
@@ -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 
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index e76ad2530aa..3178218e5f1 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -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 DBLQH_C
 #include "Dblqh.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am
index 31612b5c25e..a2be946aefb 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am
@@ -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
 
 EXTRA_PROGRAMS = ndbd_redo_log_reader
 
diff --git a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp
index ea483527c15..7701d5529c0 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp
@@ -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 */
 
 //----------------------------------------------------------------
 // REDOLOGFILEREADER
diff --git a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
index 6431b4ba9b6..6514b3fe5ef 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
@@ -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 "records.hpp"
 
diff --git a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
index abdb57e8646..144d72d9cca 100644
--- a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp b/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
index 90338cb58cd..d33771e5f81 100644
--- a/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
@@ -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 DBTC_H
 #define DBTC_H
diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
index 22a1d7edb36..9154cf77725 100644
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
@@ -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 DBTC_C
 #include "Dbtc.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
index f4b0e07854c..099419c13b4 100644
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -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 DBTC_C
 
diff --git a/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp b/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp
index 12be23851c8..4b5a0184874 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp
@@ -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 ATTRIBUTE_OFFSET_HPP
 #define ATTRIBUTE_OFFSET_HPP
diff --git a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
index a963fe9b708..0e98765e01b 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
@@ -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 DBTUP_H
 #define DBTUP_H
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
index 7a000eb5042..dce78851f26 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
@@ -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 DBTUP_C
 #define DBTUP_ABORT_CPP
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
index 2f8151acca1..0e9afac0bb3 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
@@ -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 DBTUP_C
 #define DBTUP_BUFFER_CPP
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
index d65ebf26eee..29140934138 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
@@ -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 DBTUP_C
 #define DBTUP_COMMIT_CPP
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
index 7d88587cb35..b47b6a409a6 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
@@ -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 DBTUP_C
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
index e426213162a..e5845c5eb81 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
@@ -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 DBTUP_C
 #define DBTUP_DISK_ALLOC_CPP
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
index d7d7f20bbc7..debe150dda4 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
@@ -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 DBTUP_C
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
index 6822deb8b19..b0026e6899d 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
@@ -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 DBTUP_C
 #define DBTUP_FIXALLOC_CPP
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
index 262701b3d87..02db6acae0a 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
@@ -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 DBTUP_C
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
index 51235a30939..2af4e80244b 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
@@ -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 DBTUP_C
 #define DBTUP_INDEX_CPP
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
index dffc966f875..5adf2ee7066 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
@@ -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 DBTUP_C
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
index 47447bc3755..10fd4eceda7 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
@@ -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 DBTUP_C
 #define DBTUP_PAG_MAN_CPP
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
index bf079627990..c636c7700af 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
@@ -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 DBTUP_C
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
index 1a027315060..c7cd216775a 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
@@ -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 DBTUP_C
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
index 572be897a13..47402498bc5 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
@@ -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 DBTUP_C
 #define DBTUP_SCAN_CPP
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
index 63f73593ff7..1874089c489 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
@@ -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 DBTUP_C
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
index 71a19c1840e..915b9a7eb7a 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
@@ -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 DBTUP_C
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
index f202959b4da..cc883f8e938 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
@@ -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 DBTUP_C
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp
index 499a05a40f6..0d2cb573128 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp
@@ -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 DBTUP_C
 #define DBTUP_VAR_ALLOC_CPP
diff --git a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am
index 3c424449dc5..c7849ecd3b6 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am
@@ -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 $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
diff --git a/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp b/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
index bb45f4e0e0e..0d4fa999580 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
@@ -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 "Undo_buffer.hpp"
 #define DBTUP_C
diff --git a/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp b/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp
index 67ddefd0480..7e50e65ee4a 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp
@@ -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 __UNDO_BUFFER_HPP
 #define __UNDO_BUFFER_HPP
diff --git a/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp b/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp
index 2e52fe04949..2041a4565a7 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp
@@ -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 
 #include "tuppage.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp b/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp
index 524592b99ee..330df87e337 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp
@@ -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 
 #include "tuppage.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp b/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp
index 9558a911a86..6291b1a6e24 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp
@@ -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 __NDB_TUP_PAGE_HPP
 #define __NDB_TUP_PAGE_HPP
diff --git a/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp b/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
index 55a0c97b74a..fe86cdeb7e0 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
@@ -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 DBTUX_H
 #define DBTUX_H
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
index 32520502991..3bcb873ef3d 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
@@ -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 DBTUX_CMP_CPP
 #include "Dbtux.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
index 933ec77258e..3c3b22ee729 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
@@ -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 DBTUX_DEBUG_CPP
 #include "Dbtux.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
index fde64161cab..fc0d5812a07 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
@@ -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 DBTUX_GEN_CPP
 #include "Dbtux.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
index 65fc1d114f0..d2e48850aa2 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
@@ -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 DBTUX_MAINT_CPP
 #include "Dbtux.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
index 423ca83af14..7d6f3f9a4d8 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
@@ -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 DBTUX_META_CPP
 #include "Dbtux.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
index 4cbd9103c94..ae89dc7158e 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
@@ -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 DBTUX_NODE_CPP
 #include "Dbtux.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
index 0b910eff341..8e436966946 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
@@ -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 DBTUX_SCAN_CPP
 #include "Dbtux.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
index 9e84f61ab70..ef7212e7c1b 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
@@ -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 DBTUX_SEARCH_CPP
 #include "Dbtux.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
index 143996bf7ff..8f0d466388c 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
@@ -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 DBTUX_STAT_CPP
 #include "Dbtux.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
index c130a71b60e..a0cb43f206c 100644
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
@@ -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 DBTUX_TREE_CPP
 #include "Dbtux.hpp"
diff --git a/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
index 398c63add84..db1fee9fff9 100644
--- a/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
+++ b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
@@ -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 
 
diff --git a/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
index 9f7b7202740..602622b0646 100644
--- a/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
+++ b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
@@ -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 DBUTIL_H
 #define DBUTIL_H
diff --git a/storage/ndb/src/kernel/blocks/diskpage.cpp b/storage/ndb/src/kernel/blocks/diskpage.cpp
index c782d1367d9..f84993322ec 100644
--- a/storage/ndb/src/kernel/blocks/diskpage.cpp
+++ b/storage/ndb/src/kernel/blocks/diskpage.cpp
@@ -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 
 #include "diskpage.hpp"
diff --git a/storage/ndb/src/kernel/blocks/diskpage.hpp b/storage/ndb/src/kernel/blocks/diskpage.hpp
index 16098d39b45..df2e347aa23 100644
--- a/storage/ndb/src/kernel/blocks/diskpage.hpp
+++ b/storage/ndb/src/kernel/blocks/diskpage.hpp
@@ -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 __NDB_DISKPAGE_HPP
 #define __NDB_DISKPAGE_HPP
diff --git a/storage/ndb/src/kernel/blocks/lgman.cpp b/storage/ndb/src/kernel/blocks/lgman.cpp
index cd3fc0d4fbb..27891cea96b 100644
--- a/storage/ndb/src/kernel/blocks/lgman.cpp
+++ b/storage/ndb/src/kernel/blocks/lgman.cpp
@@ -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 "lgman.hpp"
diff --git a/storage/ndb/src/kernel/blocks/lgman.hpp b/storage/ndb/src/kernel/blocks/lgman.hpp
index c15e0d029e6..d7857aff6b1 100644
--- a/storage/ndb/src/kernel/blocks/lgman.hpp
+++ b/storage/ndb/src/kernel/blocks/lgman.hpp
@@ -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 LGMAN_H
 #define LGMAN_H
diff --git a/storage/ndb/src/kernel/blocks/mutexes.hpp b/storage/ndb/src/kernel/blocks/mutexes.hpp
index 64df5d45d27..37bf8a269df 100644
--- a/storage/ndb/src/kernel/blocks/mutexes.hpp
+++ b/storage/ndb/src/kernel/blocks/mutexes.hpp
@@ -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 KERNEL_MUTEXES_HPP
 #define KERNEL_MUTEXES_HPP
diff --git a/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp b/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
index 03ed858db1e..649894e60dc 100644
--- a/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
@@ -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 NDBCNTR_H
 #define NDBCNTR_H
diff --git a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
index 3b1120926f6..b8e4ed92c3b 100644
--- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
@@ -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/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
index 4c58509f9a1..fd078128ca8 100644
--- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
@@ -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 NDBCNTR_C
 #include "Ndbcntr.hpp"
diff --git a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
index 9b4b12867b7..3cdc752471a 100644
--- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
@@ -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 "Ndbcntr.hpp"
 
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
index e26e611dd7e..fa09642f526 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
index 71b6b34e2c0..10630455714 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
@@ -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 AsyncFile_H
 #define AsyncFile_H
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp
index cb7896fb144..42f3be16a00 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp
@@ -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 TESTDEBUG 1
 
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp b/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp
index d0e078a27a7..bfddc2a5fa1 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp
@@ -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 "CircularIndex.hpp"
 
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp b/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp
index 9f604e64156..564b9adcc8c 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp
@@ -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 CircularIndex_H
 #define CircularIndex_H
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp b/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
index 27200ebfbda..14da0083e38 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
@@ -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 
 
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp b/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp
index 37c79c3970f..d1761a2547b 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp
@@ -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 Filename_H
 #define Filename_H
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp
index 4bd5a06debe..cf911f8b34c 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp
@@ -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 "MemoryChannel.hpp"
 
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
index 279b69703ec..e86c2cd3207 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
@@ -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 MemoryChannel_H
 #define MemoryChannel_H
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp
index 26707969975..66d5d18b0b5 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp
@@ -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 "MemoryChannel.hpp"
 #include "NdbThread.h"
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
index 779d44d4176..b1b6c513b03 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
@@ -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 
 
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
index df39890af49..4aff99e743e 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
@@ -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 SIMBLOCKASYNCFILESYSTEM_H
 #define SIMBLOCKASYNCFILESYSTEM_H
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp b/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
index ed1e99a1409..2aaa6c0e6ae 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
@@ -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 OPENFILES_H
 #define OPENFILES_H
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp b/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp
index e78167d2350..5f0d3c7865c 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp
@@ -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 FOR_LIB_POOL_H
 #define FOR_LIB_POOL_H
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp b/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
index f2bf41b64b6..35a34f41ec3 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/kernel/blocks/pgman.cpp b/storage/ndb/src/kernel/blocks/pgman.cpp
index 9d184f7401b..3025683e08e 100644
--- a/storage/ndb/src/kernel/blocks/pgman.cpp
+++ b/storage/ndb/src/kernel/blocks/pgman.cpp
@@ -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 "pgman.hpp"
 #include 
diff --git a/storage/ndb/src/kernel/blocks/pgman.hpp b/storage/ndb/src/kernel/blocks/pgman.hpp
index aaff8ca03c4..b677bb044c3 100644
--- a/storage/ndb/src/kernel/blocks/pgman.hpp
+++ b/storage/ndb/src/kernel/blocks/pgman.hpp
@@ -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 PGMAN_H
 #define PGMAN_H
diff --git a/storage/ndb/src/kernel/blocks/print_file.cpp b/storage/ndb/src/kernel/blocks/print_file.cpp
index acaf9dd48e6..a7c6bc4aee1 100644
--- a/storage/ndb/src/kernel/blocks/print_file.cpp
+++ b/storage/ndb/src/kernel/blocks/print_file.cpp
@@ -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 
 
diff --git a/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp b/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
index 79de0715d01..a89f5bd6816 100644
--- a/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
+++ b/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
@@ -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 QMGR_H
 #define QMGR_H
diff --git a/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp b/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
index ce93b889d92..fe912f038a7 100644
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
@@ -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/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
index 1a309e34c2d..1ff915ddc40 100644
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
@@ -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 QMGR_C
diff --git a/storage/ndb/src/kernel/blocks/qmgr/timer.hpp b/storage/ndb/src/kernel/blocks/qmgr/timer.hpp
index 5668e788a64..0bade01f377 100644
--- a/storage/ndb/src/kernel/blocks/qmgr/timer.hpp
+++ b/storage/ndb/src/kernel/blocks/qmgr/timer.hpp
@@ -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 */
 
 /**
  *  @class Timer
diff --git a/storage/ndb/src/kernel/blocks/record_types.hpp b/storage/ndb/src/kernel/blocks/record_types.hpp
index 0c5ff3b5b2b..b97d07593a2 100644
--- a/storage/ndb/src/kernel/blocks/record_types.hpp
+++ b/storage/ndb/src/kernel/blocks/record_types.hpp
@@ -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 KERNEL_RECORDS_HPP
 #define KERNEL_RECORDS_HPP
diff --git a/storage/ndb/src/kernel/blocks/restore.cpp b/storage/ndb/src/kernel/blocks/restore.cpp
index c090139c181..e8a28899d8f 100644
--- a/storage/ndb/src/kernel/blocks/restore.cpp
+++ b/storage/ndb/src/kernel/blocks/restore.cpp
@@ -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 "restore.hpp"
 #include 
diff --git a/storage/ndb/src/kernel/blocks/restore.hpp b/storage/ndb/src/kernel/blocks/restore.hpp
index eadb8712bd2..542c5f9ebf6 100644
--- a/storage/ndb/src/kernel/blocks/restore.hpp
+++ b/storage/ndb/src/kernel/blocks/restore.hpp
@@ -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 Restore_H
 #define Restore_H
diff --git a/storage/ndb/src/kernel/blocks/suma/Suma.cpp b/storage/ndb/src/kernel/blocks/suma/Suma.cpp
index 40d0bb16406..3a7ed620865 100644
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp
@@ -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 
 #include "Suma.hpp"
diff --git a/storage/ndb/src/kernel/blocks/suma/Suma.hpp b/storage/ndb/src/kernel/blocks/suma/Suma.hpp
index 095b7f93bb3..d0df401a469 100644
--- a/storage/ndb/src/kernel/blocks/suma/Suma.hpp
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.hpp
@@ -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 SUMA_H
 #define SUMA_H
diff --git a/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp b/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
index 9d4e2c41907..56e78b26060 100644
--- a/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
+++ b/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
@@ -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 "Suma.hpp"
 
diff --git a/storage/ndb/src/kernel/blocks/trix/Trix.cpp b/storage/ndb/src/kernel/blocks/trix/Trix.cpp
index 5689e602ff0..fef87bc0700 100644
--- a/storage/ndb/src/kernel/blocks/trix/Trix.cpp
+++ b/storage/ndb/src/kernel/blocks/trix/Trix.cpp
@@ -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 "Trix.hpp"
 
diff --git a/storage/ndb/src/kernel/blocks/trix/Trix.hpp b/storage/ndb/src/kernel/blocks/trix/Trix.hpp
index f8163f64849..8aa49037250 100644
--- a/storage/ndb/src/kernel/blocks/trix/Trix.hpp
+++ b/storage/ndb/src/kernel/blocks/trix/Trix.hpp
@@ -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 TRIX_H
 #define TRIX_H
diff --git a/storage/ndb/src/kernel/blocks/tsman.cpp b/storage/ndb/src/kernel/blocks/tsman.cpp
index 90f83c8ac82..826f5af26ab 100644
--- a/storage/ndb/src/kernel/blocks/tsman.cpp
+++ b/storage/ndb/src/kernel/blocks/tsman.cpp
@@ -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 "tsman.hpp"
 #include "pgman.hpp"
diff --git a/storage/ndb/src/kernel/blocks/tsman.hpp b/storage/ndb/src/kernel/blocks/tsman.hpp
index 6f005c1bfad..e9ff559a2b5 100644
--- a/storage/ndb/src/kernel/blocks/tsman.hpp
+++ b/storage/ndb/src/kernel/blocks/tsman.hpp
@@ -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 TSMAN_H
 #define TSMAN_H
diff --git a/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp b/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp
index aefc1b89f11..acf3b38e27e 100644
--- a/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp
+++ b/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp
@@ -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 ERRORHANDLINGMACROS_H
 #define ERRORHANDLINGMACROS_H
diff --git a/storage/ndb/src/kernel/error/ErrorReporter.cpp b/storage/ndb/src/kernel/error/ErrorReporter.cpp
index 0e3712b739b..eed863a5a60 100644
--- a/storage/ndb/src/kernel/error/ErrorReporter.cpp
+++ b/storage/ndb/src/kernel/error/ErrorReporter.cpp
@@ -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 
diff --git a/storage/ndb/src/kernel/error/ErrorReporter.hpp b/storage/ndb/src/kernel/error/ErrorReporter.hpp
index 8d61948fe49..dbab174a8dc 100644
--- a/storage/ndb/src/kernel/error/ErrorReporter.hpp
+++ b/storage/ndb/src/kernel/error/ErrorReporter.hpp
@@ -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 ERRORREPORTER_H
 #define ERRORREPORTER_H
diff --git a/storage/ndb/src/kernel/error/Makefile.am b/storage/ndb/src/kernel/error/Makefile.am
index 5f904cdac61..4ed812b0cf5 100644
--- a/storage/ndb/src/kernel/error/Makefile.am
+++ b/storage/ndb/src/kernel/error/Makefile.am
@@ -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
 
 noinst_LIBRARIES = liberror.a
 
diff --git a/storage/ndb/src/kernel/error/TimeModule.cpp b/storage/ndb/src/kernel/error/TimeModule.cpp
index 2fabae586aa..838bdc6717f 100644
--- a/storage/ndb/src/kernel/error/TimeModule.cpp
+++ b/storage/ndb/src/kernel/error/TimeModule.cpp
@@ -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/storage/ndb/src/kernel/error/TimeModule.hpp b/storage/ndb/src/kernel/error/TimeModule.hpp
index 8ea21750865..307bbb4a8d5 100644
--- a/storage/ndb/src/kernel/error/TimeModule.hpp
+++ b/storage/ndb/src/kernel/error/TimeModule.hpp
@@ -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 _TimeModule_
 #define _TimeModule_
diff --git a/storage/ndb/src/kernel/error/ndbd_exit_codes.c b/storage/ndb/src/kernel/error/ndbd_exit_codes.c
index 4224e7191f6..064bdbeda0c 100644
--- a/storage/ndb/src/kernel/error/ndbd_exit_codes.c
+++ b/storage/ndb/src/kernel/error/ndbd_exit_codes.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 */
 
 #include 
 #include 
diff --git a/storage/ndb/src/kernel/main.cpp b/storage/ndb/src/kernel/main.cpp
index a9660a6ff86..baf14e9fe6a 100644
--- a/storage/ndb/src/kernel/main.cpp
+++ b/storage/ndb/src/kernel/main.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/kernel/vm/Array.hpp b/storage/ndb/src/kernel/vm/Array.hpp
index 7d9f955c296..9fc9db40afd 100644
--- a/storage/ndb/src/kernel/vm/Array.hpp
+++ b/storage/ndb/src/kernel/vm/Array.hpp
@@ -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 ARRAY_HPP
 #define ARRAY_HPP
diff --git a/storage/ndb/src/kernel/vm/ArrayPool.hpp b/storage/ndb/src/kernel/vm/ArrayPool.hpp
index dbc6319a583..b8f119c1407 100644
--- a/storage/ndb/src/kernel/vm/ArrayPool.hpp
+++ b/storage/ndb/src/kernel/vm/ArrayPool.hpp
@@ -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 ARRAY_POOL_HPP
 #define ARRAY_POOL_HPP
diff --git a/storage/ndb/src/kernel/vm/CArray.hpp b/storage/ndb/src/kernel/vm/CArray.hpp
index 4ae1451756b..53c94b1243f 100644
--- a/storage/ndb/src/kernel/vm/CArray.hpp
+++ b/storage/ndb/src/kernel/vm/CArray.hpp
@@ -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 CARRAY_HPP
 #define CARRAY_HPP
diff --git a/storage/ndb/src/kernel/vm/Callback.hpp b/storage/ndb/src/kernel/vm/Callback.hpp
index d7f2caf2f54..6c4b573e4f6 100644
--- a/storage/ndb/src/kernel/vm/Callback.hpp
+++ b/storage/ndb/src/kernel/vm/Callback.hpp
@@ -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 BLOCK_CALLBACK_HPP
 #define BLOCK_CALLBACK_HPP
diff --git a/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp b/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp
index 263b22e34af..230bc4ee39f 100644
--- a/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp
+++ b/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp
@@ -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 
 
diff --git a/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp b/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp
index be0930e5db4..9d271ea768a 100644
--- a/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp
+++ b/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp
@@ -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 ClusterConfiguration_H
 #define ClusterConfiguration_H
diff --git a/storage/ndb/src/kernel/vm/Configuration.cpp b/storage/ndb/src/kernel/vm/Configuration.cpp
index c84b068ce9c..594bf5c7930 100644
--- a/storage/ndb/src/kernel/vm/Configuration.cpp
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/kernel/vm/Configuration.hpp b/storage/ndb/src/kernel/vm/Configuration.hpp
index 9aefbf9c248..d69dfb6fc5f 100644
--- a/storage/ndb/src/kernel/vm/Configuration.hpp
+++ b/storage/ndb/src/kernel/vm/Configuration.hpp
@@ -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 Configuration_H
 #define Configuration_H
diff --git a/storage/ndb/src/kernel/vm/DLCFifoList.hpp b/storage/ndb/src/kernel/vm/DLCFifoList.hpp
index ad449c08f4a..df1c24f3564 100644
--- a/storage/ndb/src/kernel/vm/DLCFifoList.hpp
+++ b/storage/ndb/src/kernel/vm/DLCFifoList.hpp
@@ -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 DLC_FIFOLIST_HPP
 #define DLC_FIFOLIST_HPP
diff --git a/storage/ndb/src/kernel/vm/DLCHashTable.hpp b/storage/ndb/src/kernel/vm/DLCHashTable.hpp
index fb224f2bd4c..25555b1e7fe 100644
--- a/storage/ndb/src/kernel/vm/DLCHashTable.hpp
+++ b/storage/ndb/src/kernel/vm/DLCHashTable.hpp
@@ -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 DLC_HASHTABLE_HPP
 #define DLC_HASHTABLE_HPP
diff --git a/storage/ndb/src/kernel/vm/DLFifoList.hpp b/storage/ndb/src/kernel/vm/DLFifoList.hpp
index b78df5126c5..186165fd6e0 100644
--- a/storage/ndb/src/kernel/vm/DLFifoList.hpp
+++ b/storage/ndb/src/kernel/vm/DLFifoList.hpp
@@ -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 DLFIFOLIST_HPP
 #define DLFIFOLIST_HPP
diff --git a/storage/ndb/src/kernel/vm/DLHashTable.hpp b/storage/ndb/src/kernel/vm/DLHashTable.hpp
index 1accadc1749..0adff7cdc07 100644
--- a/storage/ndb/src/kernel/vm/DLHashTable.hpp
+++ b/storage/ndb/src/kernel/vm/DLHashTable.hpp
@@ -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 DL_HASHTABLE_HPP
 #define DL_HASHTABLE_HPP
diff --git a/storage/ndb/src/kernel/vm/DLHashTable2.hpp b/storage/ndb/src/kernel/vm/DLHashTable2.hpp
index 85567bfc9bd..5a010a88a80 100644
--- a/storage/ndb/src/kernel/vm/DLHashTable2.hpp
+++ b/storage/ndb/src/kernel/vm/DLHashTable2.hpp
@@ -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 DL_HASHTABLE2_HPP
 #define DL_HASHTABLE2_HPP
diff --git a/storage/ndb/src/kernel/vm/DLList.hpp b/storage/ndb/src/kernel/vm/DLList.hpp
index f691ae8ad26..9aa4e578c55 100644
--- a/storage/ndb/src/kernel/vm/DLList.hpp
+++ b/storage/ndb/src/kernel/vm/DLList.hpp
@@ -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 DLLIST_HPP
 #define DLLIST_HPP
diff --git a/storage/ndb/src/kernel/vm/DataBuffer.hpp b/storage/ndb/src/kernel/vm/DataBuffer.hpp
index a1956229d8b..4577b6a0d5b 100644
--- a/storage/ndb/src/kernel/vm/DataBuffer.hpp
+++ b/storage/ndb/src/kernel/vm/DataBuffer.hpp
@@ -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 DATA_BUFFER_HPP
 #define DATA_BUFFER_HPP
diff --git a/storage/ndb/src/kernel/vm/DynArr256.cpp b/storage/ndb/src/kernel/vm/DynArr256.cpp
index 6f3229c085c..7afe4bb90fa 100644
--- a/storage/ndb/src/kernel/vm/DynArr256.cpp
+++ b/storage/ndb/src/kernel/vm/DynArr256.cpp
@@ -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 "DynArr256.hpp"
 #include 
diff --git a/storage/ndb/src/kernel/vm/DynArr256.hpp b/storage/ndb/src/kernel/vm/DynArr256.hpp
index 162f81d3173..30fd1e9e274 100644
--- a/storage/ndb/src/kernel/vm/DynArr256.hpp
+++ b/storage/ndb/src/kernel/vm/DynArr256.hpp
@@ -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 DYNARR256_HPP
 #define DYNARR256_HPP
diff --git a/storage/ndb/src/kernel/vm/Emulator.cpp b/storage/ndb/src/kernel/vm/Emulator.cpp
index 6610d88fba0..cf8b8578911 100644
--- a/storage/ndb/src/kernel/vm/Emulator.cpp
+++ b/storage/ndb/src/kernel/vm/Emulator.cpp
@@ -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 
 
diff --git a/storage/ndb/src/kernel/vm/Emulator.hpp b/storage/ndb/src/kernel/vm/Emulator.hpp
index 7168e043b15..f98e07caaf8 100644
--- a/storage/ndb/src/kernel/vm/Emulator.hpp
+++ b/storage/ndb/src/kernel/vm/Emulator.hpp
@@ -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 EMULATOR_H
 #define EMULATOR_H
diff --git a/storage/ndb/src/kernel/vm/FastScheduler.cpp b/storage/ndb/src/kernel/vm/FastScheduler.cpp
index e5fbe0b1242..c4f7ec10571 100644
--- a/storage/ndb/src/kernel/vm/FastScheduler.cpp
+++ b/storage/ndb/src/kernel/vm/FastScheduler.cpp
@@ -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 "FastScheduler.hpp"
 #include "RefConvert.hpp"
diff --git a/storage/ndb/src/kernel/vm/FastScheduler.hpp b/storage/ndb/src/kernel/vm/FastScheduler.hpp
index f36b432ed4a..a43feb44b0b 100644
--- a/storage/ndb/src/kernel/vm/FastScheduler.hpp
+++ b/storage/ndb/src/kernel/vm/FastScheduler.hpp
@@ -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 FastScheduler_H
 #define FastScheduler_H
diff --git a/storage/ndb/src/kernel/vm/GlobalData.hpp b/storage/ndb/src/kernel/vm/GlobalData.hpp
index daf2469af49..cfb0dd1de5f 100644
--- a/storage/ndb/src/kernel/vm/GlobalData.hpp
+++ b/storage/ndb/src/kernel/vm/GlobalData.hpp
@@ -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 GLOBAL_DATA_H
 #define GLOBAL_DATA_H
diff --git a/storage/ndb/src/kernel/vm/KeyDescriptor.hpp b/storage/ndb/src/kernel/vm/KeyDescriptor.hpp
index 8f2f3590695..c7ab01ca3b3 100644
--- a/storage/ndb/src/kernel/vm/KeyDescriptor.hpp
+++ b/storage/ndb/src/kernel/vm/KeyDescriptor.hpp
@@ -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 KEY_DESCRIPTOR_HPP
 #define KEY_DESCRIPTOR_HPP
diff --git a/storage/ndb/src/kernel/vm/KeyTable.hpp b/storage/ndb/src/kernel/vm/KeyTable.hpp
index 5c26524a861..5832dabe34d 100644
--- a/storage/ndb/src/kernel/vm/KeyTable.hpp
+++ b/storage/ndb/src/kernel/vm/KeyTable.hpp
@@ -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 KEY_TABLE_HPP
 #define KEY_TABLE_HPP
diff --git a/storage/ndb/src/kernel/vm/KeyTable2.hpp b/storage/ndb/src/kernel/vm/KeyTable2.hpp
index d754fddd64f..2b8f8036946 100644
--- a/storage/ndb/src/kernel/vm/KeyTable2.hpp
+++ b/storage/ndb/src/kernel/vm/KeyTable2.hpp
@@ -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 KEY_TABLE2_HPP
 #define KEY_TABLE2_HPP
diff --git a/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp b/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp
index 45373550a52..e366781f1eb 100644
--- a/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp
+++ b/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp
@@ -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 KEY_TABLE2_REF_HPP
 #define KEY_TABLE2_REF_HPP
diff --git a/storage/ndb/src/kernel/vm/LinearPool.hpp b/storage/ndb/src/kernel/vm/LinearPool.hpp
index 6d9a7b14a2d..6f06dfbc6d5 100644
--- a/storage/ndb/src/kernel/vm/LinearPool.hpp
+++ b/storage/ndb/src/kernel/vm/LinearPool.hpp
@@ -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 LINEAR_POOL_HPP
 #define LINEAR_POOL_HPP
diff --git a/storage/ndb/src/kernel/vm/LongSignal.hpp b/storage/ndb/src/kernel/vm/LongSignal.hpp
index 5f4f9744c45..325d2cf2940 100644
--- a/storage/ndb/src/kernel/vm/LongSignal.hpp
+++ b/storage/ndb/src/kernel/vm/LongSignal.hpp
@@ -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 LONG_SIGNAL_HPP
 #define LONG_SIGNAL_HPP
diff --git a/storage/ndb/src/kernel/vm/Makefile.am b/storage/ndb/src/kernel/vm/Makefile.am
index a862da610bd..8f252d0ed89 100644
--- a/storage/ndb/src/kernel/vm/Makefile.am
+++ b/storage/ndb/src/kernel/vm/Makefile.am
@@ -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
 
 #SUBDIRS = testCopy testDataBuffer testSimplePropertiesSection
 #ifneq ($(USE_EDITLINE), N)
diff --git a/storage/ndb/src/kernel/vm/Mutex.cpp b/storage/ndb/src/kernel/vm/Mutex.cpp
index e489386e3df..e4c3dbc3d49 100644
--- a/storage/ndb/src/kernel/vm/Mutex.cpp
+++ b/storage/ndb/src/kernel/vm/Mutex.cpp
@@ -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 "SimulatedBlock.hpp"
diff --git a/storage/ndb/src/kernel/vm/Mutex.hpp b/storage/ndb/src/kernel/vm/Mutex.hpp
index eb45e27f80e..4cf719db019 100644
--- a/storage/ndb/src/kernel/vm/Mutex.hpp
+++ b/storage/ndb/src/kernel/vm/Mutex.hpp
@@ -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 BLOCK_MUTEX_HPP
 #define BLOCK_MUTEX_HPP
diff --git a/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp b/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
index b9557d843ab..febdefeae55 100644
--- a/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
+++ b/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
@@ -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 
 #include "SuperPool.hpp"
diff --git a/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp b/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp
index 66765fcebc5..4d052a5eafc 100644
--- a/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp
+++ b/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp
@@ -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 NDBD_SUPER_POOL_HPP
 #define NDBD_SUPER_POOL_HPP
diff --git a/storage/ndb/src/kernel/vm/Pool.cpp b/storage/ndb/src/kernel/vm/Pool.cpp
index 6b4b36a5036..34c101916d0 100644
--- a/storage/ndb/src/kernel/vm/Pool.cpp
+++ b/storage/ndb/src/kernel/vm/Pool.cpp
@@ -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 "Pool.hpp"
diff --git a/storage/ndb/src/kernel/vm/Pool.hpp b/storage/ndb/src/kernel/vm/Pool.hpp
index 47b2e0d8892..d30d545f3c3 100644
--- a/storage/ndb/src/kernel/vm/Pool.hpp
+++ b/storage/ndb/src/kernel/vm/Pool.hpp
@@ -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 NDB_POOL_HPP
 #define NDB_POOL_HPP
diff --git a/storage/ndb/src/kernel/vm/Prio.hpp b/storage/ndb/src/kernel/vm/Prio.hpp
index 3cc34a43918..d3c8c789df9 100644
--- a/storage/ndb/src/kernel/vm/Prio.hpp
+++ b/storage/ndb/src/kernel/vm/Prio.hpp
@@ -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 PRIO_H
 #define PRIO_H
diff --git a/storage/ndb/src/kernel/vm/RWPool.cpp b/storage/ndb/src/kernel/vm/RWPool.cpp
index a98e2b9b1d1..6d9f6a962a5 100644
--- a/storage/ndb/src/kernel/vm/RWPool.cpp
+++ b/storage/ndb/src/kernel/vm/RWPool.cpp
@@ -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 "RWPool.hpp"
 #include 
diff --git a/storage/ndb/src/kernel/vm/RWPool.hpp b/storage/ndb/src/kernel/vm/RWPool.hpp
index dfe4c04e644..a3be54f5fdf 100644
--- a/storage/ndb/src/kernel/vm/RWPool.hpp
+++ b/storage/ndb/src/kernel/vm/RWPool.hpp
@@ -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 RWPOOL_HPP
 #define RWPOOL_HPP
diff --git a/storage/ndb/src/kernel/vm/RequestTracker.hpp b/storage/ndb/src/kernel/vm/RequestTracker.hpp
index 743a90234b1..d7fcad1a568 100644
--- a/storage/ndb/src/kernel/vm/RequestTracker.hpp
+++ b/storage/ndb/src/kernel/vm/RequestTracker.hpp
@@ -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 __REQUEST_TRACKER_HPP
 #define __REQUEST_TRACKER_HPP
diff --git a/storage/ndb/src/kernel/vm/Rope.cpp b/storage/ndb/src/kernel/vm/Rope.cpp
index 9ee48d5fa3e..c0063876cb7 100644
--- a/storage/ndb/src/kernel/vm/Rope.cpp
+++ b/storage/ndb/src/kernel/vm/Rope.cpp
@@ -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 "Rope.hpp"
 
diff --git a/storage/ndb/src/kernel/vm/Rope.hpp b/storage/ndb/src/kernel/vm/Rope.hpp
index d7e3ccc6e53..a41b1ee0d38 100644
--- a/storage/ndb/src/kernel/vm/Rope.hpp
+++ b/storage/ndb/src/kernel/vm/Rope.hpp
@@ -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 NDB_ROPE_HPP
 #define NDB_ROPE_HPP
diff --git a/storage/ndb/src/kernel/vm/SLFifoList.hpp b/storage/ndb/src/kernel/vm/SLFifoList.hpp
index 4cd370a3129..f0bed9480d8 100644
--- a/storage/ndb/src/kernel/vm/SLFifoList.hpp
+++ b/storage/ndb/src/kernel/vm/SLFifoList.hpp
@@ -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 SLFIFOLIST_HPP
 #define SLFIFOLIST_HPP
diff --git a/storage/ndb/src/kernel/vm/SLList.hpp b/storage/ndb/src/kernel/vm/SLList.hpp
index 08ba6898185..8cc077c1740 100644
--- a/storage/ndb/src/kernel/vm/SLList.hpp
+++ b/storage/ndb/src/kernel/vm/SLList.hpp
@@ -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 SLLIST_HPP
 #define SLLIST_HPP
diff --git a/storage/ndb/src/kernel/vm/SafeCounter.cpp b/storage/ndb/src/kernel/vm/SafeCounter.cpp
index f01bb4d8f85..b5f0bff199a 100644
--- a/storage/ndb/src/kernel/vm/SafeCounter.cpp
+++ b/storage/ndb/src/kernel/vm/SafeCounter.cpp
@@ -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 "SimulatedBlock.hpp"
diff --git a/storage/ndb/src/kernel/vm/SafeCounter.hpp b/storage/ndb/src/kernel/vm/SafeCounter.hpp
index 7a917fd4310..aa0a501be58 100644
--- a/storage/ndb/src/kernel/vm/SafeCounter.hpp
+++ b/storage/ndb/src/kernel/vm/SafeCounter.hpp
@@ -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 __SAFE_COUNTER_HPP
 #define __SAFE_COUNTER_HPP
diff --git a/storage/ndb/src/kernel/vm/SectionReader.cpp b/storage/ndb/src/kernel/vm/SectionReader.cpp
index 7cad2ed51c1..85c74b341de 100644
--- a/storage/ndb/src/kernel/vm/SectionReader.cpp
+++ b/storage/ndb/src/kernel/vm/SectionReader.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/kernel/vm/SectionReader.hpp b/storage/ndb/src/kernel/vm/SectionReader.hpp
index 9e39c3666e3..4bb7dec75b8 100644
--- a/storage/ndb/src/kernel/vm/SectionReader.hpp
+++ b/storage/ndb/src/kernel/vm/SectionReader.hpp
@@ -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 SECTION_READER_HPP
 #define SECTION_READER_HPP
diff --git a/storage/ndb/src/kernel/vm/SignalCounter.hpp b/storage/ndb/src/kernel/vm/SignalCounter.hpp
index 1d451114dff..9ed4ade405a 100644
--- a/storage/ndb/src/kernel/vm/SignalCounter.hpp
+++ b/storage/ndb/src/kernel/vm/SignalCounter.hpp
@@ -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 SIGNAL_COUNTER_HPP
 #define SIGNAL_COUNTER_HPP
diff --git a/storage/ndb/src/kernel/vm/SimBlockList.hpp b/storage/ndb/src/kernel/vm/SimBlockList.hpp
index 2f4fbac5711..e3a5ba49b83 100644
--- a/storage/ndb/src/kernel/vm/SimBlockList.hpp
+++ b/storage/ndb/src/kernel/vm/SimBlockList.hpp
@@ -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 SimBlockList_H
 #define SimBlockList_H
diff --git a/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp b/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp
index 77f72d1a5c3..400846c59c9 100644
--- a/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp
+++ b/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
index 6703b3c7fab..86755c20a2c 100644
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
@@ -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 
 
diff --git a/storage/ndb/src/kernel/vm/SimulatedBlock.hpp b/storage/ndb/src/kernel/vm/SimulatedBlock.hpp
index ebd07a5bb1a..5b74690b62c 100644
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.hpp
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.hpp
@@ -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 SIMULATEDBLOCK_H
 #define SIMULATEDBLOCK_H
diff --git a/storage/ndb/src/kernel/vm/SuperPool.cpp b/storage/ndb/src/kernel/vm/SuperPool.cpp
index de391bcab42..086ecb7cdfc 100644
--- a/storage/ndb/src/kernel/vm/SuperPool.cpp
+++ b/storage/ndb/src/kernel/vm/SuperPool.cpp
@@ -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 
 #include "SuperPool.hpp"
diff --git a/storage/ndb/src/kernel/vm/SuperPool.hpp b/storage/ndb/src/kernel/vm/SuperPool.hpp
index 8fe4e681452..afb8fbd4273 100644
--- a/storage/ndb/src/kernel/vm/SuperPool.hpp
+++ b/storage/ndb/src/kernel/vm/SuperPool.hpp
@@ -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 SUPER_POOL_HPP
 #define SUPER_POOL_HPP
diff --git a/storage/ndb/src/kernel/vm/ThreadConfig.cpp b/storage/ndb/src/kernel/vm/ThreadConfig.cpp
index e7cfa0e6492..64330cc86c5 100644
--- a/storage/ndb/src/kernel/vm/ThreadConfig.cpp
+++ b/storage/ndb/src/kernel/vm/ThreadConfig.cpp
@@ -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 "ThreadConfig.hpp"
 #include "Emulator.hpp"
diff --git a/storage/ndb/src/kernel/vm/ThreadConfig.hpp b/storage/ndb/src/kernel/vm/ThreadConfig.hpp
index a05cc9c8532..522cf64b2bc 100644
--- a/storage/ndb/src/kernel/vm/ThreadConfig.hpp
+++ b/storage/ndb/src/kernel/vm/ThreadConfig.hpp
@@ -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 ThreadConfig_H
 #define ThreadConfig_H
diff --git a/storage/ndb/src/kernel/vm/TimeQueue.cpp b/storage/ndb/src/kernel/vm/TimeQueue.cpp
index ad4e4cd1b8a..7799b8ddc8b 100644
--- a/storage/ndb/src/kernel/vm/TimeQueue.cpp
+++ b/storage/ndb/src/kernel/vm/TimeQueue.cpp
@@ -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 "TimeQueue.hpp"
 #include 
diff --git a/storage/ndb/src/kernel/vm/TimeQueue.hpp b/storage/ndb/src/kernel/vm/TimeQueue.hpp
index 4c1a32ac3e6..ebbb11dda77 100644
--- a/storage/ndb/src/kernel/vm/TimeQueue.hpp
+++ b/storage/ndb/src/kernel/vm/TimeQueue.hpp
@@ -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 TimeQueue_H
 #define TimeQueue_H
diff --git a/storage/ndb/src/kernel/vm/TransporterCallback.cpp b/storage/ndb/src/kernel/vm/TransporterCallback.cpp
index 979a8075bdd..0c87f97ba3e 100644
--- a/storage/ndb/src/kernel/vm/TransporterCallback.cpp
+++ b/storage/ndb/src/kernel/vm/TransporterCallback.cpp
@@ -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 
 
diff --git a/storage/ndb/src/kernel/vm/VMSignal.cpp b/storage/ndb/src/kernel/vm/VMSignal.cpp
index 3d6d7ddc8f7..aff6855d1bb 100644
--- a/storage/ndb/src/kernel/vm/VMSignal.cpp
+++ b/storage/ndb/src/kernel/vm/VMSignal.cpp
@@ -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 "VMSignal.hpp"
 #include 
diff --git a/storage/ndb/src/kernel/vm/VMSignal.hpp b/storage/ndb/src/kernel/vm/VMSignal.hpp
index ccdcea56463..df4f2415e70 100644
--- a/storage/ndb/src/kernel/vm/VMSignal.hpp
+++ b/storage/ndb/src/kernel/vm/VMSignal.hpp
@@ -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 VMSignal_H
 #define VMSignal_H
diff --git a/storage/ndb/src/kernel/vm/WOPool.cpp b/storage/ndb/src/kernel/vm/WOPool.cpp
index 359b79c42fe..50e7427f02c 100644
--- a/storage/ndb/src/kernel/vm/WOPool.cpp
+++ b/storage/ndb/src/kernel/vm/WOPool.cpp
@@ -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 "WOPool.hpp"
 #include 
diff --git a/storage/ndb/src/kernel/vm/WOPool.hpp b/storage/ndb/src/kernel/vm/WOPool.hpp
index a9cdef881fb..2a2547ee57c 100644
--- a/storage/ndb/src/kernel/vm/WOPool.hpp
+++ b/storage/ndb/src/kernel/vm/WOPool.hpp
@@ -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 WOPOOL_HPP
 #define WOPOOL_HPP
diff --git a/storage/ndb/src/kernel/vm/WaitQueue.hpp b/storage/ndb/src/kernel/vm/WaitQueue.hpp
index 732c895ea12..c18e0d6bb76 100644
--- a/storage/ndb/src/kernel/vm/WaitQueue.hpp
+++ b/storage/ndb/src/kernel/vm/WaitQueue.hpp
@@ -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 WAIT_QUEUE_HPP
 #define WAIT_QUEUE_HPP
diff --git a/storage/ndb/src/kernel/vm/WatchDog.cpp b/storage/ndb/src/kernel/vm/WatchDog.cpp
index fdf45a1803b..bc8b0d1ab5f 100644
--- a/storage/ndb/src/kernel/vm/WatchDog.cpp
+++ b/storage/ndb/src/kernel/vm/WatchDog.cpp
@@ -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 
diff --git a/storage/ndb/src/kernel/vm/WatchDog.hpp b/storage/ndb/src/kernel/vm/WatchDog.hpp
index f78850f8e86..047f8366446 100644
--- a/storage/ndb/src/kernel/vm/WatchDog.hpp
+++ b/storage/ndb/src/kernel/vm/WatchDog.hpp
@@ -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 WatchDog_H
 #define WatchDog_H
diff --git a/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp b/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp
index 3b5304b432c..b3f5b3bd545 100644
--- a/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp
+++ b/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp
@@ -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/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp b/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
index 75f97d1ffba..70772c99c4b 100644
--- a/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
+++ b/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
@@ -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/storage/ndb/src/kernel/vm/al_test/main.cpp b/storage/ndb/src/kernel/vm/al_test/main.cpp
index 5f536031bb1..f15a78884a2 100644
--- a/storage/ndb/src/kernel/vm/al_test/main.cpp
+++ b/storage/ndb/src/kernel/vm/al_test/main.cpp
@@ -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 
 
diff --git a/storage/ndb/src/kernel/vm/bench_pool.cpp b/storage/ndb/src/kernel/vm/bench_pool.cpp
index 8011bd0f8cd..908f1b3dd6a 100644
--- a/storage/ndb/src/kernel/vm/bench_pool.cpp
+++ b/storage/ndb/src/kernel/vm/bench_pool.cpp
@@ -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 "ArrayPool.hpp"
diff --git a/storage/ndb/src/kernel/vm/ndbd_malloc.cpp b/storage/ndb/src/kernel/vm/ndbd_malloc.cpp
index 596b30e416b..81bf546b8e6 100644
--- a/storage/ndb/src/kernel/vm/ndbd_malloc.cpp
+++ b/storage/ndb/src/kernel/vm/ndbd_malloc.cpp
@@ -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 
 #include "ndbd_malloc.hpp"
diff --git a/storage/ndb/src/kernel/vm/ndbd_malloc.hpp b/storage/ndb/src/kernel/vm/ndbd_malloc.hpp
index 52f50daf2ee..d09f2c32c89 100644
--- a/storage/ndb/src/kernel/vm/ndbd_malloc.hpp
+++ b/storage/ndb/src/kernel/vm/ndbd_malloc.hpp
@@ -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 NDBD_MALLOC_H
 #define NDBD_MALLOC_H
diff --git a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
index f96488ada9f..7b777e4bb6a 100644
--- a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
+++ b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
@@ -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/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
index e820d1303d3..b5f329048b4 100644
--- a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
+++ b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
@@ -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 NDBD_MALLOC_IMPL_H
 #define NDBD_MALLOC_IMPL_H
diff --git a/storage/ndb/src/kernel/vm/pc.hpp b/storage/ndb/src/kernel/vm/pc.hpp
index 8be09ca91e4..ad437dfa3e6 100644
--- a/storage/ndb/src/kernel/vm/pc.hpp
+++ b/storage/ndb/src/kernel/vm/pc.hpp
@@ -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 PC_H
 #define PC_H
diff --git a/storage/ndb/src/kernel/vm/testCopy/rr.cpp b/storage/ndb/src/kernel/vm/testCopy/rr.cpp
index bb0521357ea..a25b7996f4c 100644
--- a/storage/ndb/src/kernel/vm/testCopy/rr.cpp
+++ b/storage/ndb/src/kernel/vm/testCopy/rr.cpp
@@ -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 
diff --git a/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp b/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp
index ef7f3277174..05c07723d51 100644
--- a/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp
+++ b/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp
@@ -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 
diff --git a/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp b/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp
index 03233f72ff8..81c6040c848 100644
--- a/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp
+++ b/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp
@@ -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 
diff --git a/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp b/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
index cc5c3286168..891879dd6e3 100644
--- a/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
+++ b/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
@@ -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 
diff --git a/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp b/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
index 5d58d062d97..37cbdd398c9 100644
--- a/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
+++ b/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/kernel/vm/testSuperPool.cpp b/storage/ndb/src/kernel/vm/testSuperPool.cpp
index b5f57be1bbe..901bb483119 100644
--- a/storage/ndb/src/kernel/vm/testSuperPool.cpp
+++ b/storage/ndb/src/kernel/vm/testSuperPool.cpp
@@ -20,7 +20,7 @@ exit $?
 
    You should have 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 "SuperPool.hpp"
 #include "LinearPool.hpp"
diff --git a/storage/ndb/src/libndb.ver.in b/storage/ndb/src/libndb.ver.in
index 6b13a23e883..ffadea81987 100644
--- a/storage/ndb/src/libndb.ver.in
+++ b/storage/ndb/src/libndb.ver.in
@@ -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
 
 libndbclient_@NDB_SHARED_LIB_MAJOR_VERSION@ { global: *; };
 
diff --git a/storage/ndb/src/mgmapi/LocalConfig.cpp b/storage/ndb/src/mgmapi/LocalConfig.cpp
index 3ab32215c79..c0907b9bea1 100644
--- a/storage/ndb/src/mgmapi/LocalConfig.cpp
+++ b/storage/ndb/src/mgmapi/LocalConfig.cpp
@@ -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 "LocalConfig.hpp"
 #include 
diff --git a/storage/ndb/src/mgmapi/LocalConfig.hpp b/storage/ndb/src/mgmapi/LocalConfig.hpp
index 47816bfa343..adaae76445d 100644
--- a/storage/ndb/src/mgmapi/LocalConfig.hpp
+++ b/storage/ndb/src/mgmapi/LocalConfig.hpp
@@ -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 LocalConfig_H
 #define LocalConfig_H
diff --git a/storage/ndb/src/mgmapi/Makefile.am b/storage/ndb/src/mgmapi/Makefile.am
index 341563fb7ef..67c4c602e06 100644
--- a/storage/ndb/src/mgmapi/Makefile.am
+++ b/storage/ndb/src/mgmapi/Makefile.am
@@ -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
 
 MYSQLCLUSTERdir=        .
 
diff --git a/storage/ndb/src/mgmapi/mgmapi.cpp b/storage/ndb/src/mgmapi/mgmapi.cpp
index 9ae066d0f6e..57a1237f25a 100644
--- a/storage/ndb/src/mgmapi/mgmapi.cpp
+++ b/storage/ndb/src/mgmapi/mgmapi.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/mgmapi/mgmapi_configuration.cpp b/storage/ndb/src/mgmapi/mgmapi_configuration.cpp
index d5966a4f5a5..d9bf5532169 100644
--- a/storage/ndb/src/mgmapi/mgmapi_configuration.cpp
+++ b/storage/ndb/src/mgmapi/mgmapi_configuration.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/mgmapi/mgmapi_configuration.hpp b/storage/ndb/src/mgmapi/mgmapi_configuration.hpp
index 4ce74568970..e0e1f3aba46 100644
--- a/storage/ndb/src/mgmapi/mgmapi_configuration.hpp
+++ b/storage/ndb/src/mgmapi/mgmapi_configuration.hpp
@@ -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 MGMAPI_CONFIGURATION_HPP
 #define MGMAPI_CONFIGURATION_HPP
diff --git a/storage/ndb/src/mgmapi/mgmapi_internal.h b/storage/ndb/src/mgmapi/mgmapi_internal.h
index 1172bb79ba5..2f14ad3d402 100644
--- a/storage/ndb/src/mgmapi/mgmapi_internal.h
+++ b/storage/ndb/src/mgmapi/mgmapi_internal.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 MGMAPI_INTERNAL_H
 #define MGMAPI_INTERNAL_H
diff --git a/storage/ndb/src/mgmapi/ndb_logevent.cpp b/storage/ndb/src/mgmapi/ndb_logevent.cpp
index 5aeb48440c3..2fb424a4150 100644
--- a/storage/ndb/src/mgmapi/ndb_logevent.cpp
+++ b/storage/ndb/src/mgmapi/ndb_logevent.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/mgmapi/ndb_logevent.hpp b/storage/ndb/src/mgmapi/ndb_logevent.hpp
index 128747ce639..85693b5f12d 100644
--- a/storage/ndb/src/mgmapi/ndb_logevent.hpp
+++ b/storage/ndb/src/mgmapi/ndb_logevent.hpp
@@ -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 NDB_LOGEVENT_HPP
 #define NDB_LOGEVENT_HPP
diff --git a/storage/ndb/src/mgmapi/test/keso.c b/storage/ndb/src/mgmapi/test/keso.c
index d385bcf8451..a3fae4c3442 100644
--- a/storage/ndb/src/mgmapi/test/keso.c
+++ b/storage/ndb/src/mgmapi/test/keso.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 */
 
 
 #include 
diff --git a/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp b/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp
index 97bab7780a0..ecbb4abaac1 100644
--- a/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp
+++ b/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp
@@ -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 */
 
 /****************************************************
  *  Name: 
diff --git a/storage/ndb/src/mgmclient/CommandInterpreter.cpp b/storage/ndb/src/mgmclient/CommandInterpreter.cpp
index 82795fa8185..1b4e1301158 100644
--- a/storage/ndb/src/mgmclient/CommandInterpreter.cpp
+++ b/storage/ndb/src/mgmclient/CommandInterpreter.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/mgmclient/Makefile.am b/storage/ndb/src/mgmclient/Makefile.am
index 4d42d73bace..744d27c3342 100644
--- a/storage/ndb/src/mgmclient/Makefile.am
+++ b/storage/ndb/src/mgmclient/Makefile.am
@@ -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
 
 noinst_LTLIBRARIES = libndbmgmclient.la
 ndbtools_PROGRAMS = ndb_mgm
diff --git a/storage/ndb/src/mgmclient/main.cpp b/storage/ndb/src/mgmclient/main.cpp
index 4622152de82..8dec5ba1dcd 100644
--- a/storage/ndb/src/mgmclient/main.cpp
+++ b/storage/ndb/src/mgmclient/main.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/mgmclient/ndb_mgmclient.h b/storage/ndb/src/mgmclient/ndb_mgmclient.h
index f34297f3cab..343f5de0817 100644
--- a/storage/ndb/src/mgmclient/ndb_mgmclient.h
+++ b/storage/ndb/src/mgmclient/ndb_mgmclient.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 Ndb_mgmclient_h
 #define Ndb_mgmclient_h
diff --git a/storage/ndb/src/mgmclient/ndb_mgmclient.hpp b/storage/ndb/src/mgmclient/ndb_mgmclient.hpp
index e53443a2033..0ab0095ad9d 100644
--- a/storage/ndb/src/mgmclient/ndb_mgmclient.hpp
+++ b/storage/ndb/src/mgmclient/ndb_mgmclient.hpp
@@ -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 Ndb_mgmclient_hpp
 #define Ndb_mgmclient_hpp
diff --git a/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp b/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
index 2580a5729e5..c703539cd79 100644
--- a/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
+++ b/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
@@ -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 
diff --git a/storage/ndb/src/mgmsrv/Config.cpp b/storage/ndb/src/mgmsrv/Config.cpp
index f7461375d0f..fb0c5519949 100644
--- a/storage/ndb/src/mgmsrv/Config.cpp
+++ b/storage/ndb/src/mgmsrv/Config.cpp
@@ -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 "Config.hpp"
 #include 
diff --git a/storage/ndb/src/mgmsrv/Config.hpp b/storage/ndb/src/mgmsrv/Config.hpp
index 31ebd7f219f..025f2e2ab3d 100644
--- a/storage/ndb/src/mgmsrv/Config.hpp
+++ b/storage/ndb/src/mgmsrv/Config.hpp
@@ -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 Config_H
 #define Config_H
diff --git a/storage/ndb/src/mgmsrv/ConfigInfo.cpp b/storage/ndb/src/mgmsrv/ConfigInfo.cpp
index 10dd8bd34c6..65fd7ffddaa 100644
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp
@@ -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 
 #ifndef NDB_MGMAPI
diff --git a/storage/ndb/src/mgmsrv/ConfigInfo.hpp b/storage/ndb/src/mgmsrv/ConfigInfo.hpp
index e1ecb7d7965..f55c575e20a 100644
--- a/storage/ndb/src/mgmsrv/ConfigInfo.hpp
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.hpp
@@ -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 ConfigInfo_H
 #define ConfigInfo_H
diff --git a/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
index c44cb37880a..7ad44c1f757 100644
--- a/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
+++ b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
@@ -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 
 
diff --git a/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp b/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
index 19ceafafda7..7ea92fd944c 100644
--- a/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
+++ b/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
@@ -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 InitConfigFileParser_H
 #define InitConfigFileParser_H
diff --git a/storage/ndb/src/mgmsrv/Makefile.am b/storage/ndb/src/mgmsrv/Makefile.am
index 48524061d66..7b55db5d808 100644
--- a/storage/ndb/src/mgmsrv/Makefile.am
+++ b/storage/ndb/src/mgmsrv/Makefile.am
@@ -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
 
 MYSQLDATAdir =		$(localstatedir)
 MYSQLSHAREdir =		$(pkgdatadir)
diff --git a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
index 6a9377bdd73..26679c7fc53 100644
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/mgmsrv/MgmtSrvr.hpp b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
index 255a3e962ea..ddd25e57167 100644
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
@@ -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 MgmtSrvr_H
 #define MgmtSrvr_H
diff --git a/storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp b/storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
index eee317d780b..3dba51df513 100644
--- a/storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
+++ b/storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp b/storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp
index e80d5b3dcab..603174e262d 100644
--- a/storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp
+++ b/storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp
@@ -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 */
 
 //******************************************************************************
 // General signal handling methods
diff --git a/storage/ndb/src/mgmsrv/Services.cpp b/storage/ndb/src/mgmsrv/Services.cpp
index 3b8e08cf4dd..7461e605891 100644
--- a/storage/ndb/src/mgmsrv/Services.cpp
+++ b/storage/ndb/src/mgmsrv/Services.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/mgmsrv/Services.hpp b/storage/ndb/src/mgmsrv/Services.hpp
index 6020ac60f4f..8d6888db71f 100644
--- a/storage/ndb/src/mgmsrv/Services.hpp
+++ b/storage/ndb/src/mgmsrv/Services.hpp
@@ -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 MGMAPI_SERVICE_HPP
 #define MGMAPI_SERVICE_HPP
diff --git a/storage/ndb/src/mgmsrv/SignalQueue.cpp b/storage/ndb/src/mgmsrv/SignalQueue.cpp
index a8b993d2760..9fa1bad05ac 100644
--- a/storage/ndb/src/mgmsrv/SignalQueue.cpp
+++ b/storage/ndb/src/mgmsrv/SignalQueue.cpp
@@ -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 
 #include "SignalQueue.hpp"
diff --git a/storage/ndb/src/mgmsrv/SignalQueue.hpp b/storage/ndb/src/mgmsrv/SignalQueue.hpp
index e73bb25daab..7ce78d1dea0 100644
--- a/storage/ndb/src/mgmsrv/SignalQueue.hpp
+++ b/storage/ndb/src/mgmsrv/SignalQueue.hpp
@@ -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 __SIGNALQUEUE_HPP_INCLUDED__
 #define __SIGNALQUEUE_HPP_INCLUDED__
diff --git a/storage/ndb/src/mgmsrv/convertStrToInt.cpp b/storage/ndb/src/mgmsrv/convertStrToInt.cpp
index 1ca0eeb8da7..18338bad79d 100644
--- a/storage/ndb/src/mgmsrv/convertStrToInt.cpp
+++ b/storage/ndb/src/mgmsrv/convertStrToInt.cpp
@@ -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 
 
diff --git a/storage/ndb/src/mgmsrv/convertStrToInt.hpp b/storage/ndb/src/mgmsrv/convertStrToInt.hpp
index dd144705da9..db635af5619 100644
--- a/storage/ndb/src/mgmsrv/convertStrToInt.hpp
+++ b/storage/ndb/src/mgmsrv/convertStrToInt.hpp
@@ -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 */
 
 //******************************************************************************
 // Description: 
diff --git a/storage/ndb/src/mgmsrv/main.cpp b/storage/ndb/src/mgmsrv/main.cpp
index 7cf286db969..31538d85133 100644
--- a/storage/ndb/src/mgmsrv/main.cpp
+++ b/storage/ndb/src/mgmsrv/main.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp b/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
index 90e179e7f4f..279cb7dc1c9 100644
--- a/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
+++ b/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/mgmsrv/ndb_mgmd_error.h b/storage/ndb/src/mgmsrv/ndb_mgmd_error.h
index 61302ea6945..d5f8ca434a4 100644
--- a/storage/ndb/src/mgmsrv/ndb_mgmd_error.h
+++ b/storage/ndb/src/mgmsrv/ndb_mgmd_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 NDB_MGMD_ERROR_H
 #define NDB_MGMD_ERROR_H
diff --git a/storage/ndb/src/ndbapi/API.hpp b/storage/ndb/src/ndbapi/API.hpp
index 250f6499fa6..290a43605a6 100644
--- a/storage/ndb/src/ndbapi/API.hpp
+++ b/storage/ndb/src/ndbapi/API.hpp
@@ -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 API_H
 #define API_H
diff --git a/storage/ndb/src/ndbapi/ClusterMgr.cpp b/storage/ndb/src/ndbapi/ClusterMgr.cpp
index 123c18cbcc6..f3c1982784b 100644
--- a/storage/ndb/src/ndbapi/ClusterMgr.cpp
+++ b/storage/ndb/src/ndbapi/ClusterMgr.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/ClusterMgr.hpp b/storage/ndb/src/ndbapi/ClusterMgr.hpp
index e0c8e50236a..26481bafe8f 100644
--- a/storage/ndb/src/ndbapi/ClusterMgr.hpp
+++ b/storage/ndb/src/ndbapi/ClusterMgr.hpp
@@ -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 ClusterMgr_H
 #define ClusterMgr_H
diff --git a/storage/ndb/src/ndbapi/DictCache.cpp b/storage/ndb/src/ndbapi/DictCache.cpp
index 44f258526b3..70e97c72b79 100644
--- a/storage/ndb/src/ndbapi/DictCache.cpp
+++ b/storage/ndb/src/ndbapi/DictCache.cpp
@@ -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 
 #include "DictCache.hpp"
diff --git a/storage/ndb/src/ndbapi/DictCache.hpp b/storage/ndb/src/ndbapi/DictCache.hpp
index 8839358185d..d7ac63c81e4 100644
--- a/storage/ndb/src/ndbapi/DictCache.hpp
+++ b/storage/ndb/src/ndbapi/DictCache.hpp
@@ -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 DictCache_H
 #define DictCache_H
diff --git a/storage/ndb/src/ndbapi/Makefile.am b/storage/ndb/src/ndbapi/Makefile.am
index 07c09a0f515..c8cd7d25a1e 100644
--- a/storage/ndb/src/ndbapi/Makefile.am
+++ b/storage/ndb/src/ndbapi/Makefile.am
@@ -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
 
 #SUBDIRS = signal-sender
 
diff --git a/storage/ndb/src/ndbapi/Ndb.cpp b/storage/ndb/src/ndbapi/Ndb.cpp
index 005fa2633aa..ed33ecd1aed 100644
--- a/storage/ndb/src/ndbapi/Ndb.cpp
+++ b/storage/ndb/src/ndbapi/Ndb.cpp
@@ -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/storage/ndb/src/ndbapi/NdbApiSignal.cpp b/storage/ndb/src/ndbapi/NdbApiSignal.cpp
index 89873f22d32..f710446ae9d 100644
--- a/storage/ndb/src/ndbapi/NdbApiSignal.cpp
+++ b/storage/ndb/src/ndbapi/NdbApiSignal.cpp
@@ -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 "API.hpp"
diff --git a/storage/ndb/src/ndbapi/NdbApiSignal.hpp b/storage/ndb/src/ndbapi/NdbApiSignal.hpp
index e28a246b934..90f9607ed83 100644
--- a/storage/ndb/src/ndbapi/NdbApiSignal.hpp
+++ b/storage/ndb/src/ndbapi/NdbApiSignal.hpp
@@ -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 */
 
 /**********************************************************************
  * Name:		NdbApiSignal.H
diff --git a/storage/ndb/src/ndbapi/NdbBlob.cpp b/storage/ndb/src/ndbapi/NdbBlob.cpp
index 60b38e6b593..139e1b78347 100644
--- a/storage/ndb/src/ndbapi/NdbBlob.cpp
+++ b/storage/ndb/src/ndbapi/NdbBlob.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/NdbBlobImpl.hpp b/storage/ndb/src/ndbapi/NdbBlobImpl.hpp
index d250e176c11..7fcdb67d709 100644
--- a/storage/ndb/src/ndbapi/NdbBlobImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbBlobImpl.hpp
@@ -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 NdbBlobImpl_H
 #define NdbBlobImpl_H
diff --git a/storage/ndb/src/ndbapi/NdbDictionary.cpp b/storage/ndb/src/ndbapi/NdbDictionary.cpp
index 318cfb8cced..9c9a396ec81 100644
--- a/storage/ndb/src/ndbapi/NdbDictionary.cpp
+++ b/storage/ndb/src/ndbapi/NdbDictionary.cpp
@@ -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 
 #include "NdbDictionaryImpl.hpp"
diff --git a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
index d9b00a68f6b..cf137eb3a87 100644
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
@@ -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 "NdbDictionaryImpl.hpp"
 #include "API.hpp"
diff --git a/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
index e3cf3488ce7..507599d3586 100644
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
@@ -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 NdbDictionaryImpl_H
 #define NdbDictionaryImpl_H
diff --git a/storage/ndb/src/ndbapi/NdbErrorOut.cpp b/storage/ndb/src/ndbapi/NdbErrorOut.cpp
index efd5eb211c7..699c466528c 100644
--- a/storage/ndb/src/ndbapi/NdbErrorOut.cpp
+++ b/storage/ndb/src/ndbapi/NdbErrorOut.cpp
@@ -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 
diff --git a/storage/ndb/src/ndbapi/NdbEventOperation.cpp b/storage/ndb/src/ndbapi/NdbEventOperation.cpp
index 4ba295534b4..7c21500ea25 100644
--- a/storage/ndb/src/ndbapi/NdbEventOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbEventOperation.cpp
@@ -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 
diff --git a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
index 0c6f3acc144..1a42a81d28a 100644
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
@@ -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 
diff --git a/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
index 1c80c5f9df1..f84627a97c5 100644
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
@@ -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 NdbEventOperationImpl_H
 #define NdbEventOperationImpl_H
diff --git a/storage/ndb/src/ndbapi/NdbImpl.hpp b/storage/ndb/src/ndbapi/NdbImpl.hpp
index 0792c0e271f..8d005749743 100644
--- a/storage/ndb/src/ndbapi/NdbImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbImpl.hpp
@@ -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 NDB_IMPL_HPP
 #define NDB_IMPL_HPP
diff --git a/storage/ndb/src/ndbapi/NdbIndexOperation.cpp b/storage/ndb/src/ndbapi/NdbIndexOperation.cpp
index d85639ac55f..6d7ef1987b3 100644
--- a/storage/ndb/src/ndbapi/NdbIndexOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbIndexOperation.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/NdbIndexStat.cpp b/storage/ndb/src/ndbapi/NdbIndexStat.cpp
index 79bb5a495b5..317741bb49e 100644
--- a/storage/ndb/src/ndbapi/NdbIndexStat.cpp
+++ b/storage/ndb/src/ndbapi/NdbIndexStat.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/NdbLinHash.hpp b/storage/ndb/src/ndbapi/NdbLinHash.hpp
index e3db91de400..ddbb5d442e9 100644
--- a/storage/ndb/src/ndbapi/NdbLinHash.hpp
+++ b/storage/ndb/src/ndbapi/NdbLinHash.hpp
@@ -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 NdbLinHash_H
 #define NdbLinHash_H
diff --git a/storage/ndb/src/ndbapi/NdbOperation.cpp b/storage/ndb/src/ndbapi/NdbOperation.cpp
index 521f393e525..df130bad2fc 100644
--- a/storage/ndb/src/ndbapi/NdbOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperation.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/NdbOperationDefine.cpp b/storage/ndb/src/ndbapi/NdbOperationDefine.cpp
index b70d66260b0..7a310a5d2c9 100644
--- a/storage/ndb/src/ndbapi/NdbOperationDefine.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationDefine.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/NdbOperationExec.cpp b/storage/ndb/src/ndbapi/NdbOperationExec.cpp
index 113313a462b..181de269fd9 100644
--- a/storage/ndb/src/ndbapi/NdbOperationExec.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationExec.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/NdbOperationInt.cpp b/storage/ndb/src/ndbapi/NdbOperationInt.cpp
index 165712b6c06..d2fe83eeec1 100644
--- a/storage/ndb/src/ndbapi/NdbOperationInt.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationInt.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/NdbOperationScan.cpp b/storage/ndb/src/ndbapi/NdbOperationScan.cpp
index 3b796dfa83d..25b2298d854 100644
--- a/storage/ndb/src/ndbapi/NdbOperationScan.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationScan.cpp
@@ -12,5 +12,5 @@
 
    You should have 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/storage/ndb/src/ndbapi/NdbOperationSearch.cpp b/storage/ndb/src/ndbapi/NdbOperationSearch.cpp
index b332bfb6cc7..d39096765ea 100644
--- a/storage/ndb/src/ndbapi/NdbOperationSearch.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationSearch.cpp
@@ -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/storage/ndb/src/ndbapi/NdbPool.cpp b/storage/ndb/src/ndbapi/NdbPool.cpp
index 9e5254469bd..5f3051e9945 100644
--- a/storage/ndb/src/ndbapi/NdbPool.cpp
+++ b/storage/ndb/src/ndbapi/NdbPool.cpp
@@ -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 
 #include "NdbPoolImpl.hpp"
diff --git a/storage/ndb/src/ndbapi/NdbPoolImpl.cpp b/storage/ndb/src/ndbapi/NdbPoolImpl.cpp
index d921a78fa58..da0edbc227c 100644
--- a/storage/ndb/src/ndbapi/NdbPoolImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbPoolImpl.cpp
@@ -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 "NdbPoolImpl.hpp"
 
diff --git a/storage/ndb/src/ndbapi/NdbPoolImpl.hpp b/storage/ndb/src/ndbapi/NdbPoolImpl.hpp
index 5764ac5871b..c5c78b18aa4 100644
--- a/storage/ndb/src/ndbapi/NdbPoolImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbPoolImpl.hpp
@@ -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 */
 
 /**
   @section ndbPool              Pooling of NDB objects
diff --git a/storage/ndb/src/ndbapi/NdbRecAttr.cpp b/storage/ndb/src/ndbapi/NdbRecAttr.cpp
index 142b08e051f..8da51cd078d 100644
--- a/storage/ndb/src/ndbapi/NdbRecAttr.cpp
+++ b/storage/ndb/src/ndbapi/NdbRecAttr.cpp
@@ -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 
diff --git a/storage/ndb/src/ndbapi/NdbReceiver.cpp b/storage/ndb/src/ndbapi/NdbReceiver.cpp
index 4512a94df17..cf9d3a0449d 100644
--- a/storage/ndb/src/ndbapi/NdbReceiver.cpp
+++ b/storage/ndb/src/ndbapi/NdbReceiver.cpp
@@ -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 
 #include "NdbImpl.hpp"
diff --git a/storage/ndb/src/ndbapi/NdbScanFilter.cpp b/storage/ndb/src/ndbapi/NdbScanFilter.cpp
index 985677b3dfd..f71191ee81c 100644
--- a/storage/ndb/src/ndbapi/NdbScanFilter.cpp
+++ b/storage/ndb/src/ndbapi/NdbScanFilter.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/NdbScanOperation.cpp b/storage/ndb/src/ndbapi/NdbScanOperation.cpp
index 6f26db3c37e..08c6140c54e 100644
--- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/NdbTransaction.cpp b/storage/ndb/src/ndbapi/NdbTransaction.cpp
index f446267f3b2..b8f2ca3f133 100644
--- a/storage/ndb/src/ndbapi/NdbTransaction.cpp
+++ b/storage/ndb/src/ndbapi/NdbTransaction.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/NdbTransactionScan.cpp b/storage/ndb/src/ndbapi/NdbTransactionScan.cpp
index 2d77e33c3a3..d8859453449 100644
--- a/storage/ndb/src/ndbapi/NdbTransactionScan.cpp
+++ b/storage/ndb/src/ndbapi/NdbTransactionScan.cpp
@@ -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 
diff --git a/storage/ndb/src/ndbapi/NdbUtil.cpp b/storage/ndb/src/ndbapi/NdbUtil.cpp
index ec1733f1905..09baff5c32c 100644
--- a/storage/ndb/src/ndbapi/NdbUtil.cpp
+++ b/storage/ndb/src/ndbapi/NdbUtil.cpp
@@ -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/storage/ndb/src/ndbapi/NdbUtil.hpp b/storage/ndb/src/ndbapi/NdbUtil.hpp
index d198c0126d9..b3cdf9f4936 100644
--- a/storage/ndb/src/ndbapi/NdbUtil.hpp
+++ b/storage/ndb/src/ndbapi/NdbUtil.hpp
@@ -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 */
 
 /************************************************************************************************
 Name:		NdbUtil.H
diff --git a/storage/ndb/src/ndbapi/NdbWaiter.hpp b/storage/ndb/src/ndbapi/NdbWaiter.hpp
index 5eef2036a63..80a6bd34540 100644
--- a/storage/ndb/src/ndbapi/NdbWaiter.hpp
+++ b/storage/ndb/src/ndbapi/NdbWaiter.hpp
@@ -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 NDB_WAITER_HPP
 #define NDB_WAITER_HPP
diff --git a/storage/ndb/src/ndbapi/Ndberr.cpp b/storage/ndb/src/ndbapi/Ndberr.cpp
index a20ce2030c6..f80ace3b277 100644
--- a/storage/ndb/src/ndbapi/Ndberr.cpp
+++ b/storage/ndb/src/ndbapi/Ndberr.cpp
@@ -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 
diff --git a/storage/ndb/src/ndbapi/Ndbif.cpp b/storage/ndb/src/ndbapi/Ndbif.cpp
index ba3aebc5800..67931c1d469 100644
--- a/storage/ndb/src/ndbapi/Ndbif.cpp
+++ b/storage/ndb/src/ndbapi/Ndbif.cpp
@@ -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 
diff --git a/storage/ndb/src/ndbapi/Ndbinit.cpp b/storage/ndb/src/ndbapi/Ndbinit.cpp
index d32fffb9744..54c7d4b6383 100644
--- a/storage/ndb/src/ndbapi/Ndbinit.cpp
+++ b/storage/ndb/src/ndbapi/Ndbinit.cpp
@@ -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 
diff --git a/storage/ndb/src/ndbapi/Ndblist.cpp b/storage/ndb/src/ndbapi/Ndblist.cpp
index e4aaacda0bb..dd811ae1d30 100644
--- a/storage/ndb/src/ndbapi/Ndblist.cpp
+++ b/storage/ndb/src/ndbapi/Ndblist.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/ObjectMap.cpp b/storage/ndb/src/ndbapi/ObjectMap.cpp
index e861472d4fc..b572172bf89 100644
--- a/storage/ndb/src/ndbapi/ObjectMap.cpp
+++ b/storage/ndb/src/ndbapi/ObjectMap.cpp
@@ -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 "ObjectMap.hpp"
 
diff --git a/storage/ndb/src/ndbapi/ObjectMap.hpp b/storage/ndb/src/ndbapi/ObjectMap.hpp
index eb4bb8e6a81..5578915c2e4 100644
--- a/storage/ndb/src/ndbapi/ObjectMap.hpp
+++ b/storage/ndb/src/ndbapi/ObjectMap.hpp
@@ -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 NDB_OBJECT_ID_MAP_HPP
 #define NDB_OBJECT_ID_MAP_HPP
diff --git a/storage/ndb/src/ndbapi/SignalSender.cpp b/storage/ndb/src/ndbapi/SignalSender.cpp
index d0ccbeed9a3..38bdb885bf5 100644
--- a/storage/ndb/src/ndbapi/SignalSender.cpp
+++ b/storage/ndb/src/ndbapi/SignalSender.cpp
@@ -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 "SignalSender.hpp"
 #include 
diff --git a/storage/ndb/src/ndbapi/SignalSender.hpp b/storage/ndb/src/ndbapi/SignalSender.hpp
index fa92c3b789d..1e8e637ca84 100644
--- a/storage/ndb/src/ndbapi/SignalSender.hpp
+++ b/storage/ndb/src/ndbapi/SignalSender.hpp
@@ -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 SIGNAL_SENDER_HPP
 #define SIGNAL_SENDER_HPP
diff --git a/storage/ndb/src/ndbapi/TransporterFacade.cpp b/storage/ndb/src/ndbapi/TransporterFacade.cpp
index 257a17d9362..7f4c1147f11 100644
--- a/storage/ndb/src/ndbapi/TransporterFacade.cpp
+++ b/storage/ndb/src/ndbapi/TransporterFacade.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/TransporterFacade.hpp b/storage/ndb/src/ndbapi/TransporterFacade.hpp
index 2870565f60a..9da836031eb 100644
--- a/storage/ndb/src/ndbapi/TransporterFacade.hpp
+++ b/storage/ndb/src/ndbapi/TransporterFacade.hpp
@@ -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 TransporterFacade_H
 #define TransporterFacade_H
diff --git a/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp b/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
index 4228e26fd34..f8431e74430 100644
--- a/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
+++ b/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp b/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
index d299f44ed9a..3fc72ad2b40 100644
--- a/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
+++ b/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
@@ -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 CLUSTER_CONNECTION_IMPL_HPP
diff --git a/storage/ndb/src/ndbapi/ndb_internal.hpp b/storage/ndb/src/ndbapi/ndb_internal.hpp
index 4b9ed63ab07..53bc72157bc 100644
--- a/storage/ndb/src/ndbapi/ndb_internal.hpp
+++ b/storage/ndb/src/ndbapi/ndb_internal.hpp
@@ -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 "NdbImpl.hpp"
 
diff --git a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c
index 24bf70a6635..6308ccc830e 100644
--- a/storage/ndb/src/ndbapi/ndberror.c
+++ b/storage/ndb/src/ndbapi/ndberror.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 */
 
 
 #include 
diff --git a/storage/ndb/src/ndbapi/ndberror_check.c b/storage/ndb/src/ndbapi/ndberror_check.c
index 725f0207827..982ac8088f8 100644
--- a/storage/ndb/src/ndbapi/ndberror_check.c
+++ b/storage/ndb/src/ndbapi/ndberror_check.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 */
 
 #include 
 #include "ndberror.c"
diff --git a/storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp b/storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp
index b68c9a4e6c3..c6d3cc1e378 100644
--- a/storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp
+++ b/storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp
@@ -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 "SignalSender.hpp"
 #include "ConfigRetriever.hpp"
diff --git a/storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp b/storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp
index 7dab3c0eec6..d3967fb8a91 100644
--- a/storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp
+++ b/storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp
@@ -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 SIGNAL_SENDER_HPP
 #define SIGNAL_SENDER_HPP
diff --git a/storage/ndb/test/Makefile.am b/storage/ndb/test/Makefile.am
index e9742ba202e..e87cf3c988a 100644
--- a/storage/ndb/test/Makefile.am
+++ b/storage/ndb/test/Makefile.am
@@ -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
 
 SUBDIRS = src tools ndbapi run-test
 
diff --git a/storage/ndb/test/include/AtrtClient.hpp b/storage/ndb/test/include/AtrtClient.hpp
index 89f44d4ac58..bd26161cbe6 100644
--- a/storage/ndb/test/include/AtrtClient.hpp
+++ b/storage/ndb/test/include/AtrtClient.hpp
@@ -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 ATRT_CLIENT_HPP
 #define ATRT_CLIENT_HPP
diff --git a/storage/ndb/test/include/CpcClient.hpp b/storage/ndb/test/include/CpcClient.hpp
index bc65e5ee485..9a11d3a9edc 100644
--- a/storage/ndb/test/include/CpcClient.hpp
+++ b/storage/ndb/test/include/CpcClient.hpp
@@ -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 __CPCCLIENT_HPP_INCLUDED__
 #define __CPCCLIENT_HPP_INCLUDED__
diff --git a/storage/ndb/test/include/DbUtil.hpp b/storage/ndb/test/include/DbUtil.hpp
index 47b335d060e..20b9e9f8fb6 100755
--- a/storage/ndb/test/include/DbUtil.hpp
+++ b/storage/ndb/test/include/DbUtil.hpp
@@ -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 */
 
 // dbutil.h: interface for the database utilities class.
 // Supplies a database to the test application
diff --git a/storage/ndb/test/include/HugoAsynchTransactions.hpp b/storage/ndb/test/include/HugoAsynchTransactions.hpp
index ac3e0782ef8..1d9308947b6 100644
--- a/storage/ndb/test/include/HugoAsynchTransactions.hpp
+++ b/storage/ndb/test/include/HugoAsynchTransactions.hpp
@@ -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 HUGO_ASYNCH_TRANSACTIONS_HPP
 #define HUGO_ASYNCH_TRANSACTIONS_HPP
diff --git a/storage/ndb/test/include/HugoCalculator.hpp b/storage/ndb/test/include/HugoCalculator.hpp
index 602eefe9398..37d2c289137 100644
--- a/storage/ndb/test/include/HugoCalculator.hpp
+++ b/storage/ndb/test/include/HugoCalculator.hpp
@@ -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 NDBT_CALC_HPP
 #define NDBT_CALC_HPP
diff --git a/storage/ndb/test/include/HugoOperations.hpp b/storage/ndb/test/include/HugoOperations.hpp
index f3479185891..30521259989 100644
--- a/storage/ndb/test/include/HugoOperations.hpp
+++ b/storage/ndb/test/include/HugoOperations.hpp
@@ -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 HUGO_OPERATIONS_HPP
 #define HUGO_OPERATIONS_HPP
diff --git a/storage/ndb/test/include/HugoTransactions.hpp b/storage/ndb/test/include/HugoTransactions.hpp
index 207c03d4290..b93cec0542a 100644
--- a/storage/ndb/test/include/HugoTransactions.hpp
+++ b/storage/ndb/test/include/HugoTransactions.hpp
@@ -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 HUGO_TRANSACTIONS_HPP
 #define HUGO_TRANSACTIONS_HPP
diff --git a/storage/ndb/test/include/NDBT.hpp b/storage/ndb/test/include/NDBT.hpp
index b30d12dc22c..6deb151c7d8 100644
--- a/storage/ndb/test/include/NDBT.hpp
+++ b/storage/ndb/test/include/NDBT.hpp
@@ -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 NDB_TEST_HPP
 #define NDB_TEST_HPP
diff --git a/storage/ndb/test/include/NDBT_DataSet.hpp b/storage/ndb/test/include/NDBT_DataSet.hpp
index ed1dda7c438..0fc3c690f60 100644
--- a/storage/ndb/test/include/NDBT_DataSet.hpp
+++ b/storage/ndb/test/include/NDBT_DataSet.hpp
@@ -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 NDBT_DATA_SET_HPP
 #define NDBT_DATA_SET_HPP
diff --git a/storage/ndb/test/include/NDBT_DataSetTransaction.hpp b/storage/ndb/test/include/NDBT_DataSetTransaction.hpp
index 77cd2818b20..626de1d24f8 100644
--- a/storage/ndb/test/include/NDBT_DataSetTransaction.hpp
+++ b/storage/ndb/test/include/NDBT_DataSetTransaction.hpp
@@ -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 NDBT_DATA_SET_TRANSACTION_HPP
 #define NDBT_DATA_SET_TRANSACTION_HPP
diff --git a/storage/ndb/test/include/NDBT_Error.hpp b/storage/ndb/test/include/NDBT_Error.hpp
index 1d057d6b90f..bf2ab655d18 100644
--- a/storage/ndb/test/include/NDBT_Error.hpp
+++ b/storage/ndb/test/include/NDBT_Error.hpp
@@ -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 NDBT_Error_HPP
 #define NDBT_Error_HPP
diff --git a/storage/ndb/test/include/NDBT_Output.hpp b/storage/ndb/test/include/NDBT_Output.hpp
index 3d1fa94acc4..d5fe59ce376 100644
--- a/storage/ndb/test/include/NDBT_Output.hpp
+++ b/storage/ndb/test/include/NDBT_Output.hpp
@@ -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 NDBT_Output_HPP
 #define NDBT_Output_HPP
diff --git a/storage/ndb/test/include/NDBT_ResultRow.hpp b/storage/ndb/test/include/NDBT_ResultRow.hpp
index 073eef64396..e002af2d8fe 100644
--- a/storage/ndb/test/include/NDBT_ResultRow.hpp
+++ b/storage/ndb/test/include/NDBT_ResultRow.hpp
@@ -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 NDBT_RESULTROW_HPP
 #define NDBT_RESULTROW_HPP
diff --git a/storage/ndb/test/include/NDBT_ReturnCodes.h b/storage/ndb/test/include/NDBT_ReturnCodes.h
index f28f37e3838..d8e09bae5bb 100644
--- a/storage/ndb/test/include/NDBT_ReturnCodes.h
+++ b/storage/ndb/test/include/NDBT_ReturnCodes.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 NDBT_RETURNCODES_H
 #define NDBT_RETURNCODES_H
diff --git a/storage/ndb/test/include/NDBT_Stats.hpp b/storage/ndb/test/include/NDBT_Stats.hpp
index 62b831a65db..9259eb1c05d 100644
--- a/storage/ndb/test/include/NDBT_Stats.hpp
+++ b/storage/ndb/test/include/NDBT_Stats.hpp
@@ -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 NDBT_STATS_HPP
 #define NDBT_STATS_HPP
diff --git a/storage/ndb/test/include/NDBT_Table.hpp b/storage/ndb/test/include/NDBT_Table.hpp
index 05b94b8ffca..9faa169f4e5 100644
--- a/storage/ndb/test/include/NDBT_Table.hpp
+++ b/storage/ndb/test/include/NDBT_Table.hpp
@@ -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 NDBT_TABLE_HPP
 #define NDBT_TABLE_HPP
diff --git a/storage/ndb/test/include/NDBT_Tables.hpp b/storage/ndb/test/include/NDBT_Tables.hpp
index 573559f7ea0..dca03510dcf 100644
--- a/storage/ndb/test/include/NDBT_Tables.hpp
+++ b/storage/ndb/test/include/NDBT_Tables.hpp
@@ -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 NDBT_TABLES_HPP
 #define NDBT_TABLES_HPP
diff --git a/storage/ndb/test/include/NDBT_Test.hpp b/storage/ndb/test/include/NDBT_Test.hpp
index 1197d9646b5..abb03331cb6 100644
--- a/storage/ndb/test/include/NDBT_Test.hpp
+++ b/storage/ndb/test/include/NDBT_Test.hpp
@@ -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 NDBT_TEST_HPP
 #define NDBT_TEST_HPP
diff --git a/storage/ndb/test/include/NDBT_Thread.hpp b/storage/ndb/test/include/NDBT_Thread.hpp
index e0ac3e675b9..68fad66ed94 100644
--- a/storage/ndb/test/include/NDBT_Thread.hpp
+++ b/storage/ndb/test/include/NDBT_Thread.hpp
@@ -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 NDB_THREAD_HPP
 #define NDB_THREAD_HPP
diff --git a/storage/ndb/test/include/NdbBackup.hpp b/storage/ndb/test/include/NdbBackup.hpp
index 44bec57fb55..11cb44e0f06 100644
--- a/storage/ndb/test/include/NdbBackup.hpp
+++ b/storage/ndb/test/include/NdbBackup.hpp
@@ -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 NDBT_BACKUP_HPP
 #define NDBT_BACKUP_HPP
diff --git a/storage/ndb/test/include/NdbConfig.hpp b/storage/ndb/test/include/NdbConfig.hpp
index 4e8ca7141ec..e49f77501ae 100644
--- a/storage/ndb/test/include/NdbConfig.hpp
+++ b/storage/ndb/test/include/NdbConfig.hpp
@@ -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 NDBT_CONFIG_HPP
 #define NDBT_CONFIG_HPP
diff --git a/storage/ndb/test/include/NdbGrep.hpp b/storage/ndb/test/include/NdbGrep.hpp
index dc7fa770c9d..5d999662b76 100644
--- a/storage/ndb/test/include/NdbGrep.hpp
+++ b/storage/ndb/test/include/NdbGrep.hpp
@@ -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 NDBT_GREP_HPP
 #define NDBT_GREP_HPP
diff --git a/storage/ndb/test/include/NdbMixRestarter.hpp b/storage/ndb/test/include/NdbMixRestarter.hpp
index c532243297c..d119d66ee4c 100644
--- a/storage/ndb/test/include/NdbMixRestarter.hpp
+++ b/storage/ndb/test/include/NdbMixRestarter.hpp
@@ -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 NDBT_MIX_RESTARTER_HPP
 #define NDBT_MIX_RESTARTER_HPP
diff --git a/storage/ndb/test/include/NdbRestarter.hpp b/storage/ndb/test/include/NdbRestarter.hpp
index 0cc754872e5..0764d3daefc 100644
--- a/storage/ndb/test/include/NdbRestarter.hpp
+++ b/storage/ndb/test/include/NdbRestarter.hpp
@@ -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 NDBT_RESTARTER_HPP
 #define NDBT_RESTARTER_HPP
diff --git a/storage/ndb/test/include/NdbRestarts.hpp b/storage/ndb/test/include/NdbRestarts.hpp
index 187d34c5bfc..779525a56c8 100644
--- a/storage/ndb/test/include/NdbRestarts.hpp
+++ b/storage/ndb/test/include/NdbRestarts.hpp
@@ -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 NDBT_RESTARTS_HPP
 #define NDBT_RESTARTS_HPP
diff --git a/storage/ndb/test/include/NdbSchemaCon.hpp b/storage/ndb/test/include/NdbSchemaCon.hpp
index 7166705d7b0..51b8a71b14c 100644
--- a/storage/ndb/test/include/NdbSchemaCon.hpp
+++ b/storage/ndb/test/include/NdbSchemaCon.hpp
@@ -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 NdbSchemaCon_H
 #define NdbSchemaCon_H
diff --git a/storage/ndb/test/include/NdbSchemaOp.hpp b/storage/ndb/test/include/NdbSchemaOp.hpp
index ea878f1a8ee..f1fd12a65b9 100644
--- a/storage/ndb/test/include/NdbSchemaOp.hpp
+++ b/storage/ndb/test/include/NdbSchemaOp.hpp
@@ -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 NdbSchemaOp_H
 #define NdbSchemaOp_H
diff --git a/storage/ndb/test/include/NdbTest.hpp b/storage/ndb/test/include/NdbTest.hpp
index 3bea743a3a0..10d339e1279 100644
--- a/storage/ndb/test/include/NdbTest.hpp
+++ b/storage/ndb/test/include/NdbTest.hpp
@@ -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 NDB_TEST_HPP
 #define NDB_TEST_HPP
diff --git a/storage/ndb/test/include/NdbTimer.hpp b/storage/ndb/test/include/NdbTimer.hpp
index 5b3ca3357a3..e8e7d893865 100644
--- a/storage/ndb/test/include/NdbTimer.hpp
+++ b/storage/ndb/test/include/NdbTimer.hpp
@@ -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 NDBTIMER_H
 #define NDBTIMER_H
diff --git a/storage/ndb/test/include/TestNdbEventOperation.hpp b/storage/ndb/test/include/TestNdbEventOperation.hpp
index 4a92f01d15f..dd7b17544dc 100644
--- a/storage/ndb/test/include/TestNdbEventOperation.hpp
+++ b/storage/ndb/test/include/TestNdbEventOperation.hpp
@@ -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 */
 
 struct EventOperationStats {
   int n_inserts;
diff --git a/storage/ndb/test/include/UtilTransactions.hpp b/storage/ndb/test/include/UtilTransactions.hpp
index fc36ca568c3..1599827ebe9 100644
--- a/storage/ndb/test/include/UtilTransactions.hpp
+++ b/storage/ndb/test/include/UtilTransactions.hpp
@@ -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 UTIL_TRANSACTIONS_HPP
 #define UTIL_TRANSACTIONS_HPP
diff --git a/storage/ndb/test/include/getarg.h b/storage/ndb/test/include/getarg.h
index 70ae0b8d128..fcb755216ce 100644
--- a/storage/ndb/test/include/getarg.h
+++ b/storage/ndb/test/include/getarg.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 */
 
 /*
  * Copyright (c) 1997, 1999 Kungliga Tekniska Högskolan
diff --git a/storage/ndb/test/ndbapi/InsertRecs.cpp b/storage/ndb/test/ndbapi/InsertRecs.cpp
index da31a8ff671..c14c0bde007 100644
--- a/storage/ndb/test/ndbapi/InsertRecs.cpp
+++ b/storage/ndb/test/ndbapi/InsertRecs.cpp
@@ -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 */
 
 // InsertRecs.cpp : Defines the entry point for the console application.
 //
diff --git a/storage/ndb/test/ndbapi/Makefile.am b/storage/ndb/test/ndbapi/Makefile.am
index d34d5e0590b..ab2e2dfe3cf 100644
--- a/storage/ndb/test/ndbapi/Makefile.am
+++ b/storage/ndb/test/ndbapi/Makefile.am
@@ -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
 
 SUBDIRS = bank
 
diff --git a/storage/ndb/test/ndbapi/ScanFilter.hpp b/storage/ndb/test/ndbapi/ScanFilter.hpp
index b4c51fa14f1..fd7afac7363 100644
--- a/storage/ndb/test/ndbapi/ScanFilter.hpp
+++ b/storage/ndb/test/ndbapi/ScanFilter.hpp
@@ -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 SCAN_FILTER_HPP
 #define SCAN_FILTER_HPP
diff --git a/storage/ndb/test/ndbapi/ScanFunctions.hpp b/storage/ndb/test/ndbapi/ScanFunctions.hpp
index e2f6e75f88f..66340dc3330 100644
--- a/storage/ndb/test/ndbapi/ScanFunctions.hpp
+++ b/storage/ndb/test/ndbapi/ScanFunctions.hpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/ScanInterpretTest.hpp b/storage/ndb/test/ndbapi/ScanInterpretTest.hpp
index 52eb0f46cc4..8f34da71f7a 100644
--- a/storage/ndb/test/ndbapi/ScanInterpretTest.hpp
+++ b/storage/ndb/test/ndbapi/ScanInterpretTest.hpp
@@ -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 SCAN_INTERPRET_TEST_HPP
 #define SCAN_INTERPRET_TEST_HPP
diff --git a/storage/ndb/test/ndbapi/TraceNdbApi.cpp b/storage/ndb/test/ndbapi/TraceNdbApi.cpp
index 434485f0198..e9cad451588 100644
--- a/storage/ndb/test/ndbapi/TraceNdbApi.cpp
+++ b/storage/ndb/test/ndbapi/TraceNdbApi.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/VerifyNdbApi.cpp b/storage/ndb/test/ndbapi/VerifyNdbApi.cpp
index d2052b14591..ebee2060162 100644
--- a/storage/ndb/test/ndbapi/VerifyNdbApi.cpp
+++ b/storage/ndb/test/ndbapi/VerifyNdbApi.cpp
@@ -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 
diff --git a/storage/ndb/test/ndbapi/acid.cpp b/storage/ndb/test/ndbapi/acid.cpp
index 375a41cd076..bed3927eb75 100644
--- a/storage/ndb/test/ndbapi/acid.cpp
+++ b/storage/ndb/test/ndbapi/acid.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/acid2.cpp b/storage/ndb/test/ndbapi/acid2.cpp
index d5fe8778aab..a7274ebe50f 100644
--- a/storage/ndb/test/ndbapi/acid2.cpp
+++ b/storage/ndb/test/ndbapi/acid2.cpp
@@ -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 
diff --git a/storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp b/storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
index 5b9e0ffdb71..496171bfa8c 100644
--- a/storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
+++ b/storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/adoInsertRecs.cpp b/storage/ndb/test/ndbapi/adoInsertRecs.cpp
index 4e9ec5aa444..af62b691b0d 100644
--- a/storage/ndb/test/ndbapi/adoInsertRecs.cpp
+++ b/storage/ndb/test/ndbapi/adoInsertRecs.cpp
@@ -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 */
 
 // InsertRecs.cpp : Defines the entry point for the console application.
 //
diff --git a/storage/ndb/test/ndbapi/asyncGenerator.cpp b/storage/ndb/test/ndbapi/asyncGenerator.cpp
index 1d7e7180bf5..fb96474605f 100644
--- a/storage/ndb/test/ndbapi/asyncGenerator.cpp
+++ b/storage/ndb/test/ndbapi/asyncGenerator.cpp
@@ -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 */
 
 /***************************************************************
 * I N C L U D E D   F I L E S                                  *
diff --git a/storage/ndb/test/ndbapi/bank/Bank.cpp b/storage/ndb/test/ndbapi/bank/Bank.cpp
index bb662680202..f32d4ee7ba3 100644
--- a/storage/ndb/test/ndbapi/bank/Bank.cpp
+++ b/storage/ndb/test/ndbapi/bank/Bank.cpp
@@ -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 "Bank.hpp"
 #include 
diff --git a/storage/ndb/test/ndbapi/bank/Bank.hpp b/storage/ndb/test/ndbapi/bank/Bank.hpp
index 17e5c1b93ce..cfee578348d 100644
--- a/storage/ndb/test/ndbapi/bank/Bank.hpp
+++ b/storage/ndb/test/ndbapi/bank/Bank.hpp
@@ -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 BANK_HPP
 #define BANK_HPP
diff --git a/storage/ndb/test/ndbapi/bank/BankLoad.cpp b/storage/ndb/test/ndbapi/bank/BankLoad.cpp
index 7ab318f9026..14ff977168b 100644
--- a/storage/ndb/test/ndbapi/bank/BankLoad.cpp
+++ b/storage/ndb/test/ndbapi/bank/BankLoad.cpp
@@ -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 "Bank.hpp"
 #include 
diff --git a/storage/ndb/test/ndbapi/bank/Makefile.am b/storage/ndb/test/ndbapi/bank/Makefile.am
index 972f60ac2bc..93bd0dd1ce5 100644
--- a/storage/ndb/test/ndbapi/bank/Makefile.am
+++ b/storage/ndb/test/ndbapi/bank/Makefile.am
@@ -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
 
 ndbtest_PROGRAMS = testBank bankSumAccounts bankValidateAllGLs bankMakeGL bankTransactionMaker bankCreator bankTimer
 
diff --git a/storage/ndb/test/ndbapi/bank/bankCreator.cpp b/storage/ndb/test/ndbapi/bank/bankCreator.cpp
index 8b2ec6bb10b..fc61a8cdd52 100644
--- a/storage/ndb/test/ndbapi/bank/bankCreator.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankCreator.cpp
@@ -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 
diff --git a/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp b/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp
index 6b5bbcf7715..d56b0911bef 100644
--- a/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp
@@ -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 
diff --git a/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp b/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp
index c2fcad9fe22..ea9fe2b5cd9 100644
--- a/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp
@@ -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 
diff --git a/storage/ndb/test/ndbapi/bank/bankTimer.cpp b/storage/ndb/test/ndbapi/bank/bankTimer.cpp
index da8687a5a78..30f02998a9d 100644
--- a/storage/ndb/test/ndbapi/bank/bankTimer.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankTimer.cpp
@@ -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 
diff --git a/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp b/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp
index 9ace590aabf..0c2049a48f8 100644
--- a/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp
@@ -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 
diff --git a/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp b/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp
index 80882198f19..9e98bb9daf9 100644
--- a/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp
@@ -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 
diff --git a/storage/ndb/test/ndbapi/bank/testBank.cpp b/storage/ndb/test/ndbapi/bank/testBank.cpp
index 0e710bd8947..7e57d2ff2f8 100644
--- a/storage/ndb/test/ndbapi/bank/testBank.cpp
+++ b/storage/ndb/test/ndbapi/bank/testBank.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp b/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
index 8b8fe993127..759afdabe3a 100644
--- a/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
+++ b/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
@@ -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 */
 
 /***************************************************************
 * I N C L U D E D   F I L E S                                  *
diff --git a/storage/ndb/test/ndbapi/bench/dbGenerator.h b/storage/ndb/test/ndbapi/bench/dbGenerator.h
index d9655e12bf5..97df1f923f0 100644
--- a/storage/ndb/test/ndbapi/bench/dbGenerator.h
+++ b/storage/ndb/test/ndbapi/bench/dbGenerator.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 DBGENERATOR_H
 #define DBGENERATOR_H
diff --git a/storage/ndb/test/ndbapi/bench/dbPopulate.cpp b/storage/ndb/test/ndbapi/bench/dbPopulate.cpp
index 3c9d1c5d8fd..40b22991b9c 100644
--- a/storage/ndb/test/ndbapi/bench/dbPopulate.cpp
+++ b/storage/ndb/test/ndbapi/bench/dbPopulate.cpp
@@ -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 */
 
 /***************************************************************
 * I N C L U D E D   F I L E S                                  *
diff --git a/storage/ndb/test/ndbapi/bench/dbPopulate.h b/storage/ndb/test/ndbapi/bench/dbPopulate.h
index 8003c42c008..57d582e538c 100644
--- a/storage/ndb/test/ndbapi/bench/dbPopulate.h
+++ b/storage/ndb/test/ndbapi/bench/dbPopulate.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 DBPOPULATE_H
 #define DBPOPULATE_H
diff --git a/storage/ndb/test/ndbapi/bench/macros.h b/storage/ndb/test/ndbapi/bench/macros.h
index 35e0804f0f7..266f0337fd8 100644
--- a/storage/ndb/test/ndbapi/bench/macros.h
+++ b/storage/ndb/test/ndbapi/bench/macros.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 MACROS_H
 #define MACROS_H
diff --git a/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp b/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
index 78fb684a060..7ca88dc481b 100644
--- a/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
+++ b/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
@@ -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 
 
diff --git a/storage/ndb/test/ndbapi/bench/mainPopulate.cpp b/storage/ndb/test/ndbapi/bench/mainPopulate.cpp
index d9f10ab1ebc..507b8d20803 100644
--- a/storage/ndb/test/ndbapi/bench/mainPopulate.cpp
+++ b/storage/ndb/test/ndbapi/bench/mainPopulate.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/bench/ndb_async1.cpp b/storage/ndb/test/ndbapi/bench/ndb_async1.cpp
index f6f4f0bd98e..b653d6789cb 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_async1.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_async1.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/bench/ndb_async2.cpp b/storage/ndb/test/ndbapi/bench/ndb_async2.cpp
index c1316967904..f07a3fefb7f 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_async2.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_async2.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/bench/ndb_error.hpp b/storage/ndb/test/ndbapi/bench/ndb_error.hpp
index 67e6b92de7a..02f6a3e8670 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_error.hpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_error.hpp
@@ -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 NDB_ERROR_H
 #define NDB_ERROR_H
diff --git a/storage/ndb/test/ndbapi/bench/ndb_schema.hpp b/storage/ndb/test/ndbapi/bench/ndb_schema.hpp
index 8c114cd3c3c..90035a6a2c6 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_schema.hpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_schema.hpp
@@ -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 NDB_SCHEMA_H
 #define NDB_SCHEMA_H
diff --git a/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp
index 0b3d777ba78..6c639683f8c 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp
index 845379b4652..4fdccd44234 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp
index ee46089128a..21ea083c6a4 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp
index 46d4f9e404e..8e10b7cad48 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp
index b6781474b5c..b016e7c685d 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp
index 0fc5ca9ec9c..ceb3acd51b1 100644
--- a/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/bench/testData.h b/storage/ndb/test/ndbapi/bench/testData.h
index 6b05b4a06fa..98c9c63a736 100644
--- a/storage/ndb/test/ndbapi/bench/testData.h
+++ b/storage/ndb/test/ndbapi/bench/testData.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 TESTDATA_H
 #define TESTDATA_H
diff --git a/storage/ndb/test/ndbapi/bench/testDefinitions.h b/storage/ndb/test/ndbapi/bench/testDefinitions.h
index 04a661d1f37..7f29211ee02 100644
--- a/storage/ndb/test/ndbapi/bench/testDefinitions.h
+++ b/storage/ndb/test/ndbapi/bench/testDefinitions.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 TESTDEFINITIONS_H
 #define TESTDEFINITIONS_H
diff --git a/storage/ndb/test/ndbapi/bench/userInterface.cpp b/storage/ndb/test/ndbapi/bench/userInterface.cpp
index c187d327dae..5d0cc826520 100644
--- a/storage/ndb/test/ndbapi/bench/userInterface.cpp
+++ b/storage/ndb/test/ndbapi/bench/userInterface.cpp
@@ -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 */
 
 /***************************************************************
 * I N C L U D E D   F I L E S                                  *
diff --git a/storage/ndb/test/ndbapi/bench/userInterface.h b/storage/ndb/test/ndbapi/bench/userInterface.h
index 2793731fde3..d33d8ba791c 100644
--- a/storage/ndb/test/ndbapi/bench/userInterface.h
+++ b/storage/ndb/test/ndbapi/bench/userInterface.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 DBINTERFACE_H
 #define DBINTERFACE_H
diff --git a/storage/ndb/test/ndbapi/benchronja.cpp b/storage/ndb/test/ndbapi/benchronja.cpp
index 39640623ad8..948a67aaf6c 100644
--- a/storage/ndb/test/ndbapi/benchronja.cpp
+++ b/storage/ndb/test/ndbapi/benchronja.cpp
@@ -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/storage/ndb/test/ndbapi/bulk_copy.cpp b/storage/ndb/test/ndbapi/bulk_copy.cpp
index 6a5a15b456a..268bba1c16d 100644
--- a/storage/ndb/test/ndbapi/bulk_copy.cpp
+++ b/storage/ndb/test/ndbapi/bulk_copy.cpp
@@ -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 
diff --git a/storage/ndb/test/ndbapi/cdrserver.cpp b/storage/ndb/test/ndbapi/cdrserver.cpp
index f867e9db934..de727d6eace 100644
--- a/storage/ndb/test/ndbapi/cdrserver.cpp
+++ b/storage/ndb/test/ndbapi/cdrserver.cpp
@@ -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/storage/ndb/test/ndbapi/celloDb.cpp b/storage/ndb/test/ndbapi/celloDb.cpp
index b4c4ec69e24..df67ed3c0d8 100644
--- a/storage/ndb/test/ndbapi/celloDb.cpp
+++ b/storage/ndb/test/ndbapi/celloDb.cpp
@@ -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/storage/ndb/test/ndbapi/create_all_tabs.cpp b/storage/ndb/test/ndbapi/create_all_tabs.cpp
index d4d1ba3e874..374440ca6c1 100644
--- a/storage/ndb/test/ndbapi/create_all_tabs.cpp
+++ b/storage/ndb/test/ndbapi/create_all_tabs.cpp
@@ -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 
 
diff --git a/storage/ndb/test/ndbapi/create_tab.cpp b/storage/ndb/test/ndbapi/create_tab.cpp
index 6e897c48dbc..02e3d7c9063 100644
--- a/storage/ndb/test/ndbapi/create_tab.cpp
+++ b/storage/ndb/test/ndbapi/create_tab.cpp
@@ -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 
 
diff --git a/storage/ndb/test/ndbapi/drop_all_tabs.cpp b/storage/ndb/test/ndbapi/drop_all_tabs.cpp
index 5c6316cceaa..c929c086184 100644
--- a/storage/ndb/test/ndbapi/drop_all_tabs.cpp
+++ b/storage/ndb/test/ndbapi/drop_all_tabs.cpp
@@ -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 
 
diff --git a/storage/ndb/test/ndbapi/flexAsynch.cpp b/storage/ndb/test/ndbapi/flexAsynch.cpp
index d24965a9134..0f34f10c266 100644
--- a/storage/ndb/test/ndbapi/flexAsynch.cpp
+++ b/storage/ndb/test/ndbapi/flexAsynch.cpp
@@ -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/storage/ndb/test/ndbapi/flexBench.cpp b/storage/ndb/test/ndbapi/flexBench.cpp
index c54cb6588f4..683897a5bc0 100644
--- a/storage/ndb/test/ndbapi/flexBench.cpp
+++ b/storage/ndb/test/ndbapi/flexBench.cpp
@@ -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/storage/ndb/test/ndbapi/flexHammer.cpp b/storage/ndb/test/ndbapi/flexHammer.cpp
index 7b837bd9b24..5db948108da 100644
--- a/storage/ndb/test/ndbapi/flexHammer.cpp
+++ b/storage/ndb/test/ndbapi/flexHammer.cpp
@@ -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 */
 
 /* ***************************************************
        FLEXHAMMER
diff --git a/storage/ndb/test/ndbapi/flexScan.cpp b/storage/ndb/test/ndbapi/flexScan.cpp
index 7a3d759d657..8f4acd0e5fc 100644
--- a/storage/ndb/test/ndbapi/flexScan.cpp
+++ b/storage/ndb/test/ndbapi/flexScan.cpp
@@ -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 */
 
 /* ***************************************************
        FLEXSCAN
diff --git a/storage/ndb/test/ndbapi/flexTT.cpp b/storage/ndb/test/ndbapi/flexTT.cpp
index e4fb364b7ea..ee0e3ced7e7 100644
--- a/storage/ndb/test/ndbapi/flexTT.cpp
+++ b/storage/ndb/test/ndbapi/flexTT.cpp
@@ -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 
diff --git a/storage/ndb/test/ndbapi/flexTimedAsynch.cpp b/storage/ndb/test/ndbapi/flexTimedAsynch.cpp
index 2a846008c56..6ebe74c56b7 100644
--- a/storage/ndb/test/ndbapi/flexTimedAsynch.cpp
+++ b/storage/ndb/test/ndbapi/flexTimedAsynch.cpp
@@ -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 */
 
 /* ***************************************************
        FLEXTIMEDASYNCH
diff --git a/storage/ndb/test/ndbapi/flex_bench_mysql.cpp b/storage/ndb/test/ndbapi/flex_bench_mysql.cpp
index d3379b9751c..1c9c44d9db5 100644
--- a/storage/ndb/test/ndbapi/flex_bench_mysql.cpp
+++ b/storage/ndb/test/ndbapi/flex_bench_mysql.cpp
@@ -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/storage/ndb/test/ndbapi/index.cpp b/storage/ndb/test/ndbapi/index.cpp
index 0d2e1ccd0f3..c08142c535c 100644
--- a/storage/ndb/test/ndbapi/index.cpp
+++ b/storage/ndb/test/ndbapi/index.cpp
@@ -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 */
 
 /* ***************************************************
        INDEX TEST 1
diff --git a/storage/ndb/test/ndbapi/index2.cpp b/storage/ndb/test/ndbapi/index2.cpp
index f36a6209d8d..ca9d4ca4a34 100644
--- a/storage/ndb/test/ndbapi/index2.cpp
+++ b/storage/ndb/test/ndbapi/index2.cpp
@@ -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 */
 
 /* ***************************************************
        INDEX TEST 1
diff --git a/storage/ndb/test/ndbapi/initronja.cpp b/storage/ndb/test/ndbapi/initronja.cpp
index 9b96e7e8625..6cb361dfe33 100644
--- a/storage/ndb/test/ndbapi/initronja.cpp
+++ b/storage/ndb/test/ndbapi/initronja.cpp
@@ -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/storage/ndb/test/ndbapi/interpreterInTup.cpp b/storage/ndb/test/ndbapi/interpreterInTup.cpp
index c525b70d277..e01f682fb67 100644
--- a/storage/ndb/test/ndbapi/interpreterInTup.cpp
+++ b/storage/ndb/test/ndbapi/interpreterInTup.cpp
@@ -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 */
 
 /* ***************************************************
        TEST OF INTERPRETER IN TUP
diff --git a/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp b/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp
index 31d191476e3..b4c10a65283 100644
--- a/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp
+++ b/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp
@@ -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 
 
diff --git a/storage/ndb/test/ndbapi/msa.cpp b/storage/ndb/test/ndbapi/msa.cpp
index e01d5e1934d..24d492e47b2 100644
--- a/storage/ndb/test/ndbapi/msa.cpp
+++ b/storage/ndb/test/ndbapi/msa.cpp
@@ -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 
 
diff --git a/storage/ndb/test/ndbapi/ndb_async1.cpp b/storage/ndb/test/ndbapi/ndb_async1.cpp
index 86bf1cd0543..af12ea62f3e 100644
--- a/storage/ndb/test/ndbapi/ndb_async1.cpp
+++ b/storage/ndb/test/ndbapi/ndb_async1.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/ndb_async2.cpp b/storage/ndb/test/ndbapi/ndb_async2.cpp
index e02407f8471..1117053e177 100644
--- a/storage/ndb/test/ndbapi/ndb_async2.cpp
+++ b/storage/ndb/test/ndbapi/ndb_async2.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/ndb_user_populate.cpp b/storage/ndb/test/ndbapi/ndb_user_populate.cpp
index 68b97ab3e5f..ddf5b8f7c4a 100644
--- a/storage/ndb/test/ndbapi/ndb_user_populate.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_populate.cpp
@@ -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 */
 
 
 extern "C" {
diff --git a/storage/ndb/test/ndbapi/ndb_user_transaction.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction.cpp
index 39dc48fae02..3bcc7812f3a 100644
--- a/storage/ndb/test/ndbapi/ndb_user_transaction.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp
index cc41df4cc6a..4b26a229c4b 100644
--- a/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp
index eb5295eea12..cc2de76c8f7 100644
--- a/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp
index 7eeb5660cdf..77e12f109be 100644
--- a/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp
index 4a1bd344ad6..dc8149b8931 100644
--- a/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp
index 54e7d1300d6..59246ff365e 100644
--- a/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp
@@ -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 DEBUG_ON
 
diff --git a/storage/ndb/test/ndbapi/restarter.cpp b/storage/ndb/test/ndbapi/restarter.cpp
index 25caa3161e0..61d1b7434d7 100644
--- a/storage/ndb/test/ndbapi/restarter.cpp
+++ b/storage/ndb/test/ndbapi/restarter.cpp
@@ -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 "mgmapi.h"
diff --git a/storage/ndb/test/ndbapi/restarter2.cpp b/storage/ndb/test/ndbapi/restarter2.cpp
index 2010110dce0..dd3284b9ad7 100644
--- a/storage/ndb/test/ndbapi/restarter2.cpp
+++ b/storage/ndb/test/ndbapi/restarter2.cpp
@@ -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 
diff --git a/storage/ndb/test/ndbapi/restarts.cpp b/storage/ndb/test/ndbapi/restarts.cpp
index 5d00693c525..d1e355fa5f7 100644
--- a/storage/ndb/test/ndbapi/restarts.cpp
+++ b/storage/ndb/test/ndbapi/restarts.cpp
@@ -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 "mgmapi.h"
diff --git a/storage/ndb/test/ndbapi/size.cpp b/storage/ndb/test/ndbapi/size.cpp
index eed5995fd01..fad0ed1760b 100644
--- a/storage/ndb/test/ndbapi/size.cpp
+++ b/storage/ndb/test/ndbapi/size.cpp
@@ -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 
 #include "utv.h"
diff --git a/storage/ndb/test/ndbapi/slow_select.cpp b/storage/ndb/test/ndbapi/slow_select.cpp
index c3af77248e4..c9cb180efdc 100644
--- a/storage/ndb/test/ndbapi/slow_select.cpp
+++ b/storage/ndb/test/ndbapi/slow_select.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testBackup.cpp b/storage/ndb/test/ndbapi/testBackup.cpp
index 98ae98ab073..44c85be5d92 100644
--- a/storage/ndb/test/ndbapi/testBackup.cpp
+++ b/storage/ndb/test/ndbapi/testBackup.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testBasic.cpp b/storage/ndb/test/ndbapi/testBasic.cpp
index 3345db2d711..50795c50671 100644
--- a/storage/ndb/test/ndbapi/testBasic.cpp
+++ b/storage/ndb/test/ndbapi/testBasic.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testBasicAsynch.cpp b/storage/ndb/test/ndbapi/testBasicAsynch.cpp
index 37391550977..e9a7c174541 100644
--- a/storage/ndb/test/ndbapi/testBasicAsynch.cpp
+++ b/storage/ndb/test/ndbapi/testBasicAsynch.cpp
@@ -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 "NDBT_Test.hpp"
 #include "NDBT_ReturnCodes.h"
diff --git a/storage/ndb/test/ndbapi/testBitfield.cpp b/storage/ndb/test/ndbapi/testBitfield.cpp
index fbc9668a721..b2a494277ef 100644
--- a/storage/ndb/test/ndbapi/testBitfield.cpp
+++ b/storage/ndb/test/ndbapi/testBitfield.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testBlobs.cpp b/storage/ndb/test/ndbapi/testBlobs.cpp
index 1a2e04f8b54..3c3edb98bb2 100644
--- a/storage/ndb/test/ndbapi/testBlobs.cpp
+++ b/storage/ndb/test/ndbapi/testBlobs.cpp
@@ -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 */
 
 /*
  * testBlobs
diff --git a/storage/ndb/test/ndbapi/testDataBuffers.cpp b/storage/ndb/test/ndbapi/testDataBuffers.cpp
index 0a0a355003c..1176aab49ee 100644
--- a/storage/ndb/test/ndbapi/testDataBuffers.cpp
+++ b/storage/ndb/test/ndbapi/testDataBuffers.cpp
@@ -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 */
 
 /*
  * testDataBuffers
diff --git a/storage/ndb/test/ndbapi/testDeadlock.cpp b/storage/ndb/test/ndbapi/testDeadlock.cpp
index 9c95b163e0b..7942728fa4c 100644
--- a/storage/ndb/test/ndbapi/testDeadlock.cpp
+++ b/storage/ndb/test/ndbapi/testDeadlock.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testDict.cpp b/storage/ndb/test/ndbapi/testDict.cpp
index 88e94239ea8..399a17ede3d 100644
--- a/storage/ndb/test/ndbapi/testDict.cpp
+++ b/storage/ndb/test/ndbapi/testDict.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testGrepVerify.cpp b/storage/ndb/test/ndbapi/testGrepVerify.cpp
index 9388f28bf41..338f433e11a 100644
--- a/storage/ndb/test/ndbapi/testGrepVerify.cpp
+++ b/storage/ndb/test/ndbapi/testGrepVerify.cpp
@@ -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 "mgmapi.h"
diff --git a/storage/ndb/test/ndbapi/testIndex.cpp b/storage/ndb/test/ndbapi/testIndex.cpp
index e5699502171..bd824a6e691 100644
--- a/storage/ndb/test/ndbapi/testIndex.cpp
+++ b/storage/ndb/test/ndbapi/testIndex.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testIndexStat.cpp b/storage/ndb/test/ndbapi/testIndexStat.cpp
index 4dd110650fe..a2df85cc95d 100644
--- a/storage/ndb/test/ndbapi/testIndexStat.cpp
+++ b/storage/ndb/test/ndbapi/testIndexStat.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testInterpreter.cpp b/storage/ndb/test/ndbapi/testInterpreter.cpp
index a85519b0a86..d981ab2ddbd 100644
--- a/storage/ndb/test/ndbapi/testInterpreter.cpp
+++ b/storage/ndb/test/ndbapi/testInterpreter.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testLcp.cpp b/storage/ndb/test/ndbapi/testLcp.cpp
index 2b511fc139f..81b544e91a5 100644
--- a/storage/ndb/test/ndbapi/testLcp.cpp
+++ b/storage/ndb/test/ndbapi/testLcp.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testMgm.cpp b/storage/ndb/test/ndbapi/testMgm.cpp
index 5b34a4d252e..79371a04ff1 100644
--- a/storage/ndb/test/ndbapi/testMgm.cpp
+++ b/storage/ndb/test/ndbapi/testMgm.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testNDBT.cpp b/storage/ndb/test/ndbapi/testNDBT.cpp
index 170eb4f87d7..64c0594b000 100644
--- a/storage/ndb/test/ndbapi/testNDBT.cpp
+++ b/storage/ndb/test/ndbapi/testNDBT.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testNdbApi.cpp b/storage/ndb/test/ndbapi/testNdbApi.cpp
index 0d631023f75..97ec3316724 100644
--- a/storage/ndb/test/ndbapi/testNdbApi.cpp
+++ b/storage/ndb/test/ndbapi/testNdbApi.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testNodeRestart.cpp b/storage/ndb/test/ndbapi/testNodeRestart.cpp
index a760ac58bb8..5aa44290f79 100644
--- a/storage/ndb/test/ndbapi/testNodeRestart.cpp
+++ b/storage/ndb/test/ndbapi/testNodeRestart.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testOIBasic.cpp b/storage/ndb/test/ndbapi/testOIBasic.cpp
index b409f31876d..b2f6a31abdc 100644
--- a/storage/ndb/test/ndbapi/testOIBasic.cpp
+++ b/storage/ndb/test/ndbapi/testOIBasic.cpp
@@ -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 */
 
 /*
  * testOIBasic - ordered index test
diff --git a/storage/ndb/test/ndbapi/testOperations.cpp b/storage/ndb/test/ndbapi/testOperations.cpp
index 1da6a2457d3..571049d24bb 100644
--- a/storage/ndb/test/ndbapi/testOperations.cpp
+++ b/storage/ndb/test/ndbapi/testOperations.cpp
@@ -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 "NDBT_Test.hpp"
 #include "NDBT_ReturnCodes.h"
diff --git a/storage/ndb/test/ndbapi/testOrderedIndex.cpp b/storage/ndb/test/ndbapi/testOrderedIndex.cpp
index 2a2c9095a3a..3d98a3d5f4d 100644
--- a/storage/ndb/test/ndbapi/testOrderedIndex.cpp
+++ b/storage/ndb/test/ndbapi/testOrderedIndex.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testPartitioning.cpp b/storage/ndb/test/ndbapi/testPartitioning.cpp
index abe1d151adc..7bcc81b75d5 100644
--- a/storage/ndb/test/ndbapi/testPartitioning.cpp
+++ b/storage/ndb/test/ndbapi/testPartitioning.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testReadPerf.cpp b/storage/ndb/test/ndbapi/testReadPerf.cpp
index dae48900a16..543a1e24ed7 100644
--- a/storage/ndb/test/ndbapi/testReadPerf.cpp
+++ b/storage/ndb/test/ndbapi/testReadPerf.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testRestartGci.cpp b/storage/ndb/test/ndbapi/testRestartGci.cpp
index 423f7c53037..d3dbfcb69d9 100644
--- a/storage/ndb/test/ndbapi/testRestartGci.cpp
+++ b/storage/ndb/test/ndbapi/testRestartGci.cpp
@@ -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 "NDBT_Test.hpp"
 #include "NDBT_ReturnCodes.h"
diff --git a/storage/ndb/test/ndbapi/testSRBank.cpp b/storage/ndb/test/ndbapi/testSRBank.cpp
index 64fd5b84fb9..2e0d20061ff 100644
--- a/storage/ndb/test/ndbapi/testSRBank.cpp
+++ b/storage/ndb/test/ndbapi/testSRBank.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testScan.cpp b/storage/ndb/test/ndbapi/testScan.cpp
index e29a52ff788..52238feffa9 100644
--- a/storage/ndb/test/ndbapi/testScan.cpp
+++ b/storage/ndb/test/ndbapi/testScan.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testScanFilter.cpp b/storage/ndb/test/ndbapi/testScanFilter.cpp
index 8796fe87e22..ef3b28caac4 100644
--- a/storage/ndb/test/ndbapi/testScanFilter.cpp
+++ b/storage/ndb/test/ndbapi/testScanFilter.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testScanInterpreter.cpp b/storage/ndb/test/ndbapi/testScanInterpreter.cpp
index f734c4ee76a..8a54d8fc180 100644
--- a/storage/ndb/test/ndbapi/testScanInterpreter.cpp
+++ b/storage/ndb/test/ndbapi/testScanInterpreter.cpp
@@ -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 "NDBT_Test.hpp"
 #include "NDBT_ReturnCodes.h"
diff --git a/storage/ndb/test/ndbapi/testScanPerf.cpp b/storage/ndb/test/ndbapi/testScanPerf.cpp
index cea281bf9e1..8cfe262ceb7 100644
--- a/storage/ndb/test/ndbapi/testScanPerf.cpp
+++ b/storage/ndb/test/ndbapi/testScanPerf.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testSystemRestart.cpp b/storage/ndb/test/ndbapi/testSystemRestart.cpp
index 891f5d1a945..4a51aac921a 100644
--- a/storage/ndb/test/ndbapi/testSystemRestart.cpp
+++ b/storage/ndb/test/ndbapi/testSystemRestart.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testTimeout.cpp b/storage/ndb/test/ndbapi/testTimeout.cpp
index 711a943f965..1b624222ff7 100644
--- a/storage/ndb/test/ndbapi/testTimeout.cpp
+++ b/storage/ndb/test/ndbapi/testTimeout.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/testTransactions.cpp b/storage/ndb/test/ndbapi/testTransactions.cpp
index 53b3faf6920..3b03e4b0d82 100644
--- a/storage/ndb/test/ndbapi/testTransactions.cpp
+++ b/storage/ndb/test/ndbapi/testTransactions.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/test_event.cpp b/storage/ndb/test/ndbapi/test_event.cpp
index e435c59e457..46acf8a7aeb 100644
--- a/storage/ndb/test/ndbapi/test_event.cpp
+++ b/storage/ndb/test/ndbapi/test_event.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/test_event_merge.cpp b/storage/ndb/test/ndbapi/test_event_merge.cpp
index 1df7fba0920..9f72e796f62 100644
--- a/storage/ndb/test/ndbapi/test_event_merge.cpp
+++ b/storage/ndb/test/ndbapi/test_event_merge.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/test_event_multi_table.cpp b/storage/ndb/test/ndbapi/test_event_multi_table.cpp
index a8cf0fa86c0..013550c3ea9 100644
--- a/storage/ndb/test/ndbapi/test_event_multi_table.cpp
+++ b/storage/ndb/test/ndbapi/test_event_multi_table.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/ndbapi/userInterface.cpp b/storage/ndb/test/ndbapi/userInterface.cpp
index e64d89d7055..65a4efbf922 100644
--- a/storage/ndb/test/ndbapi/userInterface.cpp
+++ b/storage/ndb/test/ndbapi/userInterface.cpp
@@ -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 */
 
 /***************************************************************
 * I N C L U D E D   F I L E S                                  *
diff --git a/storage/ndb/test/ndbnet/test.run b/storage/ndb/test/ndbnet/test.run
index a00cba846ad..f1df90668af 100644
--- a/storage/ndb/test/ndbnet/test.run
+++ b/storage/ndb/test/ndbnet/test.run
@@ -14,6 +14,6 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 system("printenv|sort");
diff --git a/storage/ndb/test/ndbnet/testError.run b/storage/ndb/test/ndbnet/testError.run
index 8802f0150a6..d63a128c089 100644
--- a/storage/ndb/test/ndbnet/testError.run
+++ b/storage/ndb/test/ndbnet/testError.run
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 #
 # file : test/ndbnet/testError.run
diff --git a/storage/ndb/test/ndbnet/testMNF.run b/storage/ndb/test/ndbnet/testMNF.run
index 288e1398897..3a9f623f04a 100644
--- a/storage/ndb/test/ndbnet/testMNF.run
+++ b/storage/ndb/test/ndbnet/testMNF.run
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 #
 # file : test/ndbnet/testError.run
diff --git a/storage/ndb/test/ndbnet/testNR.run b/storage/ndb/test/ndbnet/testNR.run
index 911b2fe2a4b..daedf75a8aa 100644
--- a/storage/ndb/test/ndbnet/testNR.run
+++ b/storage/ndb/test/ndbnet/testNR.run
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 use strict;
 use NDB::Run;
diff --git a/storage/ndb/test/ndbnet/testNR1.run b/storage/ndb/test/ndbnet/testNR1.run
index d5bc32f746b..abf10778559 100644
--- a/storage/ndb/test/ndbnet/testNR1.run
+++ b/storage/ndb/test/ndbnet/testNR1.run
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 # Node recovery killing 1 node out of 4 at the time and waiting for recover
 
diff --git a/storage/ndb/test/ndbnet/testNR4.run b/storage/ndb/test/ndbnet/testNR4.run
index 89eece66c42..984748b2ca7 100644
--- a/storage/ndb/test/ndbnet/testNR4.run
+++ b/storage/ndb/test/ndbnet/testNR4.run
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 # Node recovery killing 1 node out of 4 at the time and waiting for recover
 
diff --git a/storage/ndb/test/ndbnet/testSRhang.run b/storage/ndb/test/ndbnet/testSRhang.run
index 01ba4cdad71..d8fe31d0645 100644
--- a/storage/ndb/test/ndbnet/testSRhang.run
+++ b/storage/ndb/test/ndbnet/testSRhang.run
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 use strict;
 use NDB::Run;
diff --git a/storage/ndb/test/ndbnet/testTR295.run b/storage/ndb/test/ndbnet/testTR295.run
index e269bc6196d..f9bd8c8966f 100644
--- a/storage/ndb/test/ndbnet/testTR295.run
+++ b/storage/ndb/test/ndbnet/testTR295.run
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 # testing TR295, kill non-master when recovering in phase 4
 
diff --git a/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp b/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp
index 2cb40120b38..75c7ea01b9e 100644
--- a/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp
@@ -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/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp b/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp
index 5b5d7c96336..76ddf564612 100644
--- a/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp
@@ -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/storage/ndb/test/newtonapi/basic_test/common.cpp b/storage/ndb/test/newtonapi/basic_test/common.cpp
index 81065dae79b..9a2314ba271 100644
--- a/storage/ndb/test/newtonapi/basic_test/common.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/common.cpp
@@ -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 "common.hpp"
diff --git a/storage/ndb/test/newtonapi/basic_test/common.hpp b/storage/ndb/test/newtonapi/basic_test/common.hpp
index 8def1084828..ccec6125acc 100644
--- a/storage/ndb/test/newtonapi/basic_test/common.hpp
+++ b/storage/ndb/test/newtonapi/basic_test/common.hpp
@@ -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 COMMON_H
 #define COMMON_H
diff --git a/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp b/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp
index 0b22ea9e9a3..b37f5ae046d 100644
--- a/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp
@@ -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/storage/ndb/test/newtonapi/basic_test/too_basic.cpp b/storage/ndb/test/newtonapi/basic_test/too_basic.cpp
index b4edfeae609..dc96e250aac 100644
--- a/storage/ndb/test/newtonapi/basic_test/too_basic.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/too_basic.cpp
@@ -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/storage/ndb/test/newtonapi/perf_test/perf.cpp b/storage/ndb/test/newtonapi/perf_test/perf.cpp
index d889a85ac8e..b641d12f106 100644
--- a/storage/ndb/test/newtonapi/perf_test/perf.cpp
+++ b/storage/ndb/test/newtonapi/perf_test/perf.cpp
@@ -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 
diff --git a/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp b/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp
index 6144165a976..bb3bbb5dc89 100644
--- a/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp
+++ b/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp
@@ -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 */
 
 // ODBC.cpp : Defines the entry point for the console application.
 //
diff --git a/storage/ndb/test/odbc/SQL99_test/SQL99_test.h b/storage/ndb/test/odbc/SQL99_test/SQL99_test.h
index db2f7eb8e5b..e3908b586f8 100644
--- a/storage/ndb/test/odbc/SQL99_test/SQL99_test.h
+++ b/storage/ndb/test/odbc/SQL99_test/SQL99_test.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 */
 
 
 #include 
diff --git a/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp b/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp
index 6e6c7cfdb0e..f234f66f9fc 100644
--- a/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp
+++ b/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp
@@ -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 "common.h"
 #include 
diff --git a/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp b/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp
index 8bcefffaaed..f81038882c7 100644
--- a/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp
+++ b/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp
@@ -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 "common.h"
 #include 
diff --git a/storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp b/storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp
index 9cb4b87143c..a14430daf98 100644
--- a/storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp
+++ b/storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp
@@ -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 "common.h"
 #include 
diff --git a/storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp b/storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp
index a35a108becc..7cde03cd74a 100644
--- a/storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp
+++ b/storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp b/storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp
index fbabc334fd2..53986b7ef2d 100644
--- a/storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp
@@ -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 "common.h"
 #define SQL_MAXIMUM_MESSAGE_LENGTH 200
diff --git a/storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp b/storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp
index 206edb8216f..a7a36e99d6f 100644
--- a/storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp
@@ -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 "common.h"
 
diff --git a/storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp b/storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp
index dfc8fe6260a..9c254f34a41 100644
--- a/storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp
+++ b/storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp
@@ -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 sqlcli.h;
 #include stdio.h;
diff --git a/storage/ndb/test/odbc/client/SQLBindColTest.cpp b/storage/ndb/test/odbc/client/SQLBindColTest.cpp
index 3bddf14152d..8969ffe0444 100644
--- a/storage/ndb/test/odbc/client/SQLBindColTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLBindColTest.cpp
@@ -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 SQLBindColTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLBindParameterTest.cpp b/storage/ndb/test/odbc/client/SQLBindParameterTest.cpp
index 8cda7accc97..603373d0c34 100644
--- a/storage/ndb/test/odbc/client/SQLBindParameterTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLBindParameterTest.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/odbc/client/SQLCancelTest.cpp b/storage/ndb/test/odbc/client/SQLCancelTest.cpp
index a0f252e34d1..49549348ecc 100644
--- a/storage/ndb/test/odbc/client/SQLCancelTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLCancelTest.cpp
@@ -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 SQLCancelTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp b/storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp
index 320703cdcb8..ccab5a2322b 100644
--- a/storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp
@@ -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 
 #define SQL_MAXIMUM_MESSAGE_LENGTH 200
diff --git a/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp b/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
index 8e8fcd1526d..9739ac59ef5 100644
--- a/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
@@ -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 SQLColAttributeTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp b/storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp
index a182427c3d7..26d6e918ebd 100644
--- a/storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp
+++ b/storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp
@@ -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 SQLColAttributeTest1.cpp
diff --git a/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp b/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
index 706e1917cf0..580aa38ea40 100644
--- a/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
+++ b/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
@@ -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 SQLColAttributeTest2.cpp
diff --git a/storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp b/storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp
index bb7e322be8c..2c12b17bb07 100644
--- a/storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp
+++ b/storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp
@@ -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 SQLColAttributeTest3.cpp
diff --git a/storage/ndb/test/odbc/client/SQLConnectTest.cpp b/storage/ndb/test/odbc/client/SQLConnectTest.cpp
index ba89ebc5f13..0ab48efeeda 100644
--- a/storage/ndb/test/odbc/client/SQLConnectTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLConnectTest.cpp
@@ -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 SQLConnectTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLCopyDescTest.cpp b/storage/ndb/test/odbc/client/SQLCopyDescTest.cpp
index 2fa80986359..d6d6306f905 100644
--- a/storage/ndb/test/odbc/client/SQLCopyDescTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLCopyDescTest.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/odbc/client/SQLDescribeColTest.cpp b/storage/ndb/test/odbc/client/SQLDescribeColTest.cpp
index 7957d200806..b9484c2e1e6 100644
--- a/storage/ndb/test/odbc/client/SQLDescribeColTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLDescribeColTest.cpp
@@ -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 SQLDescribeColTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLDisconnectTest.cpp b/storage/ndb/test/odbc/client/SQLDisconnectTest.cpp
index 5b9d1740fb5..0ff06eb5989 100644
--- a/storage/ndb/test/odbc/client/SQLDisconnectTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLDisconnectTest.cpp
@@ -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 SQLDisconnectTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp b/storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp
index 861fe0a87a2..ca8e5a28e43 100644
--- a/storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/odbc/client/SQLEndTranTest.cpp b/storage/ndb/test/odbc/client/SQLEndTranTest.cpp
index 3c2f03d8569..0b4810a4fcf 100644
--- a/storage/ndb/test/odbc/client/SQLEndTranTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLEndTranTest.cpp
@@ -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 
 
diff --git a/storage/ndb/test/odbc/client/SQLErrorTest.cpp b/storage/ndb/test/odbc/client/SQLErrorTest.cpp
index 17fbf1577b7..dee9b968d8e 100644
--- a/storage/ndb/test/odbc/client/SQLErrorTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLErrorTest.cpp
@@ -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 */
 
 #if 0
 
diff --git a/storage/ndb/test/odbc/client/SQLExecDirectTest.cpp b/storage/ndb/test/odbc/client/SQLExecDirectTest.cpp
index 1a057f85260..f58395a987e 100644
--- a/storage/ndb/test/odbc/client/SQLExecDirectTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLExecDirectTest.cpp
@@ -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 SQLExecDirectTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLExecuteTest.cpp b/storage/ndb/test/odbc/client/SQLExecuteTest.cpp
index a3250e280e6..624741977a9 100644
--- a/storage/ndb/test/odbc/client/SQLExecuteTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLExecuteTest.cpp
@@ -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 SQLExecuteTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp b/storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp
index 5a5446ca372..69e4b0d2ba3 100644
--- a/storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/odbc/client/SQLFetchTest.cpp b/storage/ndb/test/odbc/client/SQLFetchTest.cpp
index 525d37377d3..f8dbd921117 100644
--- a/storage/ndb/test/odbc/client/SQLFetchTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLFetchTest.cpp
@@ -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 SQLFetchTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp b/storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp
index 8e43d12318b..f893ae7bbbd 100644
--- a/storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp
@@ -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 "common.h"
 #define SQL_MAXIMUM_MESSAGE_LENGTH 200
diff --git a/storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp b/storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp
index 771a35de2b0..9774e487e0b 100644
--- a/storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp
@@ -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 
 #define SQL_MAXIMUM_MESSAGE_LENGTH 200
diff --git a/storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp b/storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp
index d62d782b201..afd8b12c1fe 100644
--- a/storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp
@@ -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 
 #define SQL_MAXIMUM_MESSAGE_LENGTH 200
diff --git a/storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp b/storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp
index efd3d1d370b..dc3a15063fe 100644
--- a/storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp
@@ -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 SQLGetCursorNameTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLGetDataTest.cpp b/storage/ndb/test/odbc/client/SQLGetDataTest.cpp
index 1ab32e383e2..889fa5eac46 100644
--- a/storage/ndb/test/odbc/client/SQLGetDataTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetDataTest.cpp
@@ -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 SQLGetDataTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp b/storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp
index 1072cd0fbb0..349b3b51ad6 100644
--- a/storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp b/storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp
index f442100139a..e838455bc88 100644
--- a/storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp
@@ -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 
 
diff --git a/storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp b/storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp
index 9038cc83a2d..c097559b451 100644
--- a/storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp b/storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp
index 003524b72af..92d43bf3771 100644
--- a/storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp
@@ -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 SQLGetDiagRecSimpleTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp b/storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp
index 7c2c1c21bef..85ac4d88a93 100644
--- a/storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp b/storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp
index 6a0ca9656bd..b3cba71ae84 100644
--- a/storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp
@@ -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 
 #define SQL_MAXIMUM_MESSAGE_LENGTH 200
diff --git a/storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp b/storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp
index 58181a0caa9..7c47c79d703 100644
--- a/storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp
@@ -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 SQLGetFunctionsTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLGetInfoTest.cpp b/storage/ndb/test/odbc/client/SQLGetInfoTest.cpp
index 1f0141c1759..261109a7d6e 100644
--- a/storage/ndb/test/odbc/client/SQLGetInfoTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetInfoTest.cpp
@@ -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 SQLGetInfoTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp b/storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp
index c17d3e6209c..94bbc39d81e 100644
--- a/storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp
@@ -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 
 #define SQL_MAXIMUM_MESSAGE_LENGTH 200
diff --git a/storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp b/storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp
index 358e56c1d28..745e6f49cfb 100644
--- a/storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp
@@ -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 SQLGetTypeInfoTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp b/storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp
index 7b9a7afc551..68d60489a86 100644
--- a/storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp
@@ -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 
 #define SQL_MAXIMUM_MESSAGE_LENGTH 200
diff --git a/storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp b/storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp
index 9b7983380f1..836e07668f7 100644
--- a/storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp
@@ -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 SQLNumResultColsTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLParamDataTest.cpp b/storage/ndb/test/odbc/client/SQLParamDataTest.cpp
index e566e55a417..87f22cfb0af 100644
--- a/storage/ndb/test/odbc/client/SQLParamDataTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLParamDataTest.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/odbc/client/SQLPrepareTest.cpp b/storage/ndb/test/odbc/client/SQLPrepareTest.cpp
index 96c6fff2cfd..f215e33a8f1 100644
--- a/storage/ndb/test/odbc/client/SQLPrepareTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLPrepareTest.cpp
@@ -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 SQLprepareTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLPutDataTest.cpp b/storage/ndb/test/odbc/client/SQLPutDataTest.cpp
index 7d3ce432b93..c964dae86ef 100644
--- a/storage/ndb/test/odbc/client/SQLPutDataTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLPutDataTest.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/odbc/client/SQLRowCountTest.cpp b/storage/ndb/test/odbc/client/SQLRowCountTest.cpp
index 0adaf671446..f88f5dbf12f 100644
--- a/storage/ndb/test/odbc/client/SQLRowCountTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLRowCountTest.cpp
@@ -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 SQLRowCountTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp b/storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp
index 19e38eef63f..93c46729748 100644
--- a/storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp
@@ -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 
 #define SQL_MAXIMUM_MESSAGE_LENGTH 200
diff --git a/storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp b/storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp
index 3c5a8124ce9..50174b69b26 100644
--- a/storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp
@@ -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 SQLSetCursorNameTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp b/storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp
index da40b93caa8..f37a88ac164 100644
--- a/storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp
@@ -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 
 
diff --git a/storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp b/storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp
index e251d60b455..52647b43739 100644
--- a/storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp b/storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp
index a9900202906..e8fdd26479e 100644
--- a/storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp
@@ -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 
 #define SQL_MAXIMUM_MESSAGE_LENGTH 200
diff --git a/storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp b/storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp
index 4bebc33681f..9715922ef2a 100644
--- a/storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp
@@ -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 
 #define SQL_MAXIMUM_MESSAGE_LENGTH 200
diff --git a/storage/ndb/test/odbc/client/SQLTablesTest.cpp b/storage/ndb/test/odbc/client/SQLTablesTest.cpp
index d9d8e386fcf..36f35516a0b 100644
--- a/storage/ndb/test/odbc/client/SQLTablesTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLTablesTest.cpp
@@ -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 SQLTablesTest.cpp
diff --git a/storage/ndb/test/odbc/client/SQLTransactTest.cpp b/storage/ndb/test/odbc/client/SQLTransactTest.cpp
index 50346b658c6..427765f131b 100644
--- a/storage/ndb/test/odbc/client/SQLTransactTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLTransactTest.cpp
@@ -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 SQLTransactTest.cpp
diff --git a/storage/ndb/test/odbc/client/common.hpp b/storage/ndb/test/odbc/client/common.hpp
index def7a8721fb..1efa46dc26e 100644
--- a/storage/ndb/test/odbc/client/common.hpp
+++ b/storage/ndb/test/odbc/client/common.hpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/odbc/client/main.cpp b/storage/ndb/test/odbc/client/main.cpp
index 8748faede06..6372cc03ecb 100644
--- a/storage/ndb/test/odbc/client/main.cpp
+++ b/storage/ndb/test/odbc/client/main.cpp
@@ -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 main.cpp
diff --git a/storage/ndb/test/odbc/driver/testOdbcDriver.cpp b/storage/ndb/test/odbc/driver/testOdbcDriver.cpp
index d58755440ac..a7dde0802ae 100644
--- a/storage/ndb/test/odbc/driver/testOdbcDriver.cpp
+++ b/storage/ndb/test/odbc/driver/testOdbcDriver.cpp
@@ -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 */
 
 /*
  * testOdbcDriver
diff --git a/storage/ndb/test/odbc/test_compiler/test_compiler.cpp b/storage/ndb/test/odbc/test_compiler/test_compiler.cpp
index d09b738dbb8..3ec8034ec2b 100644
--- a/storage/ndb/test/odbc/test_compiler/test_compiler.cpp
+++ b/storage/ndb/test/odbc/test_compiler/test_compiler.cpp
@@ -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 */
 
 /********************************************************************************** 
 						test_compiler.cpp 
diff --git a/storage/ndb/test/run-test/16node-tests.txt b/storage/ndb/test/run-test/16node-tests.txt
index 74592eecb22..d84526c62ec 100644
--- a/storage/ndb/test/run-test/16node-tests.txt
+++ b/storage/ndb/test/run-test/16node-tests.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
 
 # BASIC FUNCTIONALITY
 max-time: 500
diff --git a/storage/ndb/test/run-test/Makefile.am b/storage/ndb/test/run-test/Makefile.am
index de3896bf79c..f7b12c7caaa 100644
--- a/storage/ndb/test/run-test/Makefile.am
+++ b/storage/ndb/test/run-test/Makefile.am
@@ -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
 
 testroot=$(prefix)
 testdir=$(testroot)/mysql-test/ndb
diff --git a/storage/ndb/test/run-test/atrt-analyze-result.sh b/storage/ndb/test/run-test/atrt-analyze-result.sh
index 87f5e622b5e..aa985159cb9 100755
--- a/storage/ndb/test/run-test/atrt-analyze-result.sh
+++ b/storage/ndb/test/run-test/atrt-analyze-result.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 f=`find result -name 'log.out' | xargs grep "NDBT_ProgramExit: " | grep -c "Failed"`
 o=`find result -name 'log.out' | xargs grep "NDBT_ProgramExit: " | grep -c "OK"`
diff --git a/storage/ndb/test/run-test/atrt-clear-result.sh b/storage/ndb/test/run-test/atrt-clear-result.sh
index f4cb3b22d13..1a70de955c4 100755
--- a/storage/ndb/test/run-test/atrt-clear-result.sh
+++ b/storage/ndb/test/run-test/atrt-clear-result.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 set -e
 rm -rf result
diff --git a/storage/ndb/test/run-test/atrt-gather-result.sh b/storage/ndb/test/run-test/atrt-gather-result.sh
index acc58bcbca3..5b88e56993a 100755
--- a/storage/ndb/test/run-test/atrt-gather-result.sh
+++ b/storage/ndb/test/run-test/atrt-gather-result.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 set -e
 
diff --git a/storage/ndb/test/run-test/atrt-mysql-test-run b/storage/ndb/test/run-test/atrt-mysql-test-run
index 518f2a417e8..cee688fa39c 100755
--- a/storage/ndb/test/run-test/atrt-mysql-test-run
+++ b/storage/ndb/test/run-test/atrt-mysql-test-run
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 set -x
 p=`pwd`
diff --git a/storage/ndb/test/run-test/atrt-setup.sh b/storage/ndb/test/run-test/atrt-setup.sh
index d419022fd25..7f7d033d226 100755
--- a/storage/ndb/test/run-test/atrt-setup.sh
+++ b/storage/ndb/test/run-test/atrt-setup.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 set -e
 
diff --git a/storage/ndb/test/run-test/atrt-testBackup b/storage/ndb/test/run-test/atrt-testBackup
index b756c98e7df..052bb54f983 100755
--- a/storage/ndb/test/run-test/atrt-testBackup
+++ b/storage/ndb/test/run-test/atrt-testBackup
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 PATH=$PATH:$MYSQL_BASE_DIR/bin
 export PATH
diff --git a/storage/ndb/test/run-test/atrt.hpp b/storage/ndb/test/run-test/atrt.hpp
index a6dd75b460e..b4e8833520f 100644
--- a/storage/ndb/test/run-test/atrt.hpp
+++ b/storage/ndb/test/run-test/atrt.hpp
@@ -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 atrt_config_hpp
 #define atrt_config_hpp
diff --git a/storage/ndb/test/run-test/autotest-boot.sh b/storage/ndb/test/run-test/autotest-boot.sh
index f1f8aea2519..42b378dc172 100644
--- a/storage/ndb/test/run-test/autotest-boot.sh
+++ b/storage/ndb/test/run-test/autotest-boot.sh
@@ -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
 
 #############################################################
 # This script created by Jonas does the following	    #
diff --git a/storage/ndb/test/run-test/autotest-run.sh b/storage/ndb/test/run-test/autotest-run.sh
index 0c9c6aee215..40e61b2cd6a 100644
--- a/storage/ndb/test/run-test/autotest-run.sh
+++ b/storage/ndb/test/run-test/autotest-run.sh
@@ -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
 
 #############################################################
 # This script created by Jonas does the following	    #
diff --git a/storage/ndb/test/run-test/basic.txt b/storage/ndb/test/run-test/basic.txt
index 80e2bec41b2..ee6e0f17f45 100644
--- a/storage/ndb/test/run-test/basic.txt
+++ b/storage/ndb/test/run-test/basic.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
 
 # BASIC FUNCTIONALITY
 max-time: 500
diff --git a/storage/ndb/test/run-test/daily-basic-tests.txt b/storage/ndb/test/run-test/daily-basic-tests.txt
index ec6fcde0879..ca8004d226c 100644
--- a/storage/ndb/test/run-test/daily-basic-tests.txt
+++ b/storage/ndb/test/run-test/daily-basic-tests.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
 
 max-time: 600
 cmd: atrt-testBackup
diff --git a/storage/ndb/test/run-test/daily-devel-tests.txt b/storage/ndb/test/run-test/daily-devel-tests.txt
index 95fe82d1796..032f0806040 100644
--- a/storage/ndb/test/run-test/daily-devel-tests.txt
+++ b/storage/ndb/test/run-test/daily-devel-tests.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
 
 #
 # INDEX
diff --git a/storage/ndb/test/run-test/files.cpp b/storage/ndb/test/run-test/files.cpp
index 294d0aca56e..0e1a477690c 100644
--- a/storage/ndb/test/run-test/files.cpp
+++ b/storage/ndb/test/run-test/files.cpp
@@ -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 "atrt.hpp"
diff --git a/storage/ndb/test/run-test/main.cpp b/storage/ndb/test/run-test/main.cpp
index 8618081bac7..6537cce1236 100644
--- a/storage/ndb/test/run-test/main.cpp
+++ b/storage/ndb/test/run-test/main.cpp
@@ -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 "atrt.hpp"
diff --git a/storage/ndb/test/run-test/make-config.sh b/storage/ndb/test/run-test/make-config.sh
index 8a7c0694c84..f501f7338cc 100755
--- a/storage/ndb/test/run-test/make-config.sh
+++ b/storage/ndb/test/run-test/make-config.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 baseport=""
 basedir=""
diff --git a/storage/ndb/test/run-test/make-html-reports.sh b/storage/ndb/test/run-test/make-html-reports.sh
index c78034ed609..d2a12e6eab8 100755
--- a/storage/ndb/test/run-test/make-html-reports.sh
+++ b/storage/ndb/test/run-test/make-html-reports.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 src_dir=$1
 run=$2
diff --git a/storage/ndb/test/run-test/make-index.sh b/storage/ndb/test/run-test/make-index.sh
index d1b4d125c95..25bde236dab 100755
--- a/storage/ndb/test/run-test/make-index.sh
+++ b/storage/ndb/test/run-test/make-index.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 # NAME
 #   make-index.sh
diff --git a/storage/ndb/test/run-test/ndb-autotest.sh b/storage/ndb/test/run-test/ndb-autotest.sh
index a8a009eeaf3..3320b1b78da 100755
--- a/storage/ndb/test/run-test/ndb-autotest.sh
+++ b/storage/ndb/test/run-test/ndb-autotest.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 #############################################################
 # This script created by Jonas does the following	    #
diff --git a/storage/ndb/test/run-test/setup.cpp b/storage/ndb/test/run-test/setup.cpp
index 52fbe5a8e8e..67a7893d993 100644
--- a/storage/ndb/test/run-test/setup.cpp
+++ b/storage/ndb/test/run-test/setup.cpp
@@ -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 "atrt.hpp"
diff --git a/storage/ndb/test/run-test/upgrade-boot.sh b/storage/ndb/test/run-test/upgrade-boot.sh
index 745418dbb7c..080422f0f11 100644
--- a/storage/ndb/test/run-test/upgrade-boot.sh
+++ b/storage/ndb/test/run-test/upgrade-boot.sh
@@ -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
 
 #############################################################
 # This script created by Jonas does the following	    #
diff --git a/storage/ndb/test/src/AtrtClient.cpp b/storage/ndb/test/src/AtrtClient.cpp
index a42f0fa8eb0..e5ccc8ead57 100644
--- a/storage/ndb/test/src/AtrtClient.cpp
+++ b/storage/ndb/test/src/AtrtClient.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/src/CpcClient.cpp b/storage/ndb/test/src/CpcClient.cpp
index 9133815ada4..f192f078f93 100644
--- a/storage/ndb/test/src/CpcClient.cpp
+++ b/storage/ndb/test/src/CpcClient.cpp
@@ -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 
 
diff --git a/storage/ndb/test/src/DbUtil.cpp b/storage/ndb/test/src/DbUtil.cpp
index 5c77f32a018..2b49c95d290 100755
--- a/storage/ndb/test/src/DbUtil.cpp
+++ b/storage/ndb/test/src/DbUtil.cpp
@@ -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 */
 
 /* DbUtil.cpp: implementation of the database utilities class.*/
 
diff --git a/storage/ndb/test/src/HugoAsynchTransactions.cpp b/storage/ndb/test/src/HugoAsynchTransactions.cpp
index 4ee3c322f6e..52cbbdbe681 100644
--- a/storage/ndb/test/src/HugoAsynchTransactions.cpp
+++ b/storage/ndb/test/src/HugoAsynchTransactions.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/src/HugoCalculator.cpp b/storage/ndb/test/src/HugoCalculator.cpp
index d0c01ea2bf9..2864d684241 100644
--- a/storage/ndb/test/src/HugoCalculator.cpp
+++ b/storage/ndb/test/src/HugoCalculator.cpp
@@ -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 
 #include "HugoCalculator.hpp"
diff --git a/storage/ndb/test/src/HugoOperations.cpp b/storage/ndb/test/src/HugoOperations.cpp
index 35a85dce56f..6b1a2f6c683 100644
--- a/storage/ndb/test/src/HugoOperations.cpp
+++ b/storage/ndb/test/src/HugoOperations.cpp
@@ -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 
 
diff --git a/storage/ndb/test/src/HugoTransactions.cpp b/storage/ndb/test/src/HugoTransactions.cpp
index 67e42ec072e..55ab4803d76 100644
--- a/storage/ndb/test/src/HugoTransactions.cpp
+++ b/storage/ndb/test/src/HugoTransactions.cpp
@@ -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 "HugoTransactions.hpp"
 #include 
diff --git a/storage/ndb/test/src/Makefile.am b/storage/ndb/test/src/Makefile.am
index 8fdfa0df669..0c0ff7175ba 100644
--- a/storage/ndb/test/src/Makefile.am
+++ b/storage/ndb/test/src/Makefile.am
@@ -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
 
 noinst_LIBRARIES = libNDBT.a
 
diff --git a/storage/ndb/test/src/NDBT_Error.cpp b/storage/ndb/test/src/NDBT_Error.cpp
index 99391274451..d10d92d7dc9 100644
--- a/storage/ndb/test/src/NDBT_Error.cpp
+++ b/storage/ndb/test/src/NDBT_Error.cpp
@@ -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 */
 
 /* NDBT_Error.cpp                         */
 /* This program deals with error handling */
diff --git a/storage/ndb/test/src/NDBT_Output.cpp b/storage/ndb/test/src/NDBT_Output.cpp
index cffdd177b4a..d677edccd79 100644
--- a/storage/ndb/test/src/NDBT_Output.cpp
+++ b/storage/ndb/test/src/NDBT_Output.cpp
@@ -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 "NDBT_Output.hpp"
diff --git a/storage/ndb/test/src/NDBT_ResultRow.cpp b/storage/ndb/test/src/NDBT_ResultRow.cpp
index a4f71f869f2..020b41bc11c 100644
--- a/storage/ndb/test/src/NDBT_ResultRow.cpp
+++ b/storage/ndb/test/src/NDBT_ResultRow.cpp
@@ -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 
 #include "NDBT_ResultRow.hpp"
diff --git a/storage/ndb/test/src/NDBT_ReturnCodes.cpp b/storage/ndb/test/src/NDBT_ReturnCodes.cpp
index 4017dc5ca59..ae4c359f906 100644
--- a/storage/ndb/test/src/NDBT_ReturnCodes.cpp
+++ b/storage/ndb/test/src/NDBT_ReturnCodes.cpp
@@ -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 */
 
 /* System include files */
 #include 
diff --git a/storage/ndb/test/src/NDBT_Table.cpp b/storage/ndb/test/src/NDBT_Table.cpp
index bc6261cd915..33c747eeef5 100644
--- a/storage/ndb/test/src/NDBT_Table.cpp
+++ b/storage/ndb/test/src/NDBT_Table.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/src/NDBT_Tables.cpp b/storage/ndb/test/src/NDBT_Tables.cpp
index 2aaf6a778df..9ce00981bfb 100644
--- a/storage/ndb/test/src/NDBT_Tables.cpp
+++ b/storage/ndb/test/src/NDBT_Tables.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/src/NDBT_Test.cpp b/storage/ndb/test/src/NDBT_Test.cpp
index 891c0d91ae1..ab7d3d5ace2 100644
--- a/storage/ndb/test/src/NDBT_Test.cpp
+++ b/storage/ndb/test/src/NDBT_Test.cpp
@@ -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 
 //#define NDB_OPTS_SKIP_USAGE
diff --git a/storage/ndb/test/src/NDBT_Thread.cpp b/storage/ndb/test/src/NDBT_Thread.cpp
index 1f4d46aeb1b..9c4395bab4c 100644
--- a/storage/ndb/test/src/NDBT_Thread.cpp
+++ b/storage/ndb/test/src/NDBT_Thread.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/src/NdbBackup.cpp b/storage/ndb/test/src/NdbBackup.cpp
index 98048c5df77..7cf0cb336f1 100644
--- a/storage/ndb/test/src/NdbBackup.cpp
+++ b/storage/ndb/test/src/NdbBackup.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/src/NdbConfig.cpp b/storage/ndb/test/src/NdbConfig.cpp
index 5743896ef64..17c08068545 100644
--- a/storage/ndb/test/src/NdbConfig.cpp
+++ b/storage/ndb/test/src/NdbConfig.cpp
@@ -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 "NdbConfig.hpp"
 #include 
diff --git a/storage/ndb/test/src/NdbGrep.cpp b/storage/ndb/test/src/NdbGrep.cpp
index 3ae82728bc5..b94ed01a406 100644
--- a/storage/ndb/test/src/NdbGrep.cpp
+++ b/storage/ndb/test/src/NdbGrep.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/src/NdbMixRestarter.cpp b/storage/ndb/test/src/NdbMixRestarter.cpp
index 236ba491a00..c07d48e37f0 100644
--- a/storage/ndb/test/src/NdbMixRestarter.cpp
+++ b/storage/ndb/test/src/NdbMixRestarter.cpp
@@ -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 "NdbMixRestarter.hpp"
 
diff --git a/storage/ndb/test/src/NdbRestarter.cpp b/storage/ndb/test/src/NdbRestarter.cpp
index 0f8a3a46605..a856f7ee3d5 100644
--- a/storage/ndb/test/src/NdbRestarter.cpp
+++ b/storage/ndb/test/src/NdbRestarter.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/src/NdbRestarts.cpp b/storage/ndb/test/src/NdbRestarts.cpp
index 5dd26dd98b1..0c342f28c2a 100644
--- a/storage/ndb/test/src/NdbRestarts.cpp
+++ b/storage/ndb/test/src/NdbRestarts.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/src/NdbSchemaCon.cpp b/storage/ndb/test/src/NdbSchemaCon.cpp
index 37e077ec661..f425b75954c 100644
--- a/storage/ndb/test/src/NdbSchemaCon.cpp
+++ b/storage/ndb/test/src/NdbSchemaCon.cpp
@@ -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/storage/ndb/test/src/NdbSchemaOp.cpp b/storage/ndb/test/src/NdbSchemaOp.cpp
index b713bedf0df..d8ba68db74c 100644
--- a/storage/ndb/test/src/NdbSchemaOp.cpp
+++ b/storage/ndb/test/src/NdbSchemaOp.cpp
@@ -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/storage/ndb/test/src/UtilTransactions.cpp b/storage/ndb/test/src/UtilTransactions.cpp
index 5e4edb3585d..6f229ca7de3 100644
--- a/storage/ndb/test/src/UtilTransactions.cpp
+++ b/storage/ndb/test/src/UtilTransactions.cpp
@@ -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 "UtilTransactions.hpp"
 #include 
diff --git a/storage/ndb/test/tools/Makefile.am b/storage/ndb/test/tools/Makefile.am
index 33117ea8a54..c8030d429c7 100644
--- a/storage/ndb/test/tools/Makefile.am
+++ b/storage/ndb/test/tools/Makefile.am
@@ -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
 
 ndbtest_PROGRAMS = hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord  hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index  ndb_cpcc listen_event eventlog rep_latency ndb_connect
 
diff --git a/storage/ndb/test/tools/connect.cpp b/storage/ndb/test/tools/connect.cpp
index 947cca95d46..01c02103974 100644
--- a/storage/ndb/test/tools/connect.cpp
+++ b/storage/ndb/test/tools/connect.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/test/tools/copy_tab.cpp b/storage/ndb/test/tools/copy_tab.cpp
index fe54b4c9c41..95aedb12d09 100644
--- a/storage/ndb/test/tools/copy_tab.cpp
+++ b/storage/ndb/test/tools/copy_tab.cpp
@@ -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 
 
diff --git a/storage/ndb/test/tools/cpcc.cpp b/storage/ndb/test/tools/cpcc.cpp
index 8cd7f5f8f61..6ef1f67a953 100644
--- a/storage/ndb/test/tools/cpcc.cpp
+++ b/storage/ndb/test/tools/cpcc.cpp
@@ -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 
diff --git a/storage/ndb/test/tools/create_index.cpp b/storage/ndb/test/tools/create_index.cpp
index 992034a5085..5effda69f69 100644
--- a/storage/ndb/test/tools/create_index.cpp
+++ b/storage/ndb/test/tools/create_index.cpp
@@ -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 
 
diff --git a/storage/ndb/test/tools/hugoCalculator.cpp b/storage/ndb/test/tools/hugoCalculator.cpp
index 964e898f6ed..b86c4854743 100644
--- a/storage/ndb/test/tools/hugoCalculator.cpp
+++ b/storage/ndb/test/tools/hugoCalculator.cpp
@@ -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 
diff --git a/storage/ndb/test/tools/hugoFill.cpp b/storage/ndb/test/tools/hugoFill.cpp
index 420014ef33b..5826b31d733 100644
--- a/storage/ndb/test/tools/hugoFill.cpp
+++ b/storage/ndb/test/tools/hugoFill.cpp
@@ -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 
 
diff --git a/storage/ndb/test/tools/hugoLoad.cpp b/storage/ndb/test/tools/hugoLoad.cpp
index a31a3013e16..c74c44329f2 100644
--- a/storage/ndb/test/tools/hugoLoad.cpp
+++ b/storage/ndb/test/tools/hugoLoad.cpp
@@ -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 
diff --git a/storage/ndb/test/tools/hugoLockRecords.cpp b/storage/ndb/test/tools/hugoLockRecords.cpp
index 4dd47bf904e..3d325fc67e2 100644
--- a/storage/ndb/test/tools/hugoLockRecords.cpp
+++ b/storage/ndb/test/tools/hugoLockRecords.cpp
@@ -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 
 
diff --git a/storage/ndb/test/tools/hugoPkDelete.cpp b/storage/ndb/test/tools/hugoPkDelete.cpp
index fd73e381224..69b03f82efd 100644
--- a/storage/ndb/test/tools/hugoPkDelete.cpp
+++ b/storage/ndb/test/tools/hugoPkDelete.cpp
@@ -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 
 
diff --git a/storage/ndb/test/tools/hugoPkRead.cpp b/storage/ndb/test/tools/hugoPkRead.cpp
index a5d7474c7c5..844b58be676 100644
--- a/storage/ndb/test/tools/hugoPkRead.cpp
+++ b/storage/ndb/test/tools/hugoPkRead.cpp
@@ -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 
 
diff --git a/storage/ndb/test/tools/hugoPkReadRecord.cpp b/storage/ndb/test/tools/hugoPkReadRecord.cpp
index d2c31d56794..28ce58e1bbd 100644
--- a/storage/ndb/test/tools/hugoPkReadRecord.cpp
+++ b/storage/ndb/test/tools/hugoPkReadRecord.cpp
@@ -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 
 
diff --git a/storage/ndb/test/tools/hugoPkUpdate.cpp b/storage/ndb/test/tools/hugoPkUpdate.cpp
index b8cf6dfe5ea..62bb7485f86 100644
--- a/storage/ndb/test/tools/hugoPkUpdate.cpp
+++ b/storage/ndb/test/tools/hugoPkUpdate.cpp
@@ -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 
 
diff --git a/storage/ndb/test/tools/hugoScanRead.cpp b/storage/ndb/test/tools/hugoScanRead.cpp
index 7a23c789d19..e1320eec96a 100644
--- a/storage/ndb/test/tools/hugoScanRead.cpp
+++ b/storage/ndb/test/tools/hugoScanRead.cpp
@@ -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 
 
diff --git a/storage/ndb/test/tools/hugoScanUpdate.cpp b/storage/ndb/test/tools/hugoScanUpdate.cpp
index dd7da2f5f1a..642f8111363 100644
--- a/storage/ndb/test/tools/hugoScanUpdate.cpp
+++ b/storage/ndb/test/tools/hugoScanUpdate.cpp
@@ -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 
 
diff --git a/storage/ndb/test/tools/listen.cpp b/storage/ndb/test/tools/listen.cpp
index 09c867117ba..2139aba6c4b 100644
--- a/storage/ndb/test/tools/listen.cpp
+++ b/storage/ndb/test/tools/listen.cpp
@@ -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 
diff --git a/storage/ndb/test/tools/log_listner.cpp b/storage/ndb/test/tools/log_listner.cpp
index a0a03f1319a..afc52129139 100644
--- a/storage/ndb/test/tools/log_listner.cpp
+++ b/storage/ndb/test/tools/log_listner.cpp
@@ -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 
diff --git a/storage/ndb/test/tools/rep_latency.cpp b/storage/ndb/test/tools/rep_latency.cpp
index 6a5bba4f348..be21f0ce919 100644
--- a/storage/ndb/test/tools/rep_latency.cpp
+++ b/storage/ndb/test/tools/rep_latency.cpp
@@ -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 */
 
 /* 
  * Update on master wait for update on slave
diff --git a/storage/ndb/test/tools/restart.cpp b/storage/ndb/test/tools/restart.cpp
index 59414ecc70b..9b497df13e9 100644
--- a/storage/ndb/test/tools/restart.cpp
+++ b/storage/ndb/test/tools/restart.cpp
@@ -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 
diff --git a/storage/ndb/test/tools/transproxy.cpp b/storage/ndb/test/tools/transproxy.cpp
index 5420071237b..0e53c4a67ef 100644
--- a/storage/ndb/test/tools/transproxy.cpp
+++ b/storage/ndb/test/tools/transproxy.cpp
@@ -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 
 
diff --git a/storage/ndb/test/tools/verify_index.cpp b/storage/ndb/test/tools/verify_index.cpp
index 68206df538a..89c55ed7310 100644
--- a/storage/ndb/test/tools/verify_index.cpp
+++ b/storage/ndb/test/tools/verify_index.cpp
@@ -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 
 
diff --git a/storage/ndb/tools/Makefile.am b/storage/ndb/tools/Makefile.am
index 3869025c981..7645031ebe5 100644
--- a/storage/ndb/tools/Makefile.am
+++ b/storage/ndb/tools/Makefile.am
@@ -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
 
 dist_bin_SCRIPTS =	ndb_size.pl ndb_error_reporter
 dist_pkgdata_DATA =
diff --git a/storage/ndb/tools/clean-links.sh b/storage/ndb/tools/clean-links.sh
index bcd6bb288ef..c2359b16083 100755
--- a/storage/ndb/tools/clean-links.sh
+++ b/storage/ndb/tools/clean-links.sh
@@ -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
 
 # 1 - Dir
 # 2 - Link dst
diff --git a/storage/ndb/tools/delete_all.cpp b/storage/ndb/tools/delete_all.cpp
index 0721c699fb8..b73634e571e 100644
--- a/storage/ndb/tools/delete_all.cpp
+++ b/storage/ndb/tools/delete_all.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/tools/desc.cpp b/storage/ndb/tools/desc.cpp
index f85915d5a87..78be469a222 100644
--- a/storage/ndb/tools/desc.cpp
+++ b/storage/ndb/tools/desc.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/tools/drop_index.cpp b/storage/ndb/tools/drop_index.cpp
index 244e13c76c9..29a2eb58ec9 100644
--- a/storage/ndb/tools/drop_index.cpp
+++ b/storage/ndb/tools/drop_index.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/tools/drop_tab.cpp b/storage/ndb/tools/drop_tab.cpp
index 09b17196b39..7ecc33ab700 100644
--- a/storage/ndb/tools/drop_tab.cpp
+++ b/storage/ndb/tools/drop_tab.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/tools/listTables.cpp b/storage/ndb/tools/listTables.cpp
index 9e5ebf5fc33..efc0f43f3a7 100644
--- a/storage/ndb/tools/listTables.cpp
+++ b/storage/ndb/tools/listTables.cpp
@@ -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 */
 
 /*
  * list_tables
diff --git a/storage/ndb/tools/make-errors.pl b/storage/ndb/tools/make-errors.pl
index 18c934e6fec..a5f386d4625 100644
--- a/storage/ndb/tools/make-errors.pl
+++ b/storage/ndb/tools/make-errors.pl
@@ -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
 
 use strict;
 use Getopt::Long;
diff --git a/storage/ndb/tools/make-links.sh b/storage/ndb/tools/make-links.sh
index ae170e9d1fc..fa03d3b27a6 100755
--- a/storage/ndb/tools/make-links.sh
+++ b/storage/ndb/tools/make-links.sh
@@ -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
 
 # 1 - Link top src
 # 2 - Link dst
diff --git a/storage/ndb/tools/ndb_config.cpp b/storage/ndb/tools/ndb_config.cpp
index 0845b08f95f..7ef0ee97b70 100644
--- a/storage/ndb/tools/ndb_config.cpp
+++ b/storage/ndb/tools/ndb_config.cpp
@@ -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 */
 
 /**
  * ndb_config --nodes --query=nodeid --type=ndbd --host=local1
diff --git a/storage/ndb/tools/ndb_error_reporter b/storage/ndb/tools/ndb_error_reporter
index 493a630a6dd..e197ad77c3b 100644
--- a/storage/ndb/tools/ndb_error_reporter
+++ b/storage/ndb/tools/ndb_error_reporter
@@ -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
 
 use strict;
 
diff --git a/storage/ndb/tools/ndb_size.pl b/storage/ndb/tools/ndb_size.pl
index 127e91e51f5..3937f459e49 100644
--- a/storage/ndb/tools/ndb_size.pl
+++ b/storage/ndb/tools/ndb_size.pl
@@ -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
 
 use strict;
 
diff --git a/storage/ndb/tools/ndb_test_platform.cpp b/storage/ndb/tools/ndb_test_platform.cpp
index 25c5e407a77..32ec6f3b57c 100644
--- a/storage/ndb/tools/ndb_test_platform.cpp
+++ b/storage/ndb/tools/ndb_test_platform.cpp
@@ -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 
diff --git a/storage/ndb/tools/ndbsql.cpp b/storage/ndb/tools/ndbsql.cpp
index 163c688b899..f5bbff6f000 100644
--- a/storage/ndb/tools/ndbsql.cpp
+++ b/storage/ndb/tools/ndbsql.cpp
@@ -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 */
 
 /*******************************************************************************
  *  NDB Cluster NDB SQL -- A simple SQL Command-line Interface
diff --git a/storage/ndb/tools/restore/Restore.cpp b/storage/ndb/tools/restore/Restore.cpp
index 0fba63e1f56..71d639ab7e0 100644
--- a/storage/ndb/tools/restore/Restore.cpp
+++ b/storage/ndb/tools/restore/Restore.cpp
@@ -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 "Restore.hpp"
 #include 
diff --git a/storage/ndb/tools/restore/Restore.hpp b/storage/ndb/tools/restore/Restore.hpp
index f9e121c957f..a4585ce7269 100644
--- a/storage/ndb/tools/restore/Restore.hpp
+++ b/storage/ndb/tools/restore/Restore.hpp
@@ -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 RESTORE_H
 #define RESTORE_H
diff --git a/storage/ndb/tools/restore/consumer.cpp b/storage/ndb/tools/restore/consumer.cpp
index 4c7f88e241f..745202a7dc1 100644
--- a/storage/ndb/tools/restore/consumer.cpp
+++ b/storage/ndb/tools/restore/consumer.cpp
@@ -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 "consumer.hpp"
 
diff --git a/storage/ndb/tools/restore/consumer.hpp b/storage/ndb/tools/restore/consumer.hpp
index 4bd511ee902..02ad13fec2e 100644
--- a/storage/ndb/tools/restore/consumer.hpp
+++ b/storage/ndb/tools/restore/consumer.hpp
@@ -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 CONSUMER_HPP
 #define CONSUMER_HPP
diff --git a/storage/ndb/tools/restore/consumer_printer.cpp b/storage/ndb/tools/restore/consumer_printer.cpp
index 5557b514e68..ea32d3e8762 100644
--- a/storage/ndb/tools/restore/consumer_printer.cpp
+++ b/storage/ndb/tools/restore/consumer_printer.cpp
@@ -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 "consumer_printer.hpp"
 extern FilteredNdbOut info;
diff --git a/storage/ndb/tools/restore/consumer_printer.hpp b/storage/ndb/tools/restore/consumer_printer.hpp
index 3f57e195143..35ce0f0991d 100644
--- a/storage/ndb/tools/restore/consumer_printer.hpp
+++ b/storage/ndb/tools/restore/consumer_printer.hpp
@@ -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 CONSUMER_PRINTER_HPP
 #define CONSUMER_PRINTER_HPP
diff --git a/storage/ndb/tools/restore/consumer_restore.cpp b/storage/ndb/tools/restore/consumer_restore.cpp
index c39af7fcd8b..1657697e694 100644
--- a/storage/ndb/tools/restore/consumer_restore.cpp
+++ b/storage/ndb/tools/restore/consumer_restore.cpp
@@ -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 
 #include "consumer_restore.hpp"
diff --git a/storage/ndb/tools/restore/consumer_restore.hpp b/storage/ndb/tools/restore/consumer_restore.hpp
index 7c767963bac..4834e06146d 100644
--- a/storage/ndb/tools/restore/consumer_restore.hpp
+++ b/storage/ndb/tools/restore/consumer_restore.hpp
@@ -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 CONSUMER_RESTORE_HPP
 #define CONSUMER_RESTORE_HPP
diff --git a/storage/ndb/tools/restore/consumer_restorem.cpp b/storage/ndb/tools/restore/consumer_restorem.cpp
index 239ff9d497c..9e727707412 100644
--- a/storage/ndb/tools/restore/consumer_restorem.cpp
+++ b/storage/ndb/tools/restore/consumer_restorem.cpp
@@ -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 "consumer_restore.hpp"
 #include 
diff --git a/storage/ndb/tools/restore/ndb_nodegroup_map.h b/storage/ndb/tools/restore/ndb_nodegroup_map.h
index 7b044cefbfe..297e09be4d0 100644
--- a/storage/ndb/tools/restore/ndb_nodegroup_map.h
+++ b/storage/ndb/tools/restore/ndb_nodegroup_map.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 ndb_nodegroup_map.h
diff --git a/storage/ndb/tools/restore/restore_main.cpp b/storage/ndb/tools/restore/restore_main.cpp
index 9af989e457a..68768212b22 100644
--- a/storage/ndb/tools/restore/restore_main.cpp
+++ b/storage/ndb/tools/restore/restore_main.cpp
@@ -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 
 #include 
diff --git a/storage/ndb/tools/rgrep b/storage/ndb/tools/rgrep
index 6307e350987..4aec320c65b 100755
--- a/storage/ndb/tools/rgrep
+++ b/storage/ndb/tools/rgrep
@@ -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
 
 die "Usage: rgrep [-iredblLn] regexp filepat ...\n       rgrep -h for help\n"
     if $#ARGV < $[;
diff --git a/storage/ndb/tools/select_all.cpp b/storage/ndb/tools/select_all.cpp
index b8fbf977125..aa3c2be9e95 100644
--- a/storage/ndb/tools/select_all.cpp
+++ b/storage/ndb/tools/select_all.cpp
@@ -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 
diff --git a/storage/ndb/tools/select_count.cpp b/storage/ndb/tools/select_count.cpp
index 4c523371cc0..1b15129f740 100644
--- a/storage/ndb/tools/select_count.cpp
+++ b/storage/ndb/tools/select_count.cpp
@@ -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 
diff --git a/storage/ndb/tools/waiter.cpp b/storage/ndb/tools/waiter.cpp
index c9127358c69..3c12682ad6c 100644
--- a/storage/ndb/tools/waiter.cpp
+++ b/storage/ndb/tools/waiter.cpp
@@ -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 
diff --git a/storage/perfschema/unittest/stub_server_misc.h b/storage/perfschema/unittest/stub_server_misc.h
index 8b6492743cc..86c5c21b967 100644
--- a/storage/perfschema/unittest/stub_server_misc.h
+++ b/storage/perfschema/unittest/stub_server_misc.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 */
 
 /*
   Minimal code to be able to link a unit test.
diff --git a/storage/tokudb/COPYING b/storage/tokudb/COPYING
index d511905c164..6e475df5526 100644
--- a/storage/tokudb/COPYING
+++ b/storage/tokudb/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have 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.
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/storage/tokudb/ft-index/COPYING b/storage/tokudb/ft-index/COPYING
index d511905c164..6e475df5526 100644
--- a/storage/tokudb/ft-index/COPYING
+++ b/storage/tokudb/ft-index/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have 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.
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/storage/tokudb/ft-index/README-TOKUDB b/storage/tokudb/ft-index/README-TOKUDB
index 7d70059a912..7dbf97604c3 100644
--- a/storage/tokudb/ft-index/README-TOKUDB
+++ b/storage/tokudb/ft-index/README-TOKUDB
@@ -21,7 +21,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/buildheader/make_tdb.cc b/storage/tokudb/ft-index/buildheader/make_tdb.cc
index 610ce670db5..37a0679ccc7 100644
--- a/storage/tokudb/ft-index/buildheader/make_tdb.cc
+++ b/storage/tokudb/ft-index/buildheader/make_tdb.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/cmake/merge_archives_unix.cmake.in b/storage/tokudb/ft-index/cmake/merge_archives_unix.cmake.in
index 0a59e4553df..ef9af445dcc 100644
--- a/storage/tokudb/ft-index/cmake/merge_archives_unix.cmake.in
+++ b/storage/tokudb/ft-index/cmake/merge_archives_unix.cmake.in
@@ -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 script merges many static libraries into
 # one big library on Unix.
diff --git a/storage/tokudb/ft-index/ft/bndata.cc b/storage/tokudb/ft-index/ft/bndata.cc
index c4d522849a1..a2518f98dc1 100644
--- a/storage/tokudb/ft-index/ft/bndata.cc
+++ b/storage/tokudb/ft-index/ft/bndata.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/bndata.h b/storage/tokudb/ft-index/ft/bndata.h
index 0cded5de5fc..8afcdc96099 100644
--- a/storage/tokudb/ft-index/ft/bndata.h
+++ b/storage/tokudb/ft-index/ft/bndata.h
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/cachetable/background_job_manager.cc b/storage/tokudb/ft-index/ft/cachetable/background_job_manager.cc
index 8db05018d3c..f58f458a70c 100644
--- a/storage/tokudb/ft-index/ft/cachetable/background_job_manager.cc
+++ b/storage/tokudb/ft-index/ft/cachetable/background_job_manager.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/cachetable/background_job_manager.h b/storage/tokudb/ft-index/ft/cachetable/background_job_manager.h
index d977abae418..d2c433adcd6 100644
--- a/storage/tokudb/ft-index/ft/cachetable/background_job_manager.h
+++ b/storage/tokudb/ft-index/ft/cachetable/background_job_manager.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/cachetable/cachetable-internal.h b/storage/tokudb/ft-index/ft/cachetable/cachetable-internal.h
index d5dc3ffa5fb..d7bf63c551a 100644
--- a/storage/tokudb/ft-index/ft/cachetable/cachetable-internal.h
+++ b/storage/tokudb/ft-index/ft/cachetable/cachetable-internal.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/cachetable/cachetable.cc b/storage/tokudb/ft-index/ft/cachetable/cachetable.cc
index 2704d0fd76c..763f424f6cb 100644
--- a/storage/tokudb/ft-index/ft/cachetable/cachetable.cc
+++ b/storage/tokudb/ft-index/ft/cachetable/cachetable.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/cachetable/cachetable.h b/storage/tokudb/ft-index/ft/cachetable/cachetable.h
index a1ea83406a1..967399bcd39 100644
--- a/storage/tokudb/ft-index/ft/cachetable/cachetable.h
+++ b/storage/tokudb/ft-index/ft/cachetable/cachetable.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/cachetable/checkpoint.cc b/storage/tokudb/ft-index/ft/cachetable/checkpoint.cc
index 8a0ba32240e..0da01519b62 100644
--- a/storage/tokudb/ft-index/ft/cachetable/checkpoint.cc
+++ b/storage/tokudb/ft-index/ft/cachetable/checkpoint.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/cachetable/checkpoint.h b/storage/tokudb/ft-index/ft/cachetable/checkpoint.h
index 57a41210e83..7c4d0596063 100644
--- a/storage/tokudb/ft-index/ft/cachetable/checkpoint.h
+++ b/storage/tokudb/ft-index/ft/cachetable/checkpoint.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/comparator.h b/storage/tokudb/ft-index/ft/comparator.h
index caf2b8b9d18..01104a704ad 100644
--- a/storage/tokudb/ft-index/ft/comparator.h
+++ b/storage/tokudb/ft-index/ft/comparator.h
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/cursor.cc b/storage/tokudb/ft-index/ft/cursor.cc
index b7000869336..aff3ea0ce1b 100644
--- a/storage/tokudb/ft-index/ft/cursor.cc
+++ b/storage/tokudb/ft-index/ft/cursor.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/cursor.h b/storage/tokudb/ft-index/ft/cursor.h
index da2b3d5c8a1..6cc36dc112f 100644
--- a/storage/tokudb/ft-index/ft/cursor.h
+++ b/storage/tokudb/ft-index/ft/cursor.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft-cachetable-wrappers.cc b/storage/tokudb/ft-index/ft/ft-cachetable-wrappers.cc
index 5c6331855a4..c8871b99b0d 100644
--- a/storage/tokudb/ft-index/ft/ft-cachetable-wrappers.cc
+++ b/storage/tokudb/ft-index/ft/ft-cachetable-wrappers.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft-cachetable-wrappers.h b/storage/tokudb/ft-index/ft/ft-cachetable-wrappers.h
index 72056e4d58c..eae5597d902 100644
--- a/storage/tokudb/ft-index/ft/ft-cachetable-wrappers.h
+++ b/storage/tokudb/ft-index/ft/ft-cachetable-wrappers.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft-flusher-internal.h b/storage/tokudb/ft-index/ft/ft-flusher-internal.h
index f26b2d56ef5..e24268994ec 100644
--- a/storage/tokudb/ft-index/ft/ft-flusher-internal.h
+++ b/storage/tokudb/ft-index/ft/ft-flusher-internal.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft-flusher.cc b/storage/tokudb/ft-index/ft/ft-flusher.cc
index a39092aa058..9d5ca691ae2 100644
--- a/storage/tokudb/ft-index/ft/ft-flusher.cc
+++ b/storage/tokudb/ft-index/ft/ft-flusher.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft-flusher.h b/storage/tokudb/ft-index/ft/ft-flusher.h
index 47bf4e7cf77..69fa77642ea 100644
--- a/storage/tokudb/ft-index/ft/ft-flusher.h
+++ b/storage/tokudb/ft-index/ft/ft-flusher.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft-hot-flusher.cc b/storage/tokudb/ft-index/ft/ft-hot-flusher.cc
index 74d6109f52e..a9f909ce513 100644
--- a/storage/tokudb/ft-index/ft/ft-hot-flusher.cc
+++ b/storage/tokudb/ft-index/ft/ft-hot-flusher.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft-internal.h b/storage/tokudb/ft-index/ft/ft-internal.h
index 4a820d5682b..4f46184e5c9 100644
--- a/storage/tokudb/ft-index/ft/ft-internal.h
+++ b/storage/tokudb/ft-index/ft/ft-internal.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft-ops.cc b/storage/tokudb/ft-index/ft/ft-ops.cc
index b3c224afb7a..3de108e8c19 100644
--- a/storage/tokudb/ft-index/ft/ft-ops.cc
+++ b/storage/tokudb/ft-index/ft/ft-ops.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft-ops.h b/storage/tokudb/ft-index/ft/ft-ops.h
index c45e0c71ef5..5e1887291b4 100644
--- a/storage/tokudb/ft-index/ft/ft-ops.h
+++ b/storage/tokudb/ft-index/ft/ft-ops.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft-test-helpers.cc b/storage/tokudb/ft-index/ft/ft-test-helpers.cc
index 38be041a16d..54e37b9c916 100644
--- a/storage/tokudb/ft-index/ft/ft-test-helpers.cc
+++ b/storage/tokudb/ft-index/ft/ft-test-helpers.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft-verify.cc b/storage/tokudb/ft-index/ft/ft-verify.cc
index 0a85136816f..43d58e5ef83 100644
--- a/storage/tokudb/ft-index/ft/ft-verify.cc
+++ b/storage/tokudb/ft-index/ft/ft-verify.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft.cc b/storage/tokudb/ft-index/ft/ft.cc
index 77948dfe358..1c24fb9ee29 100644
--- a/storage/tokudb/ft-index/ft/ft.cc
+++ b/storage/tokudb/ft-index/ft/ft.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ft.h b/storage/tokudb/ft-index/ft/ft.h
index 336845475cc..7a49092549b 100644
--- a/storage/tokudb/ft-index/ft/ft.h
+++ b/storage/tokudb/ft-index/ft/ft.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/le-cursor.cc b/storage/tokudb/ft-index/ft/le-cursor.cc
index ac34b119245..17fe56d0405 100644
--- a/storage/tokudb/ft-index/ft/le-cursor.cc
+++ b/storage/tokudb/ft-index/ft/le-cursor.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/le-cursor.h b/storage/tokudb/ft-index/ft/le-cursor.h
index 2fc5e09bc2c..4f69b018824 100644
--- a/storage/tokudb/ft-index/ft/le-cursor.h
+++ b/storage/tokudb/ft-index/ft/le-cursor.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/leafentry.cc b/storage/tokudb/ft-index/ft/leafentry.cc
index 075f29fa191..42de0bf4eb2 100644
--- a/storage/tokudb/ft-index/ft/leafentry.cc
+++ b/storage/tokudb/ft-index/ft/leafentry.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/leafentry.h b/storage/tokudb/ft-index/ft/leafentry.h
index eddd49481fb..5e9d423b532 100644
--- a/storage/tokudb/ft-index/ft/leafentry.h
+++ b/storage/tokudb/ft-index/ft/leafentry.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/loader/callbacks.cc b/storage/tokudb/ft-index/ft/loader/callbacks.cc
index 40069c144f6..c737d1fac3a 100644
--- a/storage/tokudb/ft-index/ft/loader/callbacks.cc
+++ b/storage/tokudb/ft-index/ft/loader/callbacks.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/loader/dbufio.cc b/storage/tokudb/ft-index/ft/loader/dbufio.cc
index 3cf7d2412cd..461f8d74dd3 100644
--- a/storage/tokudb/ft-index/ft/loader/dbufio.cc
+++ b/storage/tokudb/ft-index/ft/loader/dbufio.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/loader/dbufio.h b/storage/tokudb/ft-index/ft/loader/dbufio.h
index da31f22277d..100dca7e580 100644
--- a/storage/tokudb/ft-index/ft/loader/dbufio.h
+++ b/storage/tokudb/ft-index/ft/loader/dbufio.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/loader/loader-internal.h b/storage/tokudb/ft-index/ft/loader/loader-internal.h
index ea1b9c5afa3..63c294cf39b 100644
--- a/storage/tokudb/ft-index/ft/loader/loader-internal.h
+++ b/storage/tokudb/ft-index/ft/loader/loader-internal.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/loader/loader.cc b/storage/tokudb/ft-index/ft/loader/loader.cc
index d83340f2e49..e655ec9388a 100644
--- a/storage/tokudb/ft-index/ft/loader/loader.cc
+++ b/storage/tokudb/ft-index/ft/loader/loader.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/loader/loader.h b/storage/tokudb/ft-index/ft/loader/loader.h
index 4ef45dea0ac..ccb64ea082a 100644
--- a/storage/tokudb/ft-index/ft/loader/loader.h
+++ b/storage/tokudb/ft-index/ft/loader/loader.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/loader/pqueue.cc b/storage/tokudb/ft-index/ft/loader/pqueue.cc
index 6c28b048543..62be3a59516 100644
--- a/storage/tokudb/ft-index/ft/loader/pqueue.cc
+++ b/storage/tokudb/ft-index/ft/loader/pqueue.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/loader/pqueue.h b/storage/tokudb/ft-index/ft/loader/pqueue.h
index 43df70e97ff..fa552331003 100644
--- a/storage/tokudb/ft-index/ft/loader/pqueue.h
+++ b/storage/tokudb/ft-index/ft/loader/pqueue.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/logger/log-internal.h b/storage/tokudb/ft-index/ft/logger/log-internal.h
index 5516cab30b6..ee30dd7d615 100644
--- a/storage/tokudb/ft-index/ft/logger/log-internal.h
+++ b/storage/tokudb/ft-index/ft/logger/log-internal.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/logger/log.h b/storage/tokudb/ft-index/ft/logger/log.h
index 180f118765b..43624e80c20 100644
--- a/storage/tokudb/ft-index/ft/logger/log.h
+++ b/storage/tokudb/ft-index/ft/logger/log.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/logger/log_upgrade.cc b/storage/tokudb/ft-index/ft/logger/log_upgrade.cc
index 0f2b3848e6e..2513f8a5065 100644
--- a/storage/tokudb/ft-index/ft/logger/log_upgrade.cc
+++ b/storage/tokudb/ft-index/ft/logger/log_upgrade.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/logger/logcursor.cc b/storage/tokudb/ft-index/ft/logger/logcursor.cc
index 3402cd28122..c6ccb4392eb 100644
--- a/storage/tokudb/ft-index/ft/logger/logcursor.cc
+++ b/storage/tokudb/ft-index/ft/logger/logcursor.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/logger/logcursor.h b/storage/tokudb/ft-index/ft/logger/logcursor.h
index 15774fb11d3..37f37c43139 100644
--- a/storage/tokudb/ft-index/ft/logger/logcursor.h
+++ b/storage/tokudb/ft-index/ft/logger/logcursor.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/logger/logfilemgr.cc b/storage/tokudb/ft-index/ft/logger/logfilemgr.cc
index 86bec09db3a..456c3cdcce6 100644
--- a/storage/tokudb/ft-index/ft/logger/logfilemgr.cc
+++ b/storage/tokudb/ft-index/ft/logger/logfilemgr.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/logger/logfilemgr.h b/storage/tokudb/ft-index/ft/logger/logfilemgr.h
index 70e59575127..447bd99393b 100644
--- a/storage/tokudb/ft-index/ft/logger/logfilemgr.h
+++ b/storage/tokudb/ft-index/ft/logger/logfilemgr.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/logger/logformat.cc b/storage/tokudb/ft-index/ft/logger/logformat.cc
index dbae9b09806..820c11d0621 100644
--- a/storage/tokudb/ft-index/ft/logger/logformat.cc
+++ b/storage/tokudb/ft-index/ft/logger/logformat.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/logger/logger.cc b/storage/tokudb/ft-index/ft/logger/logger.cc
index a07e5f84f37..26d6c3caf4b 100644
--- a/storage/tokudb/ft-index/ft/logger/logger.cc
+++ b/storage/tokudb/ft-index/ft/logger/logger.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/logger/logger.h b/storage/tokudb/ft-index/ft/logger/logger.h
index 83e6c9a7378..7d53ef07369 100644
--- a/storage/tokudb/ft-index/ft/logger/logger.h
+++ b/storage/tokudb/ft-index/ft/logger/logger.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/logger/recover.cc b/storage/tokudb/ft-index/ft/logger/recover.cc
index 7a5fa361e2d..8f9281c4ce6 100644
--- a/storage/tokudb/ft-index/ft/logger/recover.cc
+++ b/storage/tokudb/ft-index/ft/logger/recover.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/logger/recover.h b/storage/tokudb/ft-index/ft/logger/recover.h
index f08abc44200..9322df88825 100644
--- a/storage/tokudb/ft-index/ft/logger/recover.h
+++ b/storage/tokudb/ft-index/ft/logger/recover.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/msg.cc b/storage/tokudb/ft-index/ft/msg.cc
index 1fedbe745af..04cb277beb4 100644
--- a/storage/tokudb/ft-index/ft/msg.cc
+++ b/storage/tokudb/ft-index/ft/msg.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/msg.h b/storage/tokudb/ft-index/ft/msg.h
index 3a26f068399..bf3cfba1b39 100644
--- a/storage/tokudb/ft-index/ft/msg.h
+++ b/storage/tokudb/ft-index/ft/msg.h
@@ -31,7 +31,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/msg_buffer.cc b/storage/tokudb/ft-index/ft/msg_buffer.cc
index 3a72fdb7090..c8cbe223e78 100644
--- a/storage/tokudb/ft-index/ft/msg_buffer.cc
+++ b/storage/tokudb/ft-index/ft/msg_buffer.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/msg_buffer.h b/storage/tokudb/ft-index/ft/msg_buffer.h
index b63b4a354b2..cbed0eba8de 100644
--- a/storage/tokudb/ft-index/ft/msg_buffer.h
+++ b/storage/tokudb/ft-index/ft/msg_buffer.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/node.cc b/storage/tokudb/ft-index/ft/node.cc
index fcb4533bb80..c7d6358e352 100644
--- a/storage/tokudb/ft-index/ft/node.cc
+++ b/storage/tokudb/ft-index/ft/node.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/node.h b/storage/tokudb/ft-index/ft/node.h
index 7b1b4023d84..504c0538f15 100644
--- a/storage/tokudb/ft-index/ft/node.h
+++ b/storage/tokudb/ft-index/ft/node.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/pivotkeys.cc b/storage/tokudb/ft-index/ft/pivotkeys.cc
index 93d1abb2049..cb2cd314a2e 100644
--- a/storage/tokudb/ft-index/ft/pivotkeys.cc
+++ b/storage/tokudb/ft-index/ft/pivotkeys.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/block_allocator.cc b/storage/tokudb/ft-index/ft/serialize/block_allocator.cc
index 6af0ae82b05..64749ed1d47 100644
--- a/storage/tokudb/ft-index/ft/serialize/block_allocator.cc
+++ b/storage/tokudb/ft-index/ft/serialize/block_allocator.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/block_allocator.h b/storage/tokudb/ft-index/ft/serialize/block_allocator.h
index b50dadc9e56..19a188124f1 100644
--- a/storage/tokudb/ft-index/ft/serialize/block_allocator.h
+++ b/storage/tokudb/ft-index/ft/serialize/block_allocator.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/block_allocator_strategy.cc b/storage/tokudb/ft-index/ft/serialize/block_allocator_strategy.cc
index f896a41aaba..f0444e98f79 100644
--- a/storage/tokudb/ft-index/ft/serialize/block_allocator_strategy.cc
+++ b/storage/tokudb/ft-index/ft/serialize/block_allocator_strategy.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/block_allocator_strategy.h b/storage/tokudb/ft-index/ft/serialize/block_allocator_strategy.h
index 3b7c0bafe4e..c2ebb83cb09 100644
--- a/storage/tokudb/ft-index/ft/serialize/block_allocator_strategy.h
+++ b/storage/tokudb/ft-index/ft/serialize/block_allocator_strategy.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/block_table.cc b/storage/tokudb/ft-index/ft/serialize/block_table.cc
index 60c48251fd3..126c34da503 100644
--- a/storage/tokudb/ft-index/ft/serialize/block_table.cc
+++ b/storage/tokudb/ft-index/ft/serialize/block_table.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/block_table.h b/storage/tokudb/ft-index/ft/serialize/block_table.h
index 534befaf426..a629f3e756f 100644
--- a/storage/tokudb/ft-index/ft/serialize/block_table.h
+++ b/storage/tokudb/ft-index/ft/serialize/block_table.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/compress.cc b/storage/tokudb/ft-index/ft/serialize/compress.cc
index 6cd168cff23..047ce40fb68 100644
--- a/storage/tokudb/ft-index/ft/serialize/compress.cc
+++ b/storage/tokudb/ft-index/ft/serialize/compress.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/compress.h b/storage/tokudb/ft-index/ft/serialize/compress.h
index 8b3bb2185b6..1b4470da742 100644
--- a/storage/tokudb/ft-index/ft/serialize/compress.h
+++ b/storage/tokudb/ft-index/ft/serialize/compress.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/ft-node-deserialize.cc b/storage/tokudb/ft-index/ft/serialize/ft-node-deserialize.cc
index 211259ae50b..ca058aac905 100644
--- a/storage/tokudb/ft-index/ft/serialize/ft-node-deserialize.cc
+++ b/storage/tokudb/ft-index/ft/serialize/ft-node-deserialize.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/ft-serialize.cc b/storage/tokudb/ft-index/ft/serialize/ft-serialize.cc
index a31ea4f59a2..c4f3f720e21 100644
--- a/storage/tokudb/ft-index/ft/serialize/ft-serialize.cc
+++ b/storage/tokudb/ft-index/ft/serialize/ft-serialize.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/ft-serialize.h b/storage/tokudb/ft-index/ft/serialize/ft-serialize.h
index dc8bb68ae40..71319cc5d50 100644
--- a/storage/tokudb/ft-index/ft/serialize/ft-serialize.h
+++ b/storage/tokudb/ft-index/ft/serialize/ft-serialize.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/ft_layout_version.h b/storage/tokudb/ft-index/ft/serialize/ft_layout_version.h
index cf16d472355..97d2b694267 100644
--- a/storage/tokudb/ft-index/ft/serialize/ft_layout_version.h
+++ b/storage/tokudb/ft-index/ft/serialize/ft_layout_version.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/ft_node-serialize.cc b/storage/tokudb/ft-index/ft/serialize/ft_node-serialize.cc
index 84f3f98cfb5..6e1c1c13701 100644
--- a/storage/tokudb/ft-index/ft/serialize/ft_node-serialize.cc
+++ b/storage/tokudb/ft-index/ft/serialize/ft_node-serialize.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/ft_node-serialize.h b/storage/tokudb/ft-index/ft/serialize/ft_node-serialize.h
index 319e270dd58..cb978ea276c 100644
--- a/storage/tokudb/ft-index/ft/serialize/ft_node-serialize.h
+++ b/storage/tokudb/ft-index/ft/serialize/ft_node-serialize.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/quicklz.cc b/storage/tokudb/ft-index/ft/serialize/quicklz.cc
index 81f768ababf..b0a9cfa39f7 100644
--- a/storage/tokudb/ft-index/ft/serialize/quicklz.cc
+++ b/storage/tokudb/ft-index/ft/serialize/quicklz.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/quicklz.h b/storage/tokudb/ft-index/ft/serialize/quicklz.h
index 362a246994f..ee79718dad0 100644
--- a/storage/tokudb/ft-index/ft/serialize/quicklz.h
+++ b/storage/tokudb/ft-index/ft/serialize/quicklz.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/rbuf.h b/storage/tokudb/ft-index/ft/serialize/rbuf.h
index c72ea6b79db..8748f15b571 100644
--- a/storage/tokudb/ft-index/ft/serialize/rbuf.h
+++ b/storage/tokudb/ft-index/ft/serialize/rbuf.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/sub_block.cc b/storage/tokudb/ft-index/ft/serialize/sub_block.cc
index 0172d58a4ca..a65b735ed20 100644
--- a/storage/tokudb/ft-index/ft/serialize/sub_block.cc
+++ b/storage/tokudb/ft-index/ft/serialize/sub_block.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/sub_block.h b/storage/tokudb/ft-index/ft/serialize/sub_block.h
index 1a371c2dcd3..97213e0a82a 100644
--- a/storage/tokudb/ft-index/ft/serialize/sub_block.h
+++ b/storage/tokudb/ft-index/ft/serialize/sub_block.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/wbuf.h b/storage/tokudb/ft-index/ft/serialize/wbuf.h
index 8c71fb16b20..5aafb27dbf7 100644
--- a/storage/tokudb/ft-index/ft/serialize/wbuf.h
+++ b/storage/tokudb/ft-index/ft/serialize/wbuf.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/serialize/workset.h b/storage/tokudb/ft-index/ft/serialize/workset.h
index 4efa042b9c3..90dc868f622 100644
--- a/storage/tokudb/ft-index/ft/serialize/workset.h
+++ b/storage/tokudb/ft-index/ft/serialize/workset.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/benchmark-test.cc b/storage/tokudb/ft-index/ft/tests/benchmark-test.cc
index 0acb97daa87..cce2da06f9b 100644
--- a/storage/tokudb/ft-index/ft/tests/benchmark-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/benchmark-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/block_allocator_strategy_test.cc b/storage/tokudb/ft-index/ft/tests/block_allocator_strategy_test.cc
index 6879002a025..bae570330b1 100644
--- a/storage/tokudb/ft-index/ft/tests/block_allocator_strategy_test.cc
+++ b/storage/tokudb/ft-index/ft/tests/block_allocator_strategy_test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/block_allocator_test.cc b/storage/tokudb/ft-index/ft/tests/block_allocator_test.cc
index bbd170ebaab..b6729d351fa 100644
--- a/storage/tokudb/ft-index/ft/tests/block_allocator_test.cc
+++ b/storage/tokudb/ft-index/ft/tests/block_allocator_test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/bnc-insert-benchmark.cc b/storage/tokudb/ft-index/ft/tests/bnc-insert-benchmark.cc
index bd9f28c858f..c536f6ac929 100644
--- a/storage/tokudb/ft-index/ft/tests/bnc-insert-benchmark.cc
+++ b/storage/tokudb/ft-index/ft/tests/bnc-insert-benchmark.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-4357.cc b/storage/tokudb/ft-index/ft/tests/cachetable-4357.cc
index 0704914cc5b..209f6ea4390 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-4357.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-4357.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-4365.cc b/storage/tokudb/ft-index/ft/tests/cachetable-4365.cc
index 1c5a55bf120..7086efd6bc2 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-4365.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-4365.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-5097.cc b/storage/tokudb/ft-index/ft/tests/cachetable-5097.cc
index 5cef1f3c6d5..59e6990bb61 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-5097.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-5097.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-5978-2.cc b/storage/tokudb/ft-index/ft/tests/cachetable-5978-2.cc
index 427bc2c4a42..f8c289e6d7a 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-5978-2.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-5978-2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-5978.cc b/storage/tokudb/ft-index/ft/tests/cachetable-5978.cc
index 11613e5a204..8ae39199d19 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-5978.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-5978.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-all-write.cc b/storage/tokudb/ft-index/ft/tests/cachetable-all-write.cc
index b0ebd9ed5e9..da3a69359b4 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-all-write.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-all-write.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-pending.cc b/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-pending.cc
index 53570ec1f0a..d4928bd4a31 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-pending.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-pending.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-pinned-nodes.cc b/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-pinned-nodes.cc
index bacf48d01b1..9dbad392002 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-pinned-nodes.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-pinned-nodes.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-prefetched-nodes.cc b/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-prefetched-nodes.cc
index 510b2fb458c..dbaa0a14109 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-prefetched-nodes.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-prefetched-nodes.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-test.cc
index f1ea464d952..80bb6c10b5e 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-checkpointer-class.cc b/storage/tokudb/ft-index/ft/tests/cachetable-checkpointer-class.cc
index 6b138cd0bca..992ac53dec1 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-checkpointer-class.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-checkpointer-class.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-checkpoint.cc b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-checkpoint.cc
index 0b726f67306..d6f7ef9fb17 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-checkpoint.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-checkpoint2.cc b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-checkpoint2.cc
index b360d21c177..bceeb94d58e 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-checkpoint2.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-checkpoint2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-attrs-accumulate.cc b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-attrs-accumulate.cc
index 1b7f4825e17..a449d9d04a7 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-attrs-accumulate.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-attrs-accumulate.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-empty-cachetable.cc b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-empty-cachetable.cc
index 8c7de0ae914..a74c1eeaf87 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-empty-cachetable.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-empty-cachetable.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-everything-pinned.cc b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-everything-pinned.cc
index 8e5a3ea40fa..b97987b22ac 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-everything-pinned.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-everything-pinned.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-nothing-needs-flushing.cc b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-nothing-needs-flushing.cc
index 06107b7cefd..492cef1f8a6 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-nothing-needs-flushing.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-nothing-needs-flushing.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-same-fullhash.cc b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-same-fullhash.cc
index de1cb8b612a..e915e8e5988 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-same-fullhash.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-same-fullhash.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-simple.cc b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-simple.cc
index a50495774f3..8aa0309a958 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-simple.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-simple.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-clock-all-pinned.cc b/storage/tokudb/ft-index/ft/tests/cachetable-clock-all-pinned.cc
index 9eac1304fe2..866388b3ca6 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-clock-all-pinned.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-clock-all-pinned.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction.cc b/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction.cc
index ac18ce8ac32..7143e197802 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction2.cc b/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction2.cc
index 13b941ab054..02c980f36ad 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction2.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction3.cc b/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction3.cc
index 9f148af1d43..b48c347f692 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction3.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction4.cc b/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction4.cc
index e89319c90a9..67ceb48a34e 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction4.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction4.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-clone-checkpoint.cc b/storage/tokudb/ft-index/ft/tests/cachetable-clone-checkpoint.cc
index 1fc36e06927..67c777e7319 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-clone-checkpoint.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-clone-checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-clone-partial-fetch-pinned-node.cc b/storage/tokudb/ft-index/ft/tests/cachetable-clone-partial-fetch-pinned-node.cc
index d22478b8e38..6fb8135aa88 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-clone-partial-fetch-pinned-node.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-clone-partial-fetch-pinned-node.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-clone-partial-fetch.cc b/storage/tokudb/ft-index/ft/tests/cachetable-clone-partial-fetch.cc
index 92859cfac68..7aaba775514 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-clone-partial-fetch.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-clone-partial-fetch.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-clone-pin-nonblocking.cc b/storage/tokudb/ft-index/ft/tests/cachetable-clone-pin-nonblocking.cc
index d7cdbcc0854..2ef0028697e 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-clone-pin-nonblocking.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-clone-pin-nonblocking.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-clone-unpin-remove.cc b/storage/tokudb/ft-index/ft/tests/cachetable-clone-unpin-remove.cc
index f6cf0ec34c7..27668986340 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-clone-unpin-remove.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-clone-unpin-remove.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-count-pinned-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-count-pinned-test.cc
index 4dba635d22f..cc0a86acde4 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-count-pinned-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-count-pinned-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-debug-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-debug-test.cc
index fda1d0ae563..2ae2d9fdb99 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-debug-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-debug-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-eviction-close-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-eviction-close-test.cc
index da2ff48f2eb..3df502afcc7 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-eviction-close-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-eviction-close-test.cc
@@ -27,7 +27,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-eviction-close-test2.cc b/storage/tokudb/ft-index/ft/tests/cachetable-eviction-close-test2.cc
index d6ba0f3b136..df9aba5dc8c 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-eviction-close-test2.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-eviction-close-test2.cc
@@ -27,7 +27,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-eviction-getandpin-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-eviction-getandpin-test.cc
index 51540db5739..85bcb1268b0 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-eviction-getandpin-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-eviction-getandpin-test.cc
@@ -27,7 +27,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-eviction-getandpin-test2.cc b/storage/tokudb/ft-index/ft/tests/cachetable-eviction-getandpin-test2.cc
index 45c10bcc552..1ffe5f31eee 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-eviction-getandpin-test2.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-eviction-getandpin-test2.cc
@@ -27,7 +27,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-evictor-class.cc b/storage/tokudb/ft-index/ft/tests/cachetable-evictor-class.cc
index 12e463d61d8..98b444ccb97 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-evictor-class.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-evictor-class.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-fd-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-fd-test.cc
index 8ff6ee94fbe..b08890723e9 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-fd-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-fd-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-fetch-inducing-evictor.cc b/storage/tokudb/ft-index/ft/tests/cachetable-fetch-inducing-evictor.cc
index 089c34498b9..729f6c17c2a 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-fetch-inducing-evictor.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-fetch-inducing-evictor.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-flush-during-cleaner.cc b/storage/tokudb/ft-index/ft/tests/cachetable-flush-during-cleaner.cc
index 237671fe28f..207f175cf07 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-flush-during-cleaner.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-flush-during-cleaner.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-flush-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-flush-test.cc
index 2297364891b..c8792450f48 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-flush-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-flush-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-getandpin-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-getandpin-test.cc
index b3e4dfa1d9a..da7839d4358 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-getandpin-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-getandpin-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-kibbutz_and_flush_cachefile.cc b/storage/tokudb/ft-index/ft/tests/cachetable-kibbutz_and_flush_cachefile.cc
index b6f2a189e26..7e9d3ef2fc5 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-kibbutz_and_flush_cachefile.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-kibbutz_and_flush_cachefile.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-partial-fetch.cc b/storage/tokudb/ft-index/ft/tests/cachetable-partial-fetch.cc
index 043b35ab503..20360637604 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-partial-fetch.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-partial-fetch.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-pin-checkpoint.cc b/storage/tokudb/ft-index/ft/tests/cachetable-pin-checkpoint.cc
index 6916e974c3b..fe7b37bcadd 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-pin-checkpoint.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-pin-checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-pin-nonblocking-checkpoint-clean.cc b/storage/tokudb/ft-index/ft/tests/cachetable-pin-nonblocking-checkpoint-clean.cc
index ca9db5e6521..0cc074c9869 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-pin-nonblocking-checkpoint-clean.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-pin-nonblocking-checkpoint-clean.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-checkpoint-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-checkpoint-test.cc
index 65465339f0e..27c6045c666 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-checkpoint-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-checkpoint-test.cc
@@ -28,7 +28,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-close-leak-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-close-leak-test.cc
index e817c8aa65e..ef41ea945cd 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-close-leak-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-close-leak-test.cc
@@ -27,7 +27,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-close-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-close-test.cc
index e8d08c86aa1..fd35e118fc9 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-close-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-close-test.cc
@@ -27,7 +27,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-flowcontrol-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-flowcontrol-test.cc
index 8736b6a4065..dc97da6cda2 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-flowcontrol-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-flowcontrol-test.cc
@@ -28,7 +28,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-getandpin-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-getandpin-test.cc
index 4ba6dff51a9..929fd869bf9 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-getandpin-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-getandpin-test.cc
@@ -27,7 +27,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-maybegetandpin-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-maybegetandpin-test.cc
index 0540ab5429b..3cf759f560a 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-maybegetandpin-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch-maybegetandpin-test.cc
@@ -27,7 +27,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch2-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch2-test.cc
index f7d348eaa3b..b725e124a08 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-prefetch2-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-prefetch2-test.cc
@@ -28,7 +28,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-put-checkpoint.cc b/storage/tokudb/ft-index/ft/tests/cachetable-put-checkpoint.cc
index 0b316aa528f..940315b573e 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-put-checkpoint.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-put-checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-put-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-put-test.cc
index 07765bd666e..e5f30d2313e 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-put-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-put-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-rwlock-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-rwlock-test.cc
index 7e5fb4a00bb..4312757ccb7 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-rwlock-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-rwlock-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-clone.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-clone.cc
index 3944182084c..07d8ae5026f 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-clone.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-clone.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-clone2.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-clone2.cc
index 177905e6721..83a9c769c49 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-clone2.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-clone2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-close.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-close.cc
index 7a7518b78f5..906c6ca5b42 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-close.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-close.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-maybe-get-pin.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-maybe-get-pin.cc
index 891b70fd7d1..6970128615b 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-maybe-get-pin.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-maybe-get-pin.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-cheap.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-cheap.cc
index 70e7a936a26..3a190bd63db 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-cheap.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-cheap.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-dep-nodes.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-dep-nodes.cc
index 8a87f006f6b..95c6ed64ec6 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-dep-nodes.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-dep-nodes.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-nonblocking-cheap.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-nonblocking-cheap.cc
index e1050b2da7f..55941bf829e 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-nonblocking-cheap.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-nonblocking-cheap.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-nonblocking.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-nonblocking.cc
index 33319b7a368..f21573f0cb4 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-nonblocking.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-nonblocking.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin.cc
index b90b01bfd6c..454a1092dda 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-pin.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-put-dep-nodes.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-put-dep-nodes.cc
index eaeee0bb4db..57f4935a82f 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-put-dep-nodes.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-put-dep-nodes.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-read-pin-nonblocking.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-read-pin-nonblocking.cc
index aeb6437f670..b488bae97d9 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-read-pin-nonblocking.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-read-pin-nonblocking.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-read-pin.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-read-pin.cc
index 5f0b6eff445..90b225365d9 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-read-pin.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-read-pin.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-unpin-remove-checkpoint.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-unpin-remove-checkpoint.cc
index 45d66073930..a22d623d67a 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-unpin-remove-checkpoint.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-unpin-remove-checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-simple-verify.cc b/storage/tokudb/ft-index/ft/tests/cachetable-simple-verify.cc
index f38eb2214b6..d26be775cb9 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-simple-verify.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-simple-verify.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-test.cc
index a040943007a..a9f67080584 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-test.h b/storage/tokudb/ft-index/ft/tests/cachetable-test.h
index 6d27a9b71bb..8a63f36c2f9 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-test.h
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-test.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-unpin-and-remove-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-unpin-and-remove-test.cc
index 9063cdc2bcc..7cb0f813fae 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-unpin-and-remove-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-unpin-and-remove-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-unpin-remove-and-checkpoint.cc b/storage/tokudb/ft-index/ft/tests/cachetable-unpin-remove-and-checkpoint.cc
index 406df310de5..90d9400101e 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-unpin-remove-and-checkpoint.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-unpin-remove-and-checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-unpin-test.cc b/storage/tokudb/ft-index/ft/tests/cachetable-unpin-test.cc
index 1d8c2b03abc..61432229fec 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-unpin-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-unpin-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-writer-thread-limit.cc b/storage/tokudb/ft-index/ft/tests/cachetable-writer-thread-limit.cc
index 92f5a1906f6..20b9d9caf95 100644
--- a/storage/tokudb/ft-index/ft/tests/cachetable-writer-thread-limit.cc
+++ b/storage/tokudb/ft-index/ft/tests/cachetable-writer-thread-limit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/comparator-test.cc b/storage/tokudb/ft-index/ft/tests/comparator-test.cc
index 0ac3bd569cc..61cf7522315 100644
--- a/storage/tokudb/ft-index/ft/tests/comparator-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/comparator-test.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/compress-test.cc b/storage/tokudb/ft-index/ft/tests/compress-test.cc
index 7f7a97274c8..226d4b806ff 100644
--- a/storage/tokudb/ft-index/ft/tests/compress-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/compress-test.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/dbufio-test-destroy.cc b/storage/tokudb/ft-index/ft/tests/dbufio-test-destroy.cc
index c9984879a86..5f7347fdaac 100644
--- a/storage/tokudb/ft-index/ft/tests/dbufio-test-destroy.cc
+++ b/storage/tokudb/ft-index/ft/tests/dbufio-test-destroy.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/dbufio-test.cc b/storage/tokudb/ft-index/ft/tests/dbufio-test.cc
index 6f562d8ac85..7d4d7dea577 100644
--- a/storage/tokudb/ft-index/ft/tests/dbufio-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/dbufio-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/dmt-test.cc b/storage/tokudb/ft-index/ft/tests/dmt-test.cc
index adc759a3c4b..eed8c1017ef 100644
--- a/storage/tokudb/ft-index/ft/tests/dmt-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/dmt-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/dmt-test2.cc b/storage/tokudb/ft-index/ft/tests/dmt-test2.cc
index 707ad9a5a7e..580d2400bfb 100644
--- a/storage/tokudb/ft-index/ft/tests/dmt-test2.cc
+++ b/storage/tokudb/ft-index/ft/tests/dmt-test2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/fifo-test.cc b/storage/tokudb/ft-index/ft/tests/fifo-test.cc
index 30815160684..b4f56993e39 100644
--- a/storage/tokudb/ft-index/ft/tests/fifo-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/fifo-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-bfe-query.cc b/storage/tokudb/ft-index/ft/tests/ft-bfe-query.cc
index d91ae001884..49a4131f71d 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-bfe-query.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-bfe-query.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-clock-test.cc b/storage/tokudb/ft-index/ft/tests/ft-clock-test.cc
index 50bb6d67ca5..39cbb6d26a9 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-clock-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-clock-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-serialize-benchmark.cc b/storage/tokudb/ft-index/ft/tests/ft-serialize-benchmark.cc
index 82b96742ceb..153b22f9f5a 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-serialize-benchmark.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-serialize-benchmark.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-serialize-sub-block-test.cc b/storage/tokudb/ft-index/ft/tests/ft-serialize-sub-block-test.cc
index f0be59a811c..591c8941df2 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-serialize-sub-block-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-serialize-sub-block-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-serialize-test.cc b/storage/tokudb/ft-index/ft/tests/ft-serialize-test.cc
index 266cf50f8ce..8cc96a32076 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-serialize-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-serialize-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-test-cursor-2.cc b/storage/tokudb/ft-index/ft/tests/ft-test-cursor-2.cc
index 6e38884d571..a466eb5b5f5 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-test-cursor-2.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-test-cursor-2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-test-cursor.cc b/storage/tokudb/ft-index/ft/tests/ft-test-cursor.cc
index 3e7aa6875e0..70722a64684 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-test-cursor.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-test-cursor.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-test-header.cc b/storage/tokudb/ft-index/ft/tests/ft-test-header.cc
index 18da9502b48..1f9e05be315 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-test-header.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-test-header.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-test.cc b/storage/tokudb/ft-index/ft/tests/ft-test.cc
index e9981c92572..f87fe28661e 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-test0.cc b/storage/tokudb/ft-index/ft/tests/ft-test0.cc
index 719bfd35588..e0051652360 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-test0.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-test0.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-test1.cc b/storage/tokudb/ft-index/ft/tests/ft-test1.cc
index 5ab4b779403..00a7141c8c7 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-test1.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-test1.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-test2.cc b/storage/tokudb/ft-index/ft/tests/ft-test2.cc
index ccd94a74ade..72692805d0d 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-test2.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-test2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-test3.cc b/storage/tokudb/ft-index/ft/tests/ft-test3.cc
index 4b57eb8e323..39543dd315a 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-test3.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-test3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-test4.cc b/storage/tokudb/ft-index/ft/tests/ft-test4.cc
index 945d05f0a17..efe8777ab10 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-test4.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-test4.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ft-test5.cc b/storage/tokudb/ft-index/ft/tests/ft-test5.cc
index 8144754b12d..3655cb7ac7c 100644
--- a/storage/tokudb/ft-index/ft/tests/ft-test5.cc
+++ b/storage/tokudb/ft-index/ft/tests/ft-test5.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ftloader-error-injector.h b/storage/tokudb/ft-index/ft/tests/ftloader-error-injector.h
index d0d4cc87c88..0214d778079 100644
--- a/storage/tokudb/ft-index/ft/tests/ftloader-error-injector.h
+++ b/storage/tokudb/ft-index/ft/tests/ftloader-error-injector.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ftloader-test-bad-generate.cc b/storage/tokudb/ft-index/ft/tests/ftloader-test-bad-generate.cc
index 3cc574b759a..49a94031e4f 100644
--- a/storage/tokudb/ft-index/ft/tests/ftloader-test-bad-generate.cc
+++ b/storage/tokudb/ft-index/ft/tests/ftloader-test-bad-generate.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ftloader-test-extractor-errors.cc b/storage/tokudb/ft-index/ft/tests/ftloader-test-extractor-errors.cc
index 4418e475bac..20c7e48cb9d 100644
--- a/storage/tokudb/ft-index/ft/tests/ftloader-test-extractor-errors.cc
+++ b/storage/tokudb/ft-index/ft/tests/ftloader-test-extractor-errors.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ftloader-test-extractor.cc b/storage/tokudb/ft-index/ft/tests/ftloader-test-extractor.cc
index b20dd2fb2c3..200170e2ba0 100644
--- a/storage/tokudb/ft-index/ft/tests/ftloader-test-extractor.cc
+++ b/storage/tokudb/ft-index/ft/tests/ftloader-test-extractor.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ftloader-test-merge-files-dbufio.cc b/storage/tokudb/ft-index/ft/tests/ftloader-test-merge-files-dbufio.cc
index d450bd00923..3e0bfd3b3dd 100644
--- a/storage/tokudb/ft-index/ft/tests/ftloader-test-merge-files-dbufio.cc
+++ b/storage/tokudb/ft-index/ft/tests/ftloader-test-merge-files-dbufio.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ftloader-test-open.cc b/storage/tokudb/ft-index/ft/tests/ftloader-test-open.cc
index 5c4b689a824..8e169953cfb 100644
--- a/storage/tokudb/ft-index/ft/tests/ftloader-test-open.cc
+++ b/storage/tokudb/ft-index/ft/tests/ftloader-test-open.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ftloader-test-vm.cc b/storage/tokudb/ft-index/ft/tests/ftloader-test-vm.cc
index 9dd7ffec027..887ae9b261b 100644
--- a/storage/tokudb/ft-index/ft/tests/ftloader-test-vm.cc
+++ b/storage/tokudb/ft-index/ft/tests/ftloader-test-vm.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ftloader-test-writer-errors.cc b/storage/tokudb/ft-index/ft/tests/ftloader-test-writer-errors.cc
index d2669aee72a..d57f16237a7 100644
--- a/storage/tokudb/ft-index/ft/tests/ftloader-test-writer-errors.cc
+++ b/storage/tokudb/ft-index/ft/tests/ftloader-test-writer-errors.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ftloader-test-writer.cc b/storage/tokudb/ft-index/ft/tests/ftloader-test-writer.cc
index e57b800adad..ceffaba728b 100644
--- a/storage/tokudb/ft-index/ft/tests/ftloader-test-writer.cc
+++ b/storage/tokudb/ft-index/ft/tests/ftloader-test-writer.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ftloader-test.cc b/storage/tokudb/ft-index/ft/tests/ftloader-test.cc
index 46271eeb451..880809b05e6 100644
--- a/storage/tokudb/ft-index/ft/tests/ftloader-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/ftloader-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/generate-upgrade-recovery-logs.cc b/storage/tokudb/ft-index/ft/tests/generate-upgrade-recovery-logs.cc
index b221e6a4fc5..763b68ab591 100644
--- a/storage/tokudb/ft-index/ft/tests/generate-upgrade-recovery-logs.cc
+++ b/storage/tokudb/ft-index/ft/tests/generate-upgrade-recovery-logs.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/is_empty.cc b/storage/tokudb/ft-index/ft/tests/is_empty.cc
index b415343fba1..57bf2d5fe3b 100644
--- a/storage/tokudb/ft-index/ft/tests/is_empty.cc
+++ b/storage/tokudb/ft-index/ft/tests/is_empty.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/keyrange.cc b/storage/tokudb/ft-index/ft/tests/keyrange.cc
index 6c191adf890..bb912a1dfe4 100644
--- a/storage/tokudb/ft-index/ft/tests/keyrange.cc
+++ b/storage/tokudb/ft-index/ft/tests/keyrange.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/keytest.cc b/storage/tokudb/ft-index/ft/tests/keytest.cc
index bde2a4ca9ca..e4423241469 100644
--- a/storage/tokudb/ft-index/ft/tests/keytest.cc
+++ b/storage/tokudb/ft-index/ft/tests/keytest.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/le-cursor-provdel.cc b/storage/tokudb/ft-index/ft/tests/le-cursor-provdel.cc
index 33729527ca1..e86ed1f9534 100644
--- a/storage/tokudb/ft-index/ft/tests/le-cursor-provdel.cc
+++ b/storage/tokudb/ft-index/ft/tests/le-cursor-provdel.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/le-cursor-right.cc b/storage/tokudb/ft-index/ft/tests/le-cursor-right.cc
index 1c6ac9eab5c..c02a745930b 100644
--- a/storage/tokudb/ft-index/ft/tests/le-cursor-right.cc
+++ b/storage/tokudb/ft-index/ft/tests/le-cursor-right.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/le-cursor-walk.cc b/storage/tokudb/ft-index/ft/tests/le-cursor-walk.cc
index af26228ddfe..92563569c29 100644
--- a/storage/tokudb/ft-index/ft/tests/le-cursor-walk.cc
+++ b/storage/tokudb/ft-index/ft/tests/le-cursor-walk.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/list-test.cc b/storage/tokudb/ft-index/ft/tests/list-test.cc
index c7286048e24..717f01151a1 100644
--- a/storage/tokudb/ft-index/ft/tests/list-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/list-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/log-test-maybe-trim.cc b/storage/tokudb/ft-index/ft/tests/log-test-maybe-trim.cc
index 2e12fa81579..92e0c21d63d 100644
--- a/storage/tokudb/ft-index/ft/tests/log-test-maybe-trim.cc
+++ b/storage/tokudb/ft-index/ft/tests/log-test-maybe-trim.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/log-test.cc b/storage/tokudb/ft-index/ft/tests/log-test.cc
index c21e43641d5..1a25a54ae1a 100644
--- a/storage/tokudb/ft-index/ft/tests/log-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/log-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/log-test2.cc b/storage/tokudb/ft-index/ft/tests/log-test2.cc
index eafdd26d08b..4254cf0279f 100644
--- a/storage/tokudb/ft-index/ft/tests/log-test2.cc
+++ b/storage/tokudb/ft-index/ft/tests/log-test2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/log-test3.cc b/storage/tokudb/ft-index/ft/tests/log-test3.cc
index e9bb72fdfb0..30dbdfa7218 100644
--- a/storage/tokudb/ft-index/ft/tests/log-test3.cc
+++ b/storage/tokudb/ft-index/ft/tests/log-test3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/log-test4.cc b/storage/tokudb/ft-index/ft/tests/log-test4.cc
index c4e92fe2fcc..80d48ad4db0 100644
--- a/storage/tokudb/ft-index/ft/tests/log-test4.cc
+++ b/storage/tokudb/ft-index/ft/tests/log-test4.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/log-test5.cc b/storage/tokudb/ft-index/ft/tests/log-test5.cc
index bbe24640d7e..588ebe812a2 100644
--- a/storage/tokudb/ft-index/ft/tests/log-test5.cc
+++ b/storage/tokudb/ft-index/ft/tests/log-test5.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/log-test6.cc b/storage/tokudb/ft-index/ft/tests/log-test6.cc
index 5e2ff52ea75..e120fe96c4e 100644
--- a/storage/tokudb/ft-index/ft/tests/log-test6.cc
+++ b/storage/tokudb/ft-index/ft/tests/log-test6.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/log-test7.cc b/storage/tokudb/ft-index/ft/tests/log-test7.cc
index d6ac8bd688f..a7e132d48f1 100644
--- a/storage/tokudb/ft-index/ft/tests/log-test7.cc
+++ b/storage/tokudb/ft-index/ft/tests/log-test7.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/logcursor-bad-checksum.cc b/storage/tokudb/ft-index/ft/tests/logcursor-bad-checksum.cc
index d9dc5ce04df..9d34611a5ee 100644
--- a/storage/tokudb/ft-index/ft/tests/logcursor-bad-checksum.cc
+++ b/storage/tokudb/ft-index/ft/tests/logcursor-bad-checksum.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/logcursor-bw.cc b/storage/tokudb/ft-index/ft/tests/logcursor-bw.cc
index 3d5a0d32f62..27393a77c27 100644
--- a/storage/tokudb/ft-index/ft/tests/logcursor-bw.cc
+++ b/storage/tokudb/ft-index/ft/tests/logcursor-bw.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/logcursor-empty-logdir.cc b/storage/tokudb/ft-index/ft/tests/logcursor-empty-logdir.cc
index cdce3881605..017a7ad5bcc 100644
--- a/storage/tokudb/ft-index/ft/tests/logcursor-empty-logdir.cc
+++ b/storage/tokudb/ft-index/ft/tests/logcursor-empty-logdir.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile-2.cc b/storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile-2.cc
index 665623788af..4520bbe0fb3 100644
--- a/storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile-2.cc
+++ b/storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile-2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile-3.cc b/storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile-3.cc
index 12bf4ba4859..d33ba436ad1 100644
--- a/storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile-3.cc
+++ b/storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile-3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile.cc b/storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile.cc
index 0cc4bd34285..d26cc990060 100644
--- a/storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile.cc
+++ b/storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/logcursor-fw.cc b/storage/tokudb/ft-index/ft/tests/logcursor-fw.cc
index 9f0510c6118..ec8711b18c9 100644
--- a/storage/tokudb/ft-index/ft/tests/logcursor-fw.cc
+++ b/storage/tokudb/ft-index/ft/tests/logcursor-fw.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/logcursor-print.cc b/storage/tokudb/ft-index/ft/tests/logcursor-print.cc
index 902dc494a66..5abd9782f1f 100644
--- a/storage/tokudb/ft-index/ft/tests/logcursor-print.cc
+++ b/storage/tokudb/ft-index/ft/tests/logcursor-print.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/logcursor-timestamp.cc b/storage/tokudb/ft-index/ft/tests/logcursor-timestamp.cc
index a329cb49d3d..06386f4a5c4 100644
--- a/storage/tokudb/ft-index/ft/tests/logcursor-timestamp.cc
+++ b/storage/tokudb/ft-index/ft/tests/logcursor-timestamp.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/logfilemgr-create-destroy.cc b/storage/tokudb/ft-index/ft/tests/logfilemgr-create-destroy.cc
index c7a06d90d41..acf1d8f0558 100644
--- a/storage/tokudb/ft-index/ft/tests/logfilemgr-create-destroy.cc
+++ b/storage/tokudb/ft-index/ft/tests/logfilemgr-create-destroy.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/logfilemgr-print.cc b/storage/tokudb/ft-index/ft/tests/logfilemgr-print.cc
index 6a50cd3f091..1822848b55a 100644
--- a/storage/tokudb/ft-index/ft/tests/logfilemgr-print.cc
+++ b/storage/tokudb/ft-index/ft/tests/logfilemgr-print.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/make-tree.cc b/storage/tokudb/ft-index/ft/tests/make-tree.cc
index 51a4b66618a..9852cd3c305 100644
--- a/storage/tokudb/ft-index/ft/tests/make-tree.cc
+++ b/storage/tokudb/ft-index/ft/tests/make-tree.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/mempool-115.cc b/storage/tokudb/ft-index/ft/tests/mempool-115.cc
index 11960aa4ef2..f75e5137130 100644
--- a/storage/tokudb/ft-index/ft/tests/mempool-115.cc
+++ b/storage/tokudb/ft-index/ft/tests/mempool-115.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/msnfilter.cc b/storage/tokudb/ft-index/ft/tests/msnfilter.cc
index 41615028168..dee8ff45129 100644
--- a/storage/tokudb/ft-index/ft/tests/msnfilter.cc
+++ b/storage/tokudb/ft-index/ft/tests/msnfilter.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/orthopush-flush.cc b/storage/tokudb/ft-index/ft/tests/orthopush-flush.cc
index 749729838e3..0306b8d346c 100644
--- a/storage/tokudb/ft-index/ft/tests/orthopush-flush.cc
+++ b/storage/tokudb/ft-index/ft/tests/orthopush-flush.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/pqueue-test.cc b/storage/tokudb/ft-index/ft/tests/pqueue-test.cc
index a10fcd77483..43848604e72 100644
--- a/storage/tokudb/ft-index/ft/tests/pqueue-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/pqueue-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/quicklz-test.cc b/storage/tokudb/ft-index/ft/tests/quicklz-test.cc
index 2c8b88440f9..5d9cca06c27 100644
--- a/storage/tokudb/ft-index/ft/tests/quicklz-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/quicklz-test.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-bad-last-entry.cc b/storage/tokudb/ft-index/ft/tests/recovery-bad-last-entry.cc
index 80d0f295465..dc2a28aecfc 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-bad-last-entry.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-bad-last-entry.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-cbegin-cend-hello.cc b/storage/tokudb/ft-index/ft/tests/recovery-cbegin-cend-hello.cc
index 6686ba61f64..0d6181a458f 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-cbegin-cend-hello.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-cbegin-cend-hello.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-cbegin-cend.cc b/storage/tokudb/ft-index/ft/tests/recovery-cbegin-cend.cc
index ef953923813..742f10adf2f 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-cbegin-cend.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-cbegin-cend.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-cbegin.cc b/storage/tokudb/ft-index/ft/tests/recovery-cbegin.cc
index 54d69d2a605..6d2893cfcc5 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-cbegin.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-cbegin.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-cend-cbegin.cc b/storage/tokudb/ft-index/ft/tests/recovery-cend-cbegin.cc
index d03b95fd9f7..d1f8a87ba9e 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-cend-cbegin.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-cend-cbegin.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-datadir-is-file.cc b/storage/tokudb/ft-index/ft/tests/recovery-datadir-is-file.cc
index 5df3b6bdca4..7d420361916 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-datadir-is-file.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-datadir-is-file.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-empty.cc b/storage/tokudb/ft-index/ft/tests/recovery-empty.cc
index 37acb97e82b..92a65868788 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-empty.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-empty.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-fopen-missing-file.cc b/storage/tokudb/ft-index/ft/tests/recovery-fopen-missing-file.cc
index 7590ea162bb..e753b7c9d8e 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-fopen-missing-file.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-fopen-missing-file.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-hello.cc b/storage/tokudb/ft-index/ft/tests/recovery-hello.cc
index 36126c576af..46523e9f269 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-hello.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-hello.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-lsn-error-during-forward-scan.cc b/storage/tokudb/ft-index/ft/tests/recovery-lsn-error-during-forward-scan.cc
index f21c307ccf5..f61633a8be7 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-lsn-error-during-forward-scan.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-lsn-error-during-forward-scan.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-no-datadir.cc b/storage/tokudb/ft-index/ft/tests/recovery-no-datadir.cc
index b79ea03bca5..8c99d072b86 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-no-datadir.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-no-datadir.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-no-log.cc b/storage/tokudb/ft-index/ft/tests/recovery-no-log.cc
index a2fd7b2e010..90d09ef48d0 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-no-log.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-no-log.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-no-logdir.cc b/storage/tokudb/ft-index/ft/tests/recovery-no-logdir.cc
index 3e889b665a6..d5c744800a3 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-no-logdir.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-no-logdir.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/recovery-test5123.cc b/storage/tokudb/ft-index/ft/tests/recovery-test5123.cc
index 955a842e6e9..158a9aaf2c1 100644
--- a/storage/tokudb/ft-index/ft/tests/recovery-test5123.cc
+++ b/storage/tokudb/ft-index/ft/tests/recovery-test5123.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/shortcut.cc b/storage/tokudb/ft-index/ft/tests/shortcut.cc
index fc08868ccf0..0f2db8cc807 100644
--- a/storage/tokudb/ft-index/ft/tests/shortcut.cc
+++ b/storage/tokudb/ft-index/ft/tests/shortcut.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/subblock-test-checksum.cc b/storage/tokudb/ft-index/ft/tests/subblock-test-checksum.cc
index 0ba9e88ee83..58dff99177f 100644
--- a/storage/tokudb/ft-index/ft/tests/subblock-test-checksum.cc
+++ b/storage/tokudb/ft-index/ft/tests/subblock-test-checksum.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/subblock-test-compression.cc b/storage/tokudb/ft-index/ft/tests/subblock-test-compression.cc
index ba3ab4113f4..a838351fda0 100644
--- a/storage/tokudb/ft-index/ft/tests/subblock-test-compression.cc
+++ b/storage/tokudb/ft-index/ft/tests/subblock-test-compression.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/subblock-test-index.cc b/storage/tokudb/ft-index/ft/tests/subblock-test-index.cc
index d6e035af6d3..efbc5d7c35f 100644
--- a/storage/tokudb/ft-index/ft/tests/subblock-test-index.cc
+++ b/storage/tokudb/ft-index/ft/tests/subblock-test-index.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/subblock-test-size.cc b/storage/tokudb/ft-index/ft/tests/subblock-test-size.cc
index e21b15f33d2..b4a7566afe5 100644
--- a/storage/tokudb/ft-index/ft/tests/subblock-test-size.cc
+++ b/storage/tokudb/ft-index/ft/tests/subblock-test-size.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-assert.cc b/storage/tokudb/ft-index/ft/tests/test-assert.cc
index f6221c2d152..b56d4b5f96e 100644
--- a/storage/tokudb/ft-index/ft/tests/test-assert.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-assert.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-bjm.cc b/storage/tokudb/ft-index/ft/tests/test-bjm.cc
index 4969f8c4a8b..e1da7bd5d3f 100644
--- a/storage/tokudb/ft-index/ft/tests/test-bjm.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-bjm.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-flush.cc b/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-flush.cc
index 22fbf37d500..3c625a2a990 100644
--- a/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-flush.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-flush.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-merge.cc b/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-merge.cc
index 0ad417f2712..1b766735929 100644
--- a/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-merge.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-merge.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-rebalance.cc b/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-rebalance.cc
index 7870cd2fa58..94f848c00f6 100644
--- a/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-rebalance.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-rebalance.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-split.cc b/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-split.cc
index 8e24ae2bb43..4d1459e82e7 100644
--- a/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-split.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-checkpoint-during-split.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-del-inorder.cc b/storage/tokudb/ft-index/ft/tests/test-del-inorder.cc
index 75a1c255bd9..b31761ae95e 100644
--- a/storage/tokudb/ft-index/ft/tests/test-del-inorder.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-del-inorder.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-dirty-flushes-on-cleaner.cc b/storage/tokudb/ft-index/ft/tests/test-dirty-flushes-on-cleaner.cc
index a88c07c0ca1..6296437b5d4 100644
--- a/storage/tokudb/ft-index/ft/tests/test-dirty-flushes-on-cleaner.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-dirty-flushes-on-cleaner.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-dump-ft.cc b/storage/tokudb/ft-index/ft/tests/test-dump-ft.cc
index f1c76d0bd13..fd9ac9f26dd 100644
--- a/storage/tokudb/ft-index/ft/tests/test-dump-ft.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-dump-ft.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-flushes-on-cleaner.cc b/storage/tokudb/ft-index/ft/tests/test-flushes-on-cleaner.cc
index fa00100d3ed..c323810c0e0 100644
--- a/storage/tokudb/ft-index/ft/tests/test-flushes-on-cleaner.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-flushes-on-cleaner.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-ft-overflow.cc b/storage/tokudb/ft-index/ft/tests/test-ft-overflow.cc
index d8e51b5ab7c..542aa305cc4 100644
--- a/storage/tokudb/ft-index/ft/tests/test-ft-overflow.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-ft-overflow.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-ft-txns.h b/storage/tokudb/ft-index/ft/tests/test-ft-txns.h
index 04b2cfdf8bf..cbe614ec44a 100644
--- a/storage/tokudb/ft-index/ft/tests/test-ft-txns.h
+++ b/storage/tokudb/ft-index/ft/tests/test-ft-txns.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-hot-with-bounds.cc b/storage/tokudb/ft-index/ft/tests/test-hot-with-bounds.cc
index 419cbd2cb51..bede6d41b98 100644
--- a/storage/tokudb/ft-index/ft/tests/test-hot-with-bounds.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-hot-with-bounds.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-inc-split.cc b/storage/tokudb/ft-index/ft/tests/test-inc-split.cc
index 13510855cb0..a1c9e2ef6f6 100644
--- a/storage/tokudb/ft-index/ft/tests/test-inc-split.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-inc-split.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-leafentry-child-txn.cc b/storage/tokudb/ft-index/ft/tests/test-leafentry-child-txn.cc
index 30dd15d3e39..e3cde10a439 100644
--- a/storage/tokudb/ft-index/ft/tests/test-leafentry-child-txn.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-leafentry-child-txn.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-leafentry-nested.cc b/storage/tokudb/ft-index/ft/tests/test-leafentry-nested.cc
index 9253ff814c9..c60989097d2 100644
--- a/storage/tokudb/ft-index/ft/tests/test-leafentry-nested.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-leafentry-nested.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-merges-on-cleaner.cc b/storage/tokudb/ft-index/ft/tests/test-merges-on-cleaner.cc
index f67cfa78734..191bdf15f51 100644
--- a/storage/tokudb/ft-index/ft/tests/test-merges-on-cleaner.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-merges-on-cleaner.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-oldest-referenced-xid-flush.cc b/storage/tokudb/ft-index/ft/tests/test-oldest-referenced-xid-flush.cc
index fc642eab8df..47f1568b5a1 100644
--- a/storage/tokudb/ft-index/ft/tests/test-oldest-referenced-xid-flush.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-oldest-referenced-xid-flush.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-pick-child-to-flush.cc b/storage/tokudb/ft-index/ft/tests/test-pick-child-to-flush.cc
index d2fe0ef9469..bdf6c3ea2ff 100644
--- a/storage/tokudb/ft-index/ft/tests/test-pick-child-to-flush.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-pick-child-to-flush.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-txn-child-manager.cc b/storage/tokudb/ft-index/ft/tests/test-txn-child-manager.cc
index 8a67df8aa97..6664ab7e173 100644
--- a/storage/tokudb/ft-index/ft/tests/test-txn-child-manager.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-txn-child-manager.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test-upgrade-recovery-logs.cc b/storage/tokudb/ft-index/ft/tests/test-upgrade-recovery-logs.cc
index 528e7889599..9c783379a7f 100644
--- a/storage/tokudb/ft-index/ft/tests/test-upgrade-recovery-logs.cc
+++ b/storage/tokudb/ft-index/ft/tests/test-upgrade-recovery-logs.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test.h b/storage/tokudb/ft-index/ft/tests/test.h
index 3170146a120..75597b320cc 100644
--- a/storage/tokudb/ft-index/ft/tests/test.h
+++ b/storage/tokudb/ft-index/ft/tests/test.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test1308a.cc b/storage/tokudb/ft-index/ft/tests/test1308a.cc
index ddbc43de7dc..f4ffad63e68 100644
--- a/storage/tokudb/ft-index/ft/tests/test1308a.cc
+++ b/storage/tokudb/ft-index/ft/tests/test1308a.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test3681.cc b/storage/tokudb/ft-index/ft/tests/test3681.cc
index db5e8232cd4..37cfd2d5678 100644
--- a/storage/tokudb/ft-index/ft/tests/test3681.cc
+++ b/storage/tokudb/ft-index/ft/tests/test3681.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test3856.cc b/storage/tokudb/ft-index/ft/tests/test3856.cc
index c0b693e3421..40113408a77 100644
--- a/storage/tokudb/ft-index/ft/tests/test3856.cc
+++ b/storage/tokudb/ft-index/ft/tests/test3856.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test3884.cc b/storage/tokudb/ft-index/ft/tests/test3884.cc
index a4a9e8568cf..9e704bf198d 100644
--- a/storage/tokudb/ft-index/ft/tests/test3884.cc
+++ b/storage/tokudb/ft-index/ft/tests/test3884.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test4115.cc b/storage/tokudb/ft-index/ft/tests/test4115.cc
index e24696af057..80cd2ef59bd 100644
--- a/storage/tokudb/ft-index/ft/tests/test4115.cc
+++ b/storage/tokudb/ft-index/ft/tests/test4115.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test4244.cc b/storage/tokudb/ft-index/ft/tests/test4244.cc
index 3c2728e941e..47946b2aa5b 100644
--- a/storage/tokudb/ft-index/ft/tests/test4244.cc
+++ b/storage/tokudb/ft-index/ft/tests/test4244.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test_logcursor.cc b/storage/tokudb/ft-index/ft/tests/test_logcursor.cc
index 41644a02d07..2f29d6a7dc6 100644
--- a/storage/tokudb/ft-index/ft/tests/test_logcursor.cc
+++ b/storage/tokudb/ft-index/ft/tests/test_logcursor.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test_oexcl.cc b/storage/tokudb/ft-index/ft/tests/test_oexcl.cc
index 72fd01c2c89..48d5775a48f 100644
--- a/storage/tokudb/ft-index/ft/tests/test_oexcl.cc
+++ b/storage/tokudb/ft-index/ft/tests/test_oexcl.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test_rightmost_leaf_seqinsert_heuristic.cc b/storage/tokudb/ft-index/ft/tests/test_rightmost_leaf_seqinsert_heuristic.cc
index 69962153979..1fc97adead6 100644
--- a/storage/tokudb/ft-index/ft/tests/test_rightmost_leaf_seqinsert_heuristic.cc
+++ b/storage/tokudb/ft-index/ft/tests/test_rightmost_leaf_seqinsert_heuristic.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test_rightmost_leaf_split_merge.cc b/storage/tokudb/ft-index/ft/tests/test_rightmost_leaf_split_merge.cc
index 29515d9925f..4a71d77bc5e 100644
--- a/storage/tokudb/ft-index/ft/tests/test_rightmost_leaf_split_merge.cc
+++ b/storage/tokudb/ft-index/ft/tests/test_rightmost_leaf_split_merge.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/test_toku_malloc_plain_free.cc b/storage/tokudb/ft-index/ft/tests/test_toku_malloc_plain_free.cc
index 7f166fda836..fe8f0b06180 100644
--- a/storage/tokudb/ft-index/ft/tests/test_toku_malloc_plain_free.cc
+++ b/storage/tokudb/ft-index/ft/tests/test_toku_malloc_plain_free.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/upgrade_test_simple.cc b/storage/tokudb/ft-index/ft/tests/upgrade_test_simple.cc
index 3496df47e7c..4ce62bfdd7c 100644
--- a/storage/tokudb/ft-index/ft/tests/upgrade_test_simple.cc
+++ b/storage/tokudb/ft-index/ft/tests/upgrade_test_simple.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/verify-bad-msn.cc b/storage/tokudb/ft-index/ft/tests/verify-bad-msn.cc
index a7e3beea1e5..d43786b331b 100644
--- a/storage/tokudb/ft-index/ft/tests/verify-bad-msn.cc
+++ b/storage/tokudb/ft-index/ft/tests/verify-bad-msn.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/verify-bad-pivots.cc b/storage/tokudb/ft-index/ft/tests/verify-bad-pivots.cc
index f36ae77a973..79df935a430 100644
--- a/storage/tokudb/ft-index/ft/tests/verify-bad-pivots.cc
+++ b/storage/tokudb/ft-index/ft/tests/verify-bad-pivots.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/verify-dup-in-leaf.cc b/storage/tokudb/ft-index/ft/tests/verify-dup-in-leaf.cc
index a2c6567fdb4..34772b32a37 100644
--- a/storage/tokudb/ft-index/ft/tests/verify-dup-in-leaf.cc
+++ b/storage/tokudb/ft-index/ft/tests/verify-dup-in-leaf.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/verify-dup-pivots.cc b/storage/tokudb/ft-index/ft/tests/verify-dup-pivots.cc
index 4dc42a06c82..2a96344df4b 100644
--- a/storage/tokudb/ft-index/ft/tests/verify-dup-pivots.cc
+++ b/storage/tokudb/ft-index/ft/tests/verify-dup-pivots.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/verify-misrouted-msgs.cc b/storage/tokudb/ft-index/ft/tests/verify-misrouted-msgs.cc
index d671dd7a7f3..35aaec5db6a 100644
--- a/storage/tokudb/ft-index/ft/tests/verify-misrouted-msgs.cc
+++ b/storage/tokudb/ft-index/ft/tests/verify-misrouted-msgs.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/verify-unsorted-leaf.cc b/storage/tokudb/ft-index/ft/tests/verify-unsorted-leaf.cc
index 6a1fe6d0e23..0800a553dd0 100644
--- a/storage/tokudb/ft-index/ft/tests/verify-unsorted-leaf.cc
+++ b/storage/tokudb/ft-index/ft/tests/verify-unsorted-leaf.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/verify-unsorted-pivots.cc b/storage/tokudb/ft-index/ft/tests/verify-unsorted-pivots.cc
index bb20733f3e1..3e6441554b7 100644
--- a/storage/tokudb/ft-index/ft/tests/verify-unsorted-pivots.cc
+++ b/storage/tokudb/ft-index/ft/tests/verify-unsorted-pivots.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/xid_lsn_independent.cc b/storage/tokudb/ft-index/ft/tests/xid_lsn_independent.cc
index 545fcf4d927..035375a0745 100644
--- a/storage/tokudb/ft-index/ft/tests/xid_lsn_independent.cc
+++ b/storage/tokudb/ft-index/ft/tests/xid_lsn_independent.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/tests/ybt-test.cc b/storage/tokudb/ft-index/ft/tests/ybt-test.cc
index d53c03718e9..c28ba156e06 100644
--- a/storage/tokudb/ft-index/ft/tests/ybt-test.cc
+++ b/storage/tokudb/ft-index/ft/tests/ybt-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/roll.cc b/storage/tokudb/ft-index/ft/txn/roll.cc
index 69a75112576..f64bccc22bc 100644
--- a/storage/tokudb/ft-index/ft/txn/roll.cc
+++ b/storage/tokudb/ft-index/ft/txn/roll.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/rollback-apply.cc b/storage/tokudb/ft-index/ft/txn/rollback-apply.cc
index e65e5fc0fbf..9a75d3631d8 100644
--- a/storage/tokudb/ft-index/ft/txn/rollback-apply.cc
+++ b/storage/tokudb/ft-index/ft/txn/rollback-apply.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/rollback-apply.h b/storage/tokudb/ft-index/ft/txn/rollback-apply.h
index 3d91c154a32..4b2a53aaadc 100644
--- a/storage/tokudb/ft-index/ft/txn/rollback-apply.h
+++ b/storage/tokudb/ft-index/ft/txn/rollback-apply.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/rollback-ct-callbacks.cc b/storage/tokudb/ft-index/ft/txn/rollback-ct-callbacks.cc
index 9897b46e7c1..6bc4b6daf56 100644
--- a/storage/tokudb/ft-index/ft/txn/rollback-ct-callbacks.cc
+++ b/storage/tokudb/ft-index/ft/txn/rollback-ct-callbacks.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/rollback-ct-callbacks.h b/storage/tokudb/ft-index/ft/txn/rollback-ct-callbacks.h
index aee13f2e94d..6485f847ac1 100644
--- a/storage/tokudb/ft-index/ft/txn/rollback-ct-callbacks.h
+++ b/storage/tokudb/ft-index/ft/txn/rollback-ct-callbacks.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/rollback.cc b/storage/tokudb/ft-index/ft/txn/rollback.cc
index ea2f2a07c50..58b01007f22 100644
--- a/storage/tokudb/ft-index/ft/txn/rollback.cc
+++ b/storage/tokudb/ft-index/ft/txn/rollback.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/rollback.h b/storage/tokudb/ft-index/ft/txn/rollback.h
index c9f779e677b..1d744f6cff3 100644
--- a/storage/tokudb/ft-index/ft/txn/rollback.h
+++ b/storage/tokudb/ft-index/ft/txn/rollback.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/rollback_log_node_cache.cc b/storage/tokudb/ft-index/ft/txn/rollback_log_node_cache.cc
index b542c00ce4e..a5508f7de36 100644
--- a/storage/tokudb/ft-index/ft/txn/rollback_log_node_cache.cc
+++ b/storage/tokudb/ft-index/ft/txn/rollback_log_node_cache.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/rollback_log_node_cache.h b/storage/tokudb/ft-index/ft/txn/rollback_log_node_cache.h
index 4aa9daee207..b023b992e28 100644
--- a/storage/tokudb/ft-index/ft/txn/rollback_log_node_cache.h
+++ b/storage/tokudb/ft-index/ft/txn/rollback_log_node_cache.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/txn.cc b/storage/tokudb/ft-index/ft/txn/txn.cc
index 34c7e0f2a67..22d96b34644 100644
--- a/storage/tokudb/ft-index/ft/txn/txn.cc
+++ b/storage/tokudb/ft-index/ft/txn/txn.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/txn.h b/storage/tokudb/ft-index/ft/txn/txn.h
index 4f2778bf858..9ef099ba860 100644
--- a/storage/tokudb/ft-index/ft/txn/txn.h
+++ b/storage/tokudb/ft-index/ft/txn/txn.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/txn_child_manager.cc b/storage/tokudb/ft-index/ft/txn/txn_child_manager.cc
index 747220b2849..fe88fd20ef5 100644
--- a/storage/tokudb/ft-index/ft/txn/txn_child_manager.cc
+++ b/storage/tokudb/ft-index/ft/txn/txn_child_manager.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/txn_child_manager.h b/storage/tokudb/ft-index/ft/txn/txn_child_manager.h
index 99d98e2fe59..50fd28b5425 100644
--- a/storage/tokudb/ft-index/ft/txn/txn_child_manager.h
+++ b/storage/tokudb/ft-index/ft/txn/txn_child_manager.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/txn_manager.cc b/storage/tokudb/ft-index/ft/txn/txn_manager.cc
index 25ce1e73133..408e278214c 100644
--- a/storage/tokudb/ft-index/ft/txn/txn_manager.cc
+++ b/storage/tokudb/ft-index/ft/txn/txn_manager.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/txn_manager.h b/storage/tokudb/ft-index/ft/txn/txn_manager.h
index 5df1e23115c..23477fa0e30 100644
--- a/storage/tokudb/ft-index/ft/txn/txn_manager.h
+++ b/storage/tokudb/ft-index/ft/txn/txn_manager.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/txn_state.h b/storage/tokudb/ft-index/ft/txn/txn_state.h
index 75c3f51ce79..0203d5215a8 100644
--- a/storage/tokudb/ft-index/ft/txn/txn_state.h
+++ b/storage/tokudb/ft-index/ft/txn/txn_state.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/xids.cc b/storage/tokudb/ft-index/ft/txn/xids.cc
index 6308f3c0368..07f698f1ca0 100644
--- a/storage/tokudb/ft-index/ft/txn/xids.cc
+++ b/storage/tokudb/ft-index/ft/txn/xids.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/txn/xids.h b/storage/tokudb/ft-index/ft/txn/xids.h
index 5b0e95c2eee..5bf305cf52b 100644
--- a/storage/tokudb/ft-index/ft/txn/xids.h
+++ b/storage/tokudb/ft-index/ft/txn/xids.h
@@ -37,7 +37,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ule-internal.h b/storage/tokudb/ft-index/ft/ule-internal.h
index 9a42ead3d90..2a28a7652ed 100644
--- a/storage/tokudb/ft-index/ft/ule-internal.h
+++ b/storage/tokudb/ft-index/ft/ule-internal.h
@@ -30,7 +30,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ule.cc b/storage/tokudb/ft-index/ft/ule.cc
index 0f31f4337cf..35d98287291 100644
--- a/storage/tokudb/ft-index/ft/ule.cc
+++ b/storage/tokudb/ft-index/ft/ule.cc
@@ -27,7 +27,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/ft/ule.h b/storage/tokudb/ft-index/ft/ule.h
index 337abf25a5f..73d23ee79cd 100644
--- a/storage/tokudb/ft-index/ft/ule.h
+++ b/storage/tokudb/ft-index/ft/ule.h
@@ -31,7 +31,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/concurrent_tree.cc b/storage/tokudb/ft-index/locktree/concurrent_tree.cc
index b472be23111..f76898fab41 100644
--- a/storage/tokudb/ft-index/locktree/concurrent_tree.cc
+++ b/storage/tokudb/ft-index/locktree/concurrent_tree.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/concurrent_tree.h b/storage/tokudb/ft-index/locktree/concurrent_tree.h
index 82977bbf5f1..649aa301dc4 100644
--- a/storage/tokudb/ft-index/locktree/concurrent_tree.h
+++ b/storage/tokudb/ft-index/locktree/concurrent_tree.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/keyrange.cc b/storage/tokudb/ft-index/locktree/keyrange.cc
index c7cb19a597f..e456900ee38 100644
--- a/storage/tokudb/ft-index/locktree/keyrange.cc
+++ b/storage/tokudb/ft-index/locktree/keyrange.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/keyrange.h b/storage/tokudb/ft-index/locktree/keyrange.h
index 8b8e1a743e2..37844e01cd6 100644
--- a/storage/tokudb/ft-index/locktree/keyrange.h
+++ b/storage/tokudb/ft-index/locktree/keyrange.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/lock_request.cc b/storage/tokudb/ft-index/locktree/lock_request.cc
index 18f6051afdf..647607edf55 100644
--- a/storage/tokudb/ft-index/locktree/lock_request.cc
+++ b/storage/tokudb/ft-index/locktree/lock_request.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/lock_request.h b/storage/tokudb/ft-index/locktree/lock_request.h
index c504961fcc0..775d29b24da 100644
--- a/storage/tokudb/ft-index/locktree/lock_request.h
+++ b/storage/tokudb/ft-index/locktree/lock_request.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/locktree.cc b/storage/tokudb/ft-index/locktree/locktree.cc
index fc2470e98bd..ba6bae7c7d4 100644
--- a/storage/tokudb/ft-index/locktree/locktree.cc
+++ b/storage/tokudb/ft-index/locktree/locktree.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/locktree.h b/storage/tokudb/ft-index/locktree/locktree.h
index 3e613aba7a4..a750272e209 100644
--- a/storage/tokudb/ft-index/locktree/locktree.h
+++ b/storage/tokudb/ft-index/locktree/locktree.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/manager.cc b/storage/tokudb/ft-index/locktree/manager.cc
index 6fe8dc8dfdf..3be24d68748 100644
--- a/storage/tokudb/ft-index/locktree/manager.cc
+++ b/storage/tokudb/ft-index/locktree/manager.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/range_buffer.cc b/storage/tokudb/ft-index/locktree/range_buffer.cc
index cc7bbd90afc..f18820ac941 100644
--- a/storage/tokudb/ft-index/locktree/range_buffer.cc
+++ b/storage/tokudb/ft-index/locktree/range_buffer.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/range_buffer.h b/storage/tokudb/ft-index/locktree/range_buffer.h
index 7b1beb90329..48b08ad9f53 100644
--- a/storage/tokudb/ft-index/locktree/range_buffer.h
+++ b/storage/tokudb/ft-index/locktree/range_buffer.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/concurrent_tree_create_destroy.cc b/storage/tokudb/ft-index/locktree/tests/concurrent_tree_create_destroy.cc
index a1187d6e0cc..3b86a4ae3cd 100644
--- a/storage/tokudb/ft-index/locktree/tests/concurrent_tree_create_destroy.cc
+++ b/storage/tokudb/ft-index/locktree/tests/concurrent_tree_create_destroy.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_acquire_release.cc b/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_acquire_release.cc
index 002df28ff9e..0037b1b6ee2 100644
--- a/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_acquire_release.cc
+++ b/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_acquire_release.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_insert_remove.cc b/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_insert_remove.cc
index a4c3f01f419..0a7f0f9d1dd 100644
--- a/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_insert_remove.cc
+++ b/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_insert_remove.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_insert_serial_large.cc b/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_insert_serial_large.cc
index 1b3da34c904..34a1eeb3f6e 100644
--- a/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_insert_serial_large.cc
+++ b/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_insert_serial_large.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_remove_all.cc b/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_remove_all.cc
index 9fc67dbf5ef..c9c16dec44b 100644
--- a/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_remove_all.cc
+++ b/storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_remove_all.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/concurrent_tree_unit_test.h b/storage/tokudb/ft-index/locktree/tests/concurrent_tree_unit_test.h
index 132dbf24cce..6fb06c2f633 100644
--- a/storage/tokudb/ft-index/locktree/tests/concurrent_tree_unit_test.h
+++ b/storage/tokudb/ft-index/locktree/tests/concurrent_tree_unit_test.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/lock_request_create_set.cc b/storage/tokudb/ft-index/locktree/tests/lock_request_create_set.cc
index d88976add4f..e5132ce3f94 100644
--- a/storage/tokudb/ft-index/locktree/tests/lock_request_create_set.cc
+++ b/storage/tokudb/ft-index/locktree/tests/lock_request_create_set.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/lock_request_get_set_keys.cc b/storage/tokudb/ft-index/locktree/tests/lock_request_get_set_keys.cc
index 55bb483114b..8496f5b47d3 100644
--- a/storage/tokudb/ft-index/locktree/tests/lock_request_get_set_keys.cc
+++ b/storage/tokudb/ft-index/locktree/tests/lock_request_get_set_keys.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/lock_request_killed.cc b/storage/tokudb/ft-index/locktree/tests/lock_request_killed.cc
index 3c2a6a35562..5d3e08dea79 100644
--- a/storage/tokudb/ft-index/locktree/tests/lock_request_killed.cc
+++ b/storage/tokudb/ft-index/locktree/tests/lock_request_killed.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/lock_request_not_killed.cc b/storage/tokudb/ft-index/locktree/tests/lock_request_not_killed.cc
index 96bd2869fcf..9cd87d5e942 100644
--- a/storage/tokudb/ft-index/locktree/tests/lock_request_not_killed.cc
+++ b/storage/tokudb/ft-index/locktree/tests/lock_request_not_killed.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/lock_request_start_deadlock.cc b/storage/tokudb/ft-index/locktree/tests/lock_request_start_deadlock.cc
index af28b06b682..db05229f459 100644
--- a/storage/tokudb/ft-index/locktree/tests/lock_request_start_deadlock.cc
+++ b/storage/tokudb/ft-index/locktree/tests/lock_request_start_deadlock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/lock_request_start_pending.cc b/storage/tokudb/ft-index/locktree/tests/lock_request_start_pending.cc
index a719da64114..bb579f3ccbe 100644
--- a/storage/tokudb/ft-index/locktree/tests/lock_request_start_pending.cc
+++ b/storage/tokudb/ft-index/locktree/tests/lock_request_start_pending.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/lock_request_start_retry_race.cc b/storage/tokudb/ft-index/locktree/tests/lock_request_start_retry_race.cc
index 86ef2dd9cc5..daf122c749f 100644
--- a/storage/tokudb/ft-index/locktree/tests/lock_request_start_retry_race.cc
+++ b/storage/tokudb/ft-index/locktree/tests/lock_request_start_retry_race.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/lock_request_unit_test.h b/storage/tokudb/ft-index/locktree/tests/lock_request_unit_test.h
index 8fc4a3f8df8..b902464c174 100644
--- a/storage/tokudb/ft-index/locktree/tests/lock_request_unit_test.h
+++ b/storage/tokudb/ft-index/locktree/tests/lock_request_unit_test.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/lock_request_wait_time_callback.cc b/storage/tokudb/ft-index/locktree/tests/lock_request_wait_time_callback.cc
index b583e32e117..0d51f936aba 100644
--- a/storage/tokudb/ft-index/locktree/tests/lock_request_wait_time_callback.cc
+++ b/storage/tokudb/ft-index/locktree/tests/lock_request_wait_time_callback.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_conflicts.cc b/storage/tokudb/ft-index/locktree/tests/locktree_conflicts.cc
index 716000d4753..89a47193ab3 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_conflicts.cc
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_conflicts.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_create_destroy.cc b/storage/tokudb/ft-index/locktree/tests/locktree_create_destroy.cc
index 93bdea239cc..2b8fdea13b2 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_create_destroy.cc
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_create_destroy.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_escalation_1big7lt_1small.cc b/storage/tokudb/ft-index/locktree/tests/locktree_escalation_1big7lt_1small.cc
index 02784f52bfa..5bcf1be9080 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_escalation_1big7lt_1small.cc
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_escalation_1big7lt_1small.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_escalation_2big_1lt.cc b/storage/tokudb/ft-index/locktree/tests/locktree_escalation_2big_1lt.cc
index 9509224a15f..40e20aa764b 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_escalation_2big_1lt.cc
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_escalation_2big_1lt.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_escalation_2big_2lt.cc b/storage/tokudb/ft-index/locktree/tests/locktree_escalation_2big_2lt.cc
index 5e315edda78..7ee2e2946d1 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_escalation_2big_2lt.cc
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_escalation_2big_2lt.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_escalation_impossible.cc b/storage/tokudb/ft-index/locktree/tests/locktree_escalation_impossible.cc
index a7d84aaf650..0a2b272bf11 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_escalation_impossible.cc
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_escalation_impossible.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_escalation_stalls.cc b/storage/tokudb/ft-index/locktree/tests/locktree_escalation_stalls.cc
index 9228e627e9a..b59080db12e 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_escalation_stalls.cc
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_escalation_stalls.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_infinity.cc b/storage/tokudb/ft-index/locktree/tests/locktree_infinity.cc
index ef490b59cc2..a517586f9ce 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_infinity.cc
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_infinity.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_misc.cc b/storage/tokudb/ft-index/locktree/tests/locktree_misc.cc
index 67d616867bc..6bc4807227b 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_misc.cc
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_misc.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_overlapping_relock.cc b/storage/tokudb/ft-index/locktree/tests/locktree_overlapping_relock.cc
index 4cf950e7037..e571b33e000 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_overlapping_relock.cc
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_overlapping_relock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_simple_lock.cc b/storage/tokudb/ft-index/locktree/tests/locktree_simple_lock.cc
index c4ebb45537d..38a5079ea57 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_simple_lock.cc
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_simple_lock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_single_txnid_optimization.cc b/storage/tokudb/ft-index/locktree/tests/locktree_single_txnid_optimization.cc
index 17ebc3c86f9..184252fb556 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_single_txnid_optimization.cc
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_single_txnid_optimization.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/locktree_unit_test.h b/storage/tokudb/ft-index/locktree/tests/locktree_unit_test.h
index 34dbc3a7e59..fb3612223e5 100644
--- a/storage/tokudb/ft-index/locktree/tests/locktree_unit_test.h
+++ b/storage/tokudb/ft-index/locktree/tests/locktree_unit_test.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/manager_create_destroy.cc b/storage/tokudb/ft-index/locktree/tests/manager_create_destroy.cc
index 07c00c5d7b7..b2d0023b966 100644
--- a/storage/tokudb/ft-index/locktree/tests/manager_create_destroy.cc
+++ b/storage/tokudb/ft-index/locktree/tests/manager_create_destroy.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/manager_locktree_map.cc b/storage/tokudb/ft-index/locktree/tests/manager_locktree_map.cc
index 82cf1dc9f5a..0525b144694 100644
--- a/storage/tokudb/ft-index/locktree/tests/manager_locktree_map.cc
+++ b/storage/tokudb/ft-index/locktree/tests/manager_locktree_map.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/manager_parallel_locktree_get_release.cc b/storage/tokudb/ft-index/locktree/tests/manager_parallel_locktree_get_release.cc
index 09d09a77aeb..3d02e27fe47 100644
--- a/storage/tokudb/ft-index/locktree/tests/manager_parallel_locktree_get_release.cc
+++ b/storage/tokudb/ft-index/locktree/tests/manager_parallel_locktree_get_release.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/manager_params.cc b/storage/tokudb/ft-index/locktree/tests/manager_params.cc
index 7376d91a064..9df9fa0d150 100644
--- a/storage/tokudb/ft-index/locktree/tests/manager_params.cc
+++ b/storage/tokudb/ft-index/locktree/tests/manager_params.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/manager_reference_release_lt.cc b/storage/tokudb/ft-index/locktree/tests/manager_reference_release_lt.cc
index c2fdee49ffe..ee5a1cb6c18 100644
--- a/storage/tokudb/ft-index/locktree/tests/manager_reference_release_lt.cc
+++ b/storage/tokudb/ft-index/locktree/tests/manager_reference_release_lt.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/manager_status.cc b/storage/tokudb/ft-index/locktree/tests/manager_status.cc
index b2f1560736a..bdc7dbda2c9 100644
--- a/storage/tokudb/ft-index/locktree/tests/manager_status.cc
+++ b/storage/tokudb/ft-index/locktree/tests/manager_status.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/manager_unit_test.h b/storage/tokudb/ft-index/locktree/tests/manager_unit_test.h
index cec640e0c2c..3cf38939354 100644
--- a/storage/tokudb/ft-index/locktree/tests/manager_unit_test.h
+++ b/storage/tokudb/ft-index/locktree/tests/manager_unit_test.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/range_buffer_test.cc b/storage/tokudb/ft-index/locktree/tests/range_buffer_test.cc
index 61d14888229..85a04304372 100644
--- a/storage/tokudb/ft-index/locktree/tests/range_buffer_test.cc
+++ b/storage/tokudb/ft-index/locktree/tests/range_buffer_test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/test.h b/storage/tokudb/ft-index/locktree/tests/test.h
index 904d0d03415..89dfb2e4635 100644
--- a/storage/tokudb/ft-index/locktree/tests/test.h
+++ b/storage/tokudb/ft-index/locktree/tests/test.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/txnid_set_test.cc b/storage/tokudb/ft-index/locktree/tests/txnid_set_test.cc
index 3502b9bf049..18705efd3a7 100644
--- a/storage/tokudb/ft-index/locktree/tests/txnid_set_test.cc
+++ b/storage/tokudb/ft-index/locktree/tests/txnid_set_test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/tests/wfg_test.cc b/storage/tokudb/ft-index/locktree/tests/wfg_test.cc
index be3f8fa1f20..2504a44f793 100644
--- a/storage/tokudb/ft-index/locktree/tests/wfg_test.cc
+++ b/storage/tokudb/ft-index/locktree/tests/wfg_test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/treenode.cc b/storage/tokudb/ft-index/locktree/treenode.cc
index 9853874776f..ccb63ba691a 100644
--- a/storage/tokudb/ft-index/locktree/treenode.cc
+++ b/storage/tokudb/ft-index/locktree/treenode.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/treenode.h b/storage/tokudb/ft-index/locktree/treenode.h
index 7a6880a657c..11e0505cf4d 100644
--- a/storage/tokudb/ft-index/locktree/treenode.h
+++ b/storage/tokudb/ft-index/locktree/treenode.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/txnid_set.cc b/storage/tokudb/ft-index/locktree/txnid_set.cc
index f6b95c9b32f..d19b06fb79f 100644
--- a/storage/tokudb/ft-index/locktree/txnid_set.cc
+++ b/storage/tokudb/ft-index/locktree/txnid_set.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/txnid_set.h b/storage/tokudb/ft-index/locktree/txnid_set.h
index c2c84b39c07..73ef7cf43be 100644
--- a/storage/tokudb/ft-index/locktree/txnid_set.h
+++ b/storage/tokudb/ft-index/locktree/txnid_set.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/wfg.cc b/storage/tokudb/ft-index/locktree/wfg.cc
index e18c7f4aa26..dae23f6e854 100644
--- a/storage/tokudb/ft-index/locktree/wfg.cc
+++ b/storage/tokudb/ft-index/locktree/wfg.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/locktree/wfg.h b/storage/tokudb/ft-index/locktree/wfg.h
index 99172902d2e..cd184e7776c 100644
--- a/storage/tokudb/ft-index/locktree/wfg.h
+++ b/storage/tokudb/ft-index/locktree/wfg.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/file.cc b/storage/tokudb/ft-index/portability/file.cc
index 6919b54e81d..941491be4c4 100644
--- a/storage/tokudb/ft-index/portability/file.cc
+++ b/storage/tokudb/ft-index/portability/file.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/huge_page_detection.cc b/storage/tokudb/ft-index/portability/huge_page_detection.cc
index c90333857c3..ca428987486 100644
--- a/storage/tokudb/ft-index/portability/huge_page_detection.cc
+++ b/storage/tokudb/ft-index/portability/huge_page_detection.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/memory.cc b/storage/tokudb/ft-index/portability/memory.cc
index 568be399bb5..74b4b88d541 100644
--- a/storage/tokudb/ft-index/portability/memory.cc
+++ b/storage/tokudb/ft-index/portability/memory.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/memory.h b/storage/tokudb/ft-index/portability/memory.h
index 52e0c69575f..f33907ec49d 100644
--- a/storage/tokudb/ft-index/portability/memory.h
+++ b/storage/tokudb/ft-index/portability/memory.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/os_malloc.cc b/storage/tokudb/ft-index/portability/os_malloc.cc
index c59167bd8c4..a9ce94860a2 100644
--- a/storage/tokudb/ft-index/portability/os_malloc.cc
+++ b/storage/tokudb/ft-index/portability/os_malloc.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/portability.cc b/storage/tokudb/ft-index/portability/portability.cc
index 9863c45c60d..a9ad59c7551 100644
--- a/storage/tokudb/ft-index/portability/portability.cc
+++ b/storage/tokudb/ft-index/portability/portability.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/rwlock_condvar.h b/storage/tokudb/ft-index/portability/tests/rwlock_condvar.h
index 135481f8997..dd27366d67c 100644
--- a/storage/tokudb/ft-index/portability/tests/rwlock_condvar.h
+++ b/storage/tokudb/ft-index/portability/tests/rwlock_condvar.h
@@ -29,7 +29,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-active-cpus.cc b/storage/tokudb/ft-index/portability/tests/test-active-cpus.cc
index ed141edd0bf..1e0a3ff2f51 100644
--- a/storage/tokudb/ft-index/portability/tests/test-active-cpus.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-active-cpus.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-cache-line-boundary-fails.cc b/storage/tokudb/ft-index/portability/tests/test-cache-line-boundary-fails.cc
index eb4862c2254..e0ee906b15c 100644
--- a/storage/tokudb/ft-index/portability/tests/test-cache-line-boundary-fails.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-cache-line-boundary-fails.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-cpu-freq-openlimit17.cc b/storage/tokudb/ft-index/portability/tests/test-cpu-freq-openlimit17.cc
index 04e58d49bf6..875ed7311aa 100644
--- a/storage/tokudb/ft-index/portability/tests/test-cpu-freq-openlimit17.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-cpu-freq-openlimit17.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-cpu-freq.cc b/storage/tokudb/ft-index/portability/tests/test-cpu-freq.cc
index 889eb29c5c1..a62f5f67a83 100644
--- a/storage/tokudb/ft-index/portability/tests/test-cpu-freq.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-cpu-freq.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-filesystem-sizes.cc b/storage/tokudb/ft-index/portability/tests/test-filesystem-sizes.cc
index 993eaf4fea2..643649fa91f 100644
--- a/storage/tokudb/ft-index/portability/tests/test-filesystem-sizes.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-filesystem-sizes.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-flock.cc b/storage/tokudb/ft-index/portability/tests/test-flock.cc
index 5ef45b1bd97..ec56ca30dd8 100644
--- a/storage/tokudb/ft-index/portability/tests/test-flock.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-flock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-fsync-directory.cc b/storage/tokudb/ft-index/portability/tests/test-fsync-directory.cc
index a0de1a0d882..632296ef47f 100644
--- a/storage/tokudb/ft-index/portability/tests/test-fsync-directory.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-fsync-directory.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-fsync.cc b/storage/tokudb/ft-index/portability/tests/test-fsync.cc
index 4d3be11120f..5da2cbef88a 100644
--- a/storage/tokudb/ft-index/portability/tests/test-fsync.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-fsync.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-gettime.cc b/storage/tokudb/ft-index/portability/tests/test-gettime.cc
index ce0e5cb9921..1b1de935fe2 100644
--- a/storage/tokudb/ft-index/portability/tests/test-gettime.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-gettime.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-gettimeofday.cc b/storage/tokudb/ft-index/portability/tests/test-gettimeofday.cc
index 0ff77118d1c..96519ff8984 100644
--- a/storage/tokudb/ft-index/portability/tests/test-gettimeofday.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-gettimeofday.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-hugepage.cc b/storage/tokudb/ft-index/portability/tests/test-hugepage.cc
index 4aa11ee2e79..1c7421c3ac8 100644
--- a/storage/tokudb/ft-index/portability/tests/test-hugepage.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-hugepage.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-max-data.cc b/storage/tokudb/ft-index/portability/tests/test-max-data.cc
index f04b39d8421..739e491c67e 100644
--- a/storage/tokudb/ft-index/portability/tests/test-max-data.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-max-data.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-memory-status.cc b/storage/tokudb/ft-index/portability/tests/test-memory-status.cc
index 87011c4e0d0..5d054c4be6e 100644
--- a/storage/tokudb/ft-index/portability/tests/test-memory-status.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-memory-status.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-pagesize.cc b/storage/tokudb/ft-index/portability/tests/test-pagesize.cc
index f9a78742e35..b6bc3804a48 100644
--- a/storage/tokudb/ft-index/portability/tests/test-pagesize.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-pagesize.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-pthread-rwlock-rdlock.cc b/storage/tokudb/ft-index/portability/tests/test-pthread-rwlock-rdlock.cc
index 9008262fa09..f9f4ccd9082 100644
--- a/storage/tokudb/ft-index/portability/tests/test-pthread-rwlock-rdlock.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-pthread-rwlock-rdlock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-pthread-rwlock-rwr.cc b/storage/tokudb/ft-index/portability/tests/test-pthread-rwlock-rwr.cc
index 32b38421aaf..0bd805c8b30 100644
--- a/storage/tokudb/ft-index/portability/tests/test-pthread-rwlock-rwr.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-pthread-rwlock-rwr.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-pwrite4g.cc b/storage/tokudb/ft-index/portability/tests/test-pwrite4g.cc
index abd5e4ec1ac..57f69cf5a86 100644
--- a/storage/tokudb/ft-index/portability/tests/test-pwrite4g.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-pwrite4g.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-snprintf.cc b/storage/tokudb/ft-index/portability/tests/test-snprintf.cc
index 5f168c8d612..7ede50ac289 100644
--- a/storage/tokudb/ft-index/portability/tests/test-snprintf.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-snprintf.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-stat.cc b/storage/tokudb/ft-index/portability/tests/test-stat.cc
index bedf7e7e54f..cb97001d0bf 100644
--- a/storage/tokudb/ft-index/portability/tests/test-stat.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-stat.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-toku-malloc.cc b/storage/tokudb/ft-index/portability/tests/test-toku-malloc.cc
index 48f616dd817..e31fc66de6a 100644
--- a/storage/tokudb/ft-index/portability/tests/test-toku-malloc.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-toku-malloc.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test-xid.cc b/storage/tokudb/ft-index/portability/tests/test-xid.cc
index fb1abd33793..0020768d754 100644
--- a/storage/tokudb/ft-index/portability/tests/test-xid.cc
+++ b/storage/tokudb/ft-index/portability/tests/test-xid.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/test.h b/storage/tokudb/ft-index/portability/tests/test.h
index a3e7994957e..593076f7c20 100644
--- a/storage/tokudb/ft-index/portability/tests/test.h
+++ b/storage/tokudb/ft-index/portability/tests/test.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/try-assert-zero.cc b/storage/tokudb/ft-index/portability/tests/try-assert-zero.cc
index 6517f61b3c3..9d127e8dc73 100644
--- a/storage/tokudb/ft-index/portability/tests/try-assert-zero.cc
+++ b/storage/tokudb/ft-index/portability/tests/try-assert-zero.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/try-assert0.cc b/storage/tokudb/ft-index/portability/tests/try-assert0.cc
index 89fe6941138..858e80d3b53 100644
--- a/storage/tokudb/ft-index/portability/tests/try-assert0.cc
+++ b/storage/tokudb/ft-index/portability/tests/try-assert0.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/try-leak-lost.cc b/storage/tokudb/ft-index/portability/tests/try-leak-lost.cc
index 290e2969aa7..881f33098af 100644
--- a/storage/tokudb/ft-index/portability/tests/try-leak-lost.cc
+++ b/storage/tokudb/ft-index/portability/tests/try-leak-lost.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/try-leak-reachable.cc b/storage/tokudb/ft-index/portability/tests/try-leak-reachable.cc
index 63c1dd4f756..f7f83df736c 100644
--- a/storage/tokudb/ft-index/portability/tests/try-leak-reachable.cc
+++ b/storage/tokudb/ft-index/portability/tests/try-leak-reachable.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/tests/try-uninit.cc b/storage/tokudb/ft-index/portability/tests/try-uninit.cc
index ef092541fd9..08e86297832 100644
--- a/storage/tokudb/ft-index/portability/tests/try-uninit.cc
+++ b/storage/tokudb/ft-index/portability/tests/try-uninit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_assert.cc b/storage/tokudb/ft-index/portability/toku_assert.cc
index 68e16699e60..04be17ffbad 100644
--- a/storage/tokudb/ft-index/portability/toku_assert.cc
+++ b/storage/tokudb/ft-index/portability/toku_assert.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_assert.h b/storage/tokudb/ft-index/portability/toku_assert.h
index ab5f8c1ffb4..ff46150a4ee 100644
--- a/storage/tokudb/ft-index/portability/toku_assert.h
+++ b/storage/tokudb/ft-index/portability/toku_assert.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_atomic.h b/storage/tokudb/ft-index/portability/toku_atomic.h
index 075211a790c..0dcf379e2cd 100644
--- a/storage/tokudb/ft-index/portability/toku_atomic.h
+++ b/storage/tokudb/ft-index/portability/toku_atomic.h
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_byteswap.h b/storage/tokudb/ft-index/portability/toku_byteswap.h
index 12c76b00825..18a8263e496 100644
--- a/storage/tokudb/ft-index/portability/toku_byteswap.h
+++ b/storage/tokudb/ft-index/portability/toku_byteswap.h
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_crash.cc b/storage/tokudb/ft-index/portability/toku_crash.cc
index 123746d8f7f..c6093538a12 100644
--- a/storage/tokudb/ft-index/portability/toku_crash.cc
+++ b/storage/tokudb/ft-index/portability/toku_crash.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_crash.h b/storage/tokudb/ft-index/portability/toku_crash.h
index a5dd959a15d..f07e59e3874 100644
--- a/storage/tokudb/ft-index/portability/toku_crash.h
+++ b/storage/tokudb/ft-index/portability/toku_crash.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_htod.h b/storage/tokudb/ft-index/portability/toku_htod.h
index d12d45a13cf..b526d629a73 100644
--- a/storage/tokudb/ft-index/portability/toku_htod.h
+++ b/storage/tokudb/ft-index/portability/toku_htod.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_htonl.h b/storage/tokudb/ft-index/portability/toku_htonl.h
index f2ba320bf1f..b6bbabba0ec 100644
--- a/storage/tokudb/ft-index/portability/toku_htonl.h
+++ b/storage/tokudb/ft-index/portability/toku_htonl.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_list.h b/storage/tokudb/ft-index/portability/toku_list.h
index 3fc96a671dd..1f1b5020602 100644
--- a/storage/tokudb/ft-index/portability/toku_list.h
+++ b/storage/tokudb/ft-index/portability/toku_list.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_os.h b/storage/tokudb/ft-index/portability/toku_os.h
index 71576d7c1dd..29ee885cd92 100644
--- a/storage/tokudb/ft-index/portability/toku_os.h
+++ b/storage/tokudb/ft-index/portability/toku_os.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_os_types.h b/storage/tokudb/ft-index/portability/toku_os_types.h
index a7053374fde..4e002c7a57e 100644
--- a/storage/tokudb/ft-index/portability/toku_os_types.h
+++ b/storage/tokudb/ft-index/portability/toku_os_types.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_path.cc b/storage/tokudb/ft-index/portability/toku_path.cc
index 89b106309eb..9df48800024 100644
--- a/storage/tokudb/ft-index/portability/toku_path.cc
+++ b/storage/tokudb/ft-index/portability/toku_path.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_path.h b/storage/tokudb/ft-index/portability/toku_path.h
index 3ee6736360f..0484cee6930 100644
--- a/storage/tokudb/ft-index/portability/toku_path.h
+++ b/storage/tokudb/ft-index/portability/toku_path.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_portability.h b/storage/tokudb/ft-index/portability/toku_portability.h
index 9459c2d7ad3..94f8ddec71a 100644
--- a/storage/tokudb/ft-index/portability/toku_portability.h
+++ b/storage/tokudb/ft-index/portability/toku_portability.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_pthread.cc b/storage/tokudb/ft-index/portability/toku_pthread.cc
index 42ae9c0b1f5..77e512ceb7d 100644
--- a/storage/tokudb/ft-index/portability/toku_pthread.cc
+++ b/storage/tokudb/ft-index/portability/toku_pthread.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_pthread.h b/storage/tokudb/ft-index/portability/toku_pthread.h
index 4a564e4029b..133a9e29c72 100644
--- a/storage/tokudb/ft-index/portability/toku_pthread.h
+++ b/storage/tokudb/ft-index/portability/toku_pthread.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_race_tools.h b/storage/tokudb/ft-index/portability/toku_race_tools.h
index 042e05de2bc..fb1ecc81b6a 100644
--- a/storage/tokudb/ft-index/portability/toku_race_tools.h
+++ b/storage/tokudb/ft-index/portability/toku_race_tools.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_random.h b/storage/tokudb/ft-index/portability/toku_random.h
index a350b171a3b..e423397637d 100644
--- a/storage/tokudb/ft-index/portability/toku_random.h
+++ b/storage/tokudb/ft-index/portability/toku_random.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_stdint.h b/storage/tokudb/ft-index/portability/toku_stdint.h
index 806e40e612b..258b74d12ac 100644
--- a/storage/tokudb/ft-index/portability/toku_stdint.h
+++ b/storage/tokudb/ft-index/portability/toku_stdint.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_stdlib.h b/storage/tokudb/ft-index/portability/toku_stdlib.h
index 229e3945cf9..a7534a176c3 100644
--- a/storage/tokudb/ft-index/portability/toku_stdlib.h
+++ b/storage/tokudb/ft-index/portability/toku_stdlib.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_time.cc b/storage/tokudb/ft-index/portability/toku_time.cc
index 97834493194..c3243752c5e 100644
--- a/storage/tokudb/ft-index/portability/toku_time.cc
+++ b/storage/tokudb/ft-index/portability/toku_time.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/portability/toku_time.h b/storage/tokudb/ft-index/portability/toku_time.h
index 069e67c0d28..b5fb7258acd 100644
--- a/storage/tokudb/ft-index/portability/toku_time.h
+++ b/storage/tokudb/ft-index/portability/toku_time.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/errors.cc b/storage/tokudb/ft-index/src/errors.cc
index 6c330f040dd..afb61379c3a 100644
--- a/storage/tokudb/ft-index/src/errors.cc
+++ b/storage/tokudb/ft-index/src/errors.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/indexer-internal.h b/storage/tokudb/ft-index/src/indexer-internal.h
index fd648a88c8f..4cd9910b65e 100644
--- a/storage/tokudb/ft-index/src/indexer-internal.h
+++ b/storage/tokudb/ft-index/src/indexer-internal.h
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/indexer-undo-do.cc b/storage/tokudb/ft-index/src/indexer-undo-do.cc
index 03e05751358..00b0ab723b1 100644
--- a/storage/tokudb/ft-index/src/indexer-undo-do.cc
+++ b/storage/tokudb/ft-index/src/indexer-undo-do.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/indexer.cc b/storage/tokudb/ft-index/src/indexer.cc
index ebb2607483a..ac7e1e58c6b 100644
--- a/storage/tokudb/ft-index/src/indexer.cc
+++ b/storage/tokudb/ft-index/src/indexer.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/indexer.h b/storage/tokudb/ft-index/src/indexer.h
index 12625fdc6ea..042c0cc5489 100644
--- a/storage/tokudb/ft-index/src/indexer.h
+++ b/storage/tokudb/ft-index/src/indexer.h
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/loader.cc b/storage/tokudb/ft-index/src/loader.cc
index 0a742dff6d1..128f03171a8 100644
--- a/storage/tokudb/ft-index/src/loader.cc
+++ b/storage/tokudb/ft-index/src/loader.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/loader.h b/storage/tokudb/ft-index/src/loader.h
index c709eed3e35..33225ffa581 100644
--- a/storage/tokudb/ft-index/src/loader.h
+++ b/storage/tokudb/ft-index/src/loader.h
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/big-nested-abort-abort.cc b/storage/tokudb/ft-index/src/tests/big-nested-abort-abort.cc
index 7c6e444986a..509d9e86f5d 100644
--- a/storage/tokudb/ft-index/src/tests/big-nested-abort-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/big-nested-abort-abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/big-nested-abort-commit.cc b/storage/tokudb/ft-index/src/tests/big-nested-abort-commit.cc
index 9965a6f5725..40ee2074732 100644
--- a/storage/tokudb/ft-index/src/tests/big-nested-abort-commit.cc
+++ b/storage/tokudb/ft-index/src/tests/big-nested-abort-commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/big-nested-commit-abort.cc b/storage/tokudb/ft-index/src/tests/big-nested-commit-abort.cc
index 6e02e6e7799..c37dbc4fb59 100644
--- a/storage/tokudb/ft-index/src/tests/big-nested-commit-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/big-nested-commit-abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/big-nested-commit-commit.cc b/storage/tokudb/ft-index/src/tests/big-nested-commit-commit.cc
index efd951a90d4..4565b4d7e2f 100644
--- a/storage/tokudb/ft-index/src/tests/big-nested-commit-commit.cc
+++ b/storage/tokudb/ft-index/src/tests/big-nested-commit-commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/big-shutdown.cc b/storage/tokudb/ft-index/src/tests/big-shutdown.cc
index 0dc576e1117..a2b6c9707de 100644
--- a/storage/tokudb/ft-index/src/tests/big-shutdown.cc
+++ b/storage/tokudb/ft-index/src/tests/big-shutdown.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/bigtxn27.cc b/storage/tokudb/ft-index/src/tests/bigtxn27.cc
index 1eedb79543d..d0191400bc4 100644
--- a/storage/tokudb/ft-index/src/tests/bigtxn27.cc
+++ b/storage/tokudb/ft-index/src/tests/bigtxn27.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blackhole.cc b/storage/tokudb/ft-index/src/tests/blackhole.cc
index 34df107b153..0b001b87f5c 100644
--- a/storage/tokudb/ft-index/src/tests/blackhole.cc
+++ b/storage/tokudb/ft-index/src/tests/blackhole.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-first-empty.cc b/storage/tokudb/ft-index/src/tests/blocking-first-empty.cc
index 3fb5cae46ff..7ffc39541fd 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-first-empty.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-first-empty.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-first.cc b/storage/tokudb/ft-index/src/tests/blocking-first.cc
index b501f70d5bb..4b88202b82c 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-first.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-first.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-last.cc b/storage/tokudb/ft-index/src/tests/blocking-last.cc
index e087d9623fc..dab681c54cd 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-last.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-last.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-next-prev-deadlock.cc b/storage/tokudb/ft-index/src/tests/blocking-next-prev-deadlock.cc
index dac4aa1ad44..2a3057c377d 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-next-prev-deadlock.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-next-prev-deadlock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-next-prev.cc b/storage/tokudb/ft-index/src/tests/blocking-next-prev.cc
index 5fa2f781fb7..696d509db95 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-next-prev.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-next-prev.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-prelock-range.cc b/storage/tokudb/ft-index/src/tests/blocking-prelock-range.cc
index 78d2975f81b..65976f30da8 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-prelock-range.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-prelock-range.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-put-timeout.cc b/storage/tokudb/ft-index/src/tests/blocking-put-timeout.cc
index 13fddb8d05b..06210ed6ae1 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-put-timeout.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-put-timeout.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-put-wakeup.cc b/storage/tokudb/ft-index/src/tests/blocking-put-wakeup.cc
index c5052fbf813..7e542bfba27 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-put-wakeup.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-put-wakeup.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-put.cc b/storage/tokudb/ft-index/src/tests/blocking-put.cc
index 8b1cf71e359..6c885f2a138 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-put.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-put.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-set-range-0.cc b/storage/tokudb/ft-index/src/tests/blocking-set-range-0.cc
index 8445493832f..07cf3f6b626 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-set-range-0.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-set-range-0.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-set-range-n.cc b/storage/tokudb/ft-index/src/tests/blocking-set-range-n.cc
index a37e5b2a0a7..b451d06c888 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-set-range-n.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-set-range-n.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-set-range-reverse-0.cc b/storage/tokudb/ft-index/src/tests/blocking-set-range-reverse-0.cc
index dc79522d629..6c22bc8d186 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-set-range-reverse-0.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-set-range-reverse-0.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-set.cc b/storage/tokudb/ft-index/src/tests/blocking-set.cc
index 4bb3c5dd1eb..9b288d2ff3a 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-set.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-set.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/blocking-table-lock.cc b/storage/tokudb/ft-index/src/tests/blocking-table-lock.cc
index 8258a698784..df460b6402e 100644
--- a/storage/tokudb/ft-index/src/tests/blocking-table-lock.cc
+++ b/storage/tokudb/ft-index/src/tests/blocking-table-lock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/bug1381.cc b/storage/tokudb/ft-index/src/tests/bug1381.cc
index 988538ef782..540c3f15d70 100644
--- a/storage/tokudb/ft-index/src/tests/bug1381.cc
+++ b/storage/tokudb/ft-index/src/tests/bug1381.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/cachetable-race.cc b/storage/tokudb/ft-index/src/tests/cachetable-race.cc
index 0ff1fc11b4e..b74ab01a28a 100644
--- a/storage/tokudb/ft-index/src/tests/cachetable-race.cc
+++ b/storage/tokudb/ft-index/src/tests/cachetable-race.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/checkpoint1.cc b/storage/tokudb/ft-index/src/tests/checkpoint1.cc
index 68300dee6fb..36f67df924b 100644
--- a/storage/tokudb/ft-index/src/tests/checkpoint1.cc
+++ b/storage/tokudb/ft-index/src/tests/checkpoint1.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/checkpoint_fairness.cc b/storage/tokudb/ft-index/src/tests/checkpoint_fairness.cc
index 3e76020d70b..1ded0d561d3 100644
--- a/storage/tokudb/ft-index/src/tests/checkpoint_fairness.cc
+++ b/storage/tokudb/ft-index/src/tests/checkpoint_fairness.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/checkpoint_stress.cc b/storage/tokudb/ft-index/src/tests/checkpoint_stress.cc
index 1f39061bb1e..c27795b9c1c 100644
--- a/storage/tokudb/ft-index/src/tests/checkpoint_stress.cc
+++ b/storage/tokudb/ft-index/src/tests/checkpoint_stress.cc
@@ -23,7 +23,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/checkpoint_test.h b/storage/tokudb/ft-index/src/tests/checkpoint_test.h
index 4ea74e09ede..97843e22fcf 100644
--- a/storage/tokudb/ft-index/src/tests/checkpoint_test.h
+++ b/storage/tokudb/ft-index/src/tests/checkpoint_test.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/create-datadir.cc b/storage/tokudb/ft-index/src/tests/create-datadir.cc
index 2cde781872b..fd51ede1f6c 100644
--- a/storage/tokudb/ft-index/src/tests/create-datadir.cc
+++ b/storage/tokudb/ft-index/src/tests/create-datadir.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/cursor-isolation.cc b/storage/tokudb/ft-index/src/tests/cursor-isolation.cc
index ec91f5b73d1..a73892f880b 100644
--- a/storage/tokudb/ft-index/src/tests/cursor-isolation.cc
+++ b/storage/tokudb/ft-index/src/tests/cursor-isolation.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/cursor-more-than-a-leaf-provdel.cc b/storage/tokudb/ft-index/src/tests/cursor-more-than-a-leaf-provdel.cc
index 4587402c286..a8d4209fffd 100644
--- a/storage/tokudb/ft-index/src/tests/cursor-more-than-a-leaf-provdel.cc
+++ b/storage/tokudb/ft-index/src/tests/cursor-more-than-a-leaf-provdel.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/cursor-set-del-rmw.cc b/storage/tokudb/ft-index/src/tests/cursor-set-del-rmw.cc
index 79df796a6c1..7a7a13a170f 100644
--- a/storage/tokudb/ft-index/src/tests/cursor-set-del-rmw.cc
+++ b/storage/tokudb/ft-index/src/tests/cursor-set-del-rmw.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/cursor-set-range-rmw.cc b/storage/tokudb/ft-index/src/tests/cursor-set-range-rmw.cc
index 4f0dce02edd..6df6beeca0c 100644
--- a/storage/tokudb/ft-index/src/tests/cursor-set-range-rmw.cc
+++ b/storage/tokudb/ft-index/src/tests/cursor-set-range-rmw.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/cursor-step-over-delete.cc b/storage/tokudb/ft-index/src/tests/cursor-step-over-delete.cc
index 7c57475da6a..4f4d4e8060d 100644
--- a/storage/tokudb/ft-index/src/tests/cursor-step-over-delete.cc
+++ b/storage/tokudb/ft-index/src/tests/cursor-step-over-delete.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock-threads.cc b/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock-threads.cc
index 6227b602df2..d7f7b5d10d6 100644
--- a/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock-threads.cc
+++ b/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock-threads.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock.cc b/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock.cc
index 46109e9592f..3c3d93938f2 100644
--- a/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock.cc
+++ b/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/db-put-simple-lockwait.cc b/storage/tokudb/ft-index/src/tests/db-put-simple-lockwait.cc
index 6466bd2e9ea..a7178d6cc9e 100644
--- a/storage/tokudb/ft-index/src/tests/db-put-simple-lockwait.cc
+++ b/storage/tokudb/ft-index/src/tests/db-put-simple-lockwait.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/db-put-update-deadlock.cc b/storage/tokudb/ft-index/src/tests/db-put-update-deadlock.cc
index cfbf95cd599..2c297318802 100644
--- a/storage/tokudb/ft-index/src/tests/db-put-update-deadlock.cc
+++ b/storage/tokudb/ft-index/src/tests/db-put-update-deadlock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/dbremove-nofile-limit.cc b/storage/tokudb/ft-index/src/tests/dbremove-nofile-limit.cc
index cd8b50c1c5b..8b63b25e6ce 100644
--- a/storage/tokudb/ft-index/src/tests/dbremove-nofile-limit.cc
+++ b/storage/tokudb/ft-index/src/tests/dbremove-nofile-limit.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/del-multiple-huge-primary-row.cc b/storage/tokudb/ft-index/src/tests/del-multiple-huge-primary-row.cc
index f0ee57228ad..613cbf5b1e6 100644
--- a/storage/tokudb/ft-index/src/tests/del-multiple-huge-primary-row.cc
+++ b/storage/tokudb/ft-index/src/tests/del-multiple-huge-primary-row.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/del-multiple-srcdb.cc b/storage/tokudb/ft-index/src/tests/del-multiple-srcdb.cc
index f14ba646e59..b00fb7bbd5d 100644
--- a/storage/tokudb/ft-index/src/tests/del-multiple-srcdb.cc
+++ b/storage/tokudb/ft-index/src/tests/del-multiple-srcdb.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/del-multiple.cc b/storage/tokudb/ft-index/src/tests/del-multiple.cc
index 7f3560fb459..1e3ac77cd2a 100644
--- a/storage/tokudb/ft-index/src/tests/del-multiple.cc
+++ b/storage/tokudb/ft-index/src/tests/del-multiple.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/del-simple.cc b/storage/tokudb/ft-index/src/tests/del-simple.cc
index 6ae08607f48..6d3ce4ad99e 100644
--- a/storage/tokudb/ft-index/src/tests/del-simple.cc
+++ b/storage/tokudb/ft-index/src/tests/del-simple.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/directory_lock.cc b/storage/tokudb/ft-index/src/tests/directory_lock.cc
index c67dfab20c8..22de009afae 100644
--- a/storage/tokudb/ft-index/src/tests/directory_lock.cc
+++ b/storage/tokudb/ft-index/src/tests/directory_lock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/diskfull.cc b/storage/tokudb/ft-index/src/tests/diskfull.cc
index d52f621a174..fb4729064fe 100644
--- a/storage/tokudb/ft-index/src/tests/diskfull.cc
+++ b/storage/tokudb/ft-index/src/tests/diskfull.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/dump-env.cc b/storage/tokudb/ft-index/src/tests/dump-env.cc
index 7815aa5bd63..2cea7b9a5b6 100644
--- a/storage/tokudb/ft-index/src/tests/dump-env.cc
+++ b/storage/tokudb/ft-index/src/tests/dump-env.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/env-put-multiple.cc b/storage/tokudb/ft-index/src/tests/env-put-multiple.cc
index 75ccb0297b3..c6d4140c59c 100644
--- a/storage/tokudb/ft-index/src/tests/env-put-multiple.cc
+++ b/storage/tokudb/ft-index/src/tests/env-put-multiple.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/env_loader_memory.cc b/storage/tokudb/ft-index/src/tests/env_loader_memory.cc
index ed19f05f944..6d7c81f7089 100644
--- a/storage/tokudb/ft-index/src/tests/env_loader_memory.cc
+++ b/storage/tokudb/ft-index/src/tests/env_loader_memory.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/env_nproc.cc b/storage/tokudb/ft-index/src/tests/env_nproc.cc
index 3ed60a18e69..f365dee3979 100644
--- a/storage/tokudb/ft-index/src/tests/env_nproc.cc
+++ b/storage/tokudb/ft-index/src/tests/env_nproc.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/env_startup.cc b/storage/tokudb/ft-index/src/tests/env_startup.cc
index 5be8b9849a0..b4c5696a076 100644
--- a/storage/tokudb/ft-index/src/tests/env_startup.cc
+++ b/storage/tokudb/ft-index/src/tests/env_startup.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/filesize.cc b/storage/tokudb/ft-index/src/tests/filesize.cc
index 6b4c03a358c..6f76a711790 100644
--- a/storage/tokudb/ft-index/src/tests/filesize.cc
+++ b/storage/tokudb/ft-index/src/tests/filesize.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/get_key_after_bytes_unit.cc b/storage/tokudb/ft-index/src/tests/get_key_after_bytes_unit.cc
index 73a6e92b28f..21278e9b9fc 100644
--- a/storage/tokudb/ft-index/src/tests/get_key_after_bytes_unit.cc
+++ b/storage/tokudb/ft-index/src/tests/get_key_after_bytes_unit.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/get_last_key.cc b/storage/tokudb/ft-index/src/tests/get_last_key.cc
index 241652928c5..ba7a4273233 100644
--- a/storage/tokudb/ft-index/src/tests/get_last_key.cc
+++ b/storage/tokudb/ft-index/src/tests/get_last_key.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/helgrind1.cc b/storage/tokudb/ft-index/src/tests/helgrind1.cc
index 49572197fc1..3b707944c43 100644
--- a/storage/tokudb/ft-index/src/tests/helgrind1.cc
+++ b/storage/tokudb/ft-index/src/tests/helgrind1.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/helgrind2.cc b/storage/tokudb/ft-index/src/tests/helgrind2.cc
index d70c4d256df..5c3bb2857e5 100644
--- a/storage/tokudb/ft-index/src/tests/helgrind2.cc
+++ b/storage/tokudb/ft-index/src/tests/helgrind2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/helgrind3.cc b/storage/tokudb/ft-index/src/tests/helgrind3.cc
index 85f909b11f0..f084894a075 100644
--- a/storage/tokudb/ft-index/src/tests/helgrind3.cc
+++ b/storage/tokudb/ft-index/src/tests/helgrind3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hot-optimize-table-tests.cc b/storage/tokudb/ft-index/src/tests/hot-optimize-table-tests.cc
index 42f0ef86e82..adde1b048d3 100644
--- a/storage/tokudb/ft-index/src/tests/hot-optimize-table-tests.cc
+++ b/storage/tokudb/ft-index/src/tests/hot-optimize-table-tests.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-bw.cc b/storage/tokudb/ft-index/src/tests/hotindexer-bw.cc
index eb6b9f1b11b..efb8459fb21 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-bw.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-bw.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-error-callback.cc b/storage/tokudb/ft-index/src/tests/hotindexer-error-callback.cc
index 18e5a0116e1..885270a61f2 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-error-callback.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-error-callback.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-insert-committed-optimized.cc b/storage/tokudb/ft-index/src/tests/hotindexer-insert-committed-optimized.cc
index 9268a5d2370..99b0c7a1fe0 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-insert-committed-optimized.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-insert-committed-optimized.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-insert-committed.cc b/storage/tokudb/ft-index/src/tests/hotindexer-insert-committed.cc
index 81aa83ba9f7..371f0a30b20 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-insert-committed.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-insert-committed.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-insert-provisional.cc b/storage/tokudb/ft-index/src/tests/hotindexer-insert-provisional.cc
index 509f74fbec9..bbf234d7126 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-insert-provisional.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-insert-provisional.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-lock-test.cc b/storage/tokudb/ft-index/src/tests/hotindexer-lock-test.cc
index 16600c76574..f6498568cdd 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-lock-test.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-lock-test.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-multiclient.cc b/storage/tokudb/ft-index/src/tests/hotindexer-multiclient.cc
index 18dc6e5e030..9a8ea7f37ad 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-multiclient.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-multiclient.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-nested-insert-committed.cc b/storage/tokudb/ft-index/src/tests/hotindexer-nested-insert-committed.cc
index 938ee151b69..039d2f37602 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-nested-insert-committed.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-nested-insert-committed.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-put-abort.cc b/storage/tokudb/ft-index/src/tests/hotindexer-put-abort.cc
index f81336cbee4..e837d597a60 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-put-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-put-abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-put-commit.cc b/storage/tokudb/ft-index/src/tests/hotindexer-put-commit.cc
index 2863ef4754c..2c9fc4d4983 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-put-commit.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-put-commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-put-multiple.cc b/storage/tokudb/ft-index/src/tests/hotindexer-put-multiple.cc
index 05e77137ca0..7aabcb3bb6a 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-put-multiple.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-put-multiple.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-simple-abort-put.cc b/storage/tokudb/ft-index/src/tests/hotindexer-simple-abort-put.cc
index 0aabcdbdd4a..9062012de90 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-simple-abort-put.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-simple-abort-put.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-simple-abort.cc b/storage/tokudb/ft-index/src/tests/hotindexer-simple-abort.cc
index 3fddf1d319f..976da489beb 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-simple-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-simple-abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-undo-do-test.cc b/storage/tokudb/ft-index/src/tests/hotindexer-undo-do-test.cc
index 5ef06f62155..d61799fa84b 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-undo-do-test.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-undo-do-test.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-with-queries.cc b/storage/tokudb/ft-index/src/tests/hotindexer-with-queries.cc
index c1be755b4d6..dcd3c5712d5 100644
--- a/storage/tokudb/ft-index/src/tests/hotindexer-with-queries.cc
+++ b/storage/tokudb/ft-index/src/tests/hotindexer-with-queries.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/inflate.cc b/storage/tokudb/ft-index/src/tests/inflate.cc
index 30f8f2199ae..36849aec198 100644
--- a/storage/tokudb/ft-index/src/tests/inflate.cc
+++ b/storage/tokudb/ft-index/src/tests/inflate.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/inflate2.cc b/storage/tokudb/ft-index/src/tests/inflate2.cc
index ce594cf0834..a24f8a6d249 100644
--- a/storage/tokudb/ft-index/src/tests/inflate2.cc
+++ b/storage/tokudb/ft-index/src/tests/inflate2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/insert-dup-prelock.cc b/storage/tokudb/ft-index/src/tests/insert-dup-prelock.cc
index 2ba99d0bc02..247bcb973cb 100644
--- a/storage/tokudb/ft-index/src/tests/insert-dup-prelock.cc
+++ b/storage/tokudb/ft-index/src/tests/insert-dup-prelock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/isolation-read-committed.cc b/storage/tokudb/ft-index/src/tests/isolation-read-committed.cc
index c949482ca16..07425d9684a 100644
--- a/storage/tokudb/ft-index/src/tests/isolation-read-committed.cc
+++ b/storage/tokudb/ft-index/src/tests/isolation-read-committed.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/isolation.cc b/storage/tokudb/ft-index/src/tests/isolation.cc
index dbe4ce9cb4a..75f79b5b41b 100644
--- a/storage/tokudb/ft-index/src/tests/isolation.cc
+++ b/storage/tokudb/ft-index/src/tests/isolation.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/key-val.h b/storage/tokudb/ft-index/src/tests/key-val.h
index 9a4512bfdac..1a7866e3205 100644
--- a/storage/tokudb/ft-index/src/tests/key-val.h
+++ b/storage/tokudb/ft-index/src/tests/key-val.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/keyrange-merge.cc b/storage/tokudb/ft-index/src/tests/keyrange-merge.cc
index b53016053ce..f9eafe9bc78 100644
--- a/storage/tokudb/ft-index/src/tests/keyrange-merge.cc
+++ b/storage/tokudb/ft-index/src/tests/keyrange-merge.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/keyrange.cc b/storage/tokudb/ft-index/src/tests/keyrange.cc
index 85ffcd23357..be4f2542969 100644
--- a/storage/tokudb/ft-index/src/tests/keyrange.cc
+++ b/storage/tokudb/ft-index/src/tests/keyrange.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/last-verify-time.cc b/storage/tokudb/ft-index/src/tests/last-verify-time.cc
index 057a711ffec..648dd4840c4 100644
--- a/storage/tokudb/ft-index/src/tests/last-verify-time.cc
+++ b/storage/tokudb/ft-index/src/tests/last-verify-time.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/loader-cleanup-test.cc b/storage/tokudb/ft-index/src/tests/loader-cleanup-test.cc
index c0f92c448ef..5b431f40461 100644
--- a/storage/tokudb/ft-index/src/tests/loader-cleanup-test.cc
+++ b/storage/tokudb/ft-index/src/tests/loader-cleanup-test.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/loader-close-nproc-limit.cc b/storage/tokudb/ft-index/src/tests/loader-close-nproc-limit.cc
index 262a63294fd..afe56c4841e 100644
--- a/storage/tokudb/ft-index/src/tests/loader-close-nproc-limit.cc
+++ b/storage/tokudb/ft-index/src/tests/loader-close-nproc-limit.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/loader-create-abort.cc b/storage/tokudb/ft-index/src/tests/loader-create-abort.cc
index 3d2cf84cefe..d727fcbc118 100644
--- a/storage/tokudb/ft-index/src/tests/loader-create-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/loader-create-abort.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/loader-create-close.cc b/storage/tokudb/ft-index/src/tests/loader-create-close.cc
index 8a2d043e51f..c0d38f95b41 100644
--- a/storage/tokudb/ft-index/src/tests/loader-create-close.cc
+++ b/storage/tokudb/ft-index/src/tests/loader-create-close.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/loader-create-commit-nproc-limit.cc b/storage/tokudb/ft-index/src/tests/loader-create-commit-nproc-limit.cc
index 62ba70fa4f8..a8dd5fc7978 100644
--- a/storage/tokudb/ft-index/src/tests/loader-create-commit-nproc-limit.cc
+++ b/storage/tokudb/ft-index/src/tests/loader-create-commit-nproc-limit.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/loader-create-nproc-limit.cc b/storage/tokudb/ft-index/src/tests/loader-create-nproc-limit.cc
index 844ca2043c7..13960a44b0c 100644
--- a/storage/tokudb/ft-index/src/tests/loader-create-nproc-limit.cc
+++ b/storage/tokudb/ft-index/src/tests/loader-create-nproc-limit.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/loader-dup-test.cc b/storage/tokudb/ft-index/src/tests/loader-dup-test.cc
index d3bd2aabe57..02f8bfad9bc 100644
--- a/storage/tokudb/ft-index/src/tests/loader-dup-test.cc
+++ b/storage/tokudb/ft-index/src/tests/loader-dup-test.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/loader-no-puts.cc b/storage/tokudb/ft-index/src/tests/loader-no-puts.cc
index c2c11a639a0..8739f03c312 100644
--- a/storage/tokudb/ft-index/src/tests/loader-no-puts.cc
+++ b/storage/tokudb/ft-index/src/tests/loader-no-puts.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/loader-reference-test.cc b/storage/tokudb/ft-index/src/tests/loader-reference-test.cc
index 4bb9334a71f..efdcc4c769f 100644
--- a/storage/tokudb/ft-index/src/tests/loader-reference-test.cc
+++ b/storage/tokudb/ft-index/src/tests/loader-reference-test.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/loader-stress-del.cc b/storage/tokudb/ft-index/src/tests/loader-stress-del.cc
index c9a262222fb..c28ca336e01 100644
--- a/storage/tokudb/ft-index/src/tests/loader-stress-del.cc
+++ b/storage/tokudb/ft-index/src/tests/loader-stress-del.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/loader-stress-test.cc b/storage/tokudb/ft-index/src/tests/loader-stress-test.cc
index b9e51436632..206f0937526 100644
--- a/storage/tokudb/ft-index/src/tests/loader-stress-test.cc
+++ b/storage/tokudb/ft-index/src/tests/loader-stress-test.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/loader-tpch-load.cc b/storage/tokudb/ft-index/src/tests/loader-tpch-load.cc
index c89331a4200..a3f1fc6a40d 100644
--- a/storage/tokudb/ft-index/src/tests/loader-tpch-load.cc
+++ b/storage/tokudb/ft-index/src/tests/loader-tpch-load.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/locktree_escalation_stalls.cc b/storage/tokudb/ft-index/src/tests/locktree_escalation_stalls.cc
index 2a5581077d5..8b9f38d9225 100644
--- a/storage/tokudb/ft-index/src/tests/locktree_escalation_stalls.cc
+++ b/storage/tokudb/ft-index/src/tests/locktree_escalation_stalls.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/manyfiles.cc b/storage/tokudb/ft-index/src/tests/manyfiles.cc
index 4c68f8d86fe..f8633002a0d 100644
--- a/storage/tokudb/ft-index/src/tests/manyfiles.cc
+++ b/storage/tokudb/ft-index/src/tests/manyfiles.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/maxsize-for-loader.cc b/storage/tokudb/ft-index/src/tests/maxsize-for-loader.cc
index a95a42d4870..fb0d58fff02 100644
--- a/storage/tokudb/ft-index/src/tests/maxsize-for-loader.cc
+++ b/storage/tokudb/ft-index/src/tests/maxsize-for-loader.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/medium-nested-commit-commit.cc b/storage/tokudb/ft-index/src/tests/medium-nested-commit-commit.cc
index aab33584391..30fb312424f 100644
--- a/storage/tokudb/ft-index/src/tests/medium-nested-commit-commit.cc
+++ b/storage/tokudb/ft-index/src/tests/medium-nested-commit-commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/multiprocess.cc b/storage/tokudb/ft-index/src/tests/multiprocess.cc
index 93b20d3ad7f..da9b546aa9a 100644
--- a/storage/tokudb/ft-index/src/tests/multiprocess.cc
+++ b/storage/tokudb/ft-index/src/tests/multiprocess.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/mvcc-create-table.cc b/storage/tokudb/ft-index/src/tests/mvcc-create-table.cc
index db1d1616732..97ea51dfbb2 100644
--- a/storage/tokudb/ft-index/src/tests/mvcc-create-table.cc
+++ b/storage/tokudb/ft-index/src/tests/mvcc-create-table.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/mvcc-many-committed.cc b/storage/tokudb/ft-index/src/tests/mvcc-many-committed.cc
index bbb7116b42d..ae0450b8041 100644
--- a/storage/tokudb/ft-index/src/tests/mvcc-many-committed.cc
+++ b/storage/tokudb/ft-index/src/tests/mvcc-many-committed.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/mvcc-read-committed.cc b/storage/tokudb/ft-index/src/tests/mvcc-read-committed.cc
index 6f8d3377c10..f6d295b71b2 100644
--- a/storage/tokudb/ft-index/src/tests/mvcc-read-committed.cc
+++ b/storage/tokudb/ft-index/src/tests/mvcc-read-committed.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/openlimit17-locktree.cc b/storage/tokudb/ft-index/src/tests/openlimit17-locktree.cc
index e9b62752af4..0484d13b1b9 100644
--- a/storage/tokudb/ft-index/src/tests/openlimit17-locktree.cc
+++ b/storage/tokudb/ft-index/src/tests/openlimit17-locktree.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/openlimit17-metafiles.cc b/storage/tokudb/ft-index/src/tests/openlimit17-metafiles.cc
index 29dbeebef7c..e9740d8f7a7 100644
--- a/storage/tokudb/ft-index/src/tests/openlimit17-metafiles.cc
+++ b/storage/tokudb/ft-index/src/tests/openlimit17-metafiles.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/openlimit17.cc b/storage/tokudb/ft-index/src/tests/openlimit17.cc
index 4f322a86f35..6a9082caca2 100644
--- a/storage/tokudb/ft-index/src/tests/openlimit17.cc
+++ b/storage/tokudb/ft-index/src/tests/openlimit17.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_checkpoint_var.cc b/storage/tokudb/ft-index/src/tests/perf_checkpoint_var.cc
index d0d60641cb1..b85eb4e043a 100644
--- a/storage/tokudb/ft-index/src/tests/perf_checkpoint_var.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_checkpoint_var.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_child_txn.cc b/storage/tokudb/ft-index/src/tests/perf_child_txn.cc
index f6d2e8018eb..efb0bd7e8ad 100644
--- a/storage/tokudb/ft-index/src/tests/perf_child_txn.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_child_txn.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_cursor_nop.cc b/storage/tokudb/ft-index/src/tests/perf_cursor_nop.cc
index 4f890ab0ca2..c247900bf82 100644
--- a/storage/tokudb/ft-index/src/tests/perf_cursor_nop.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_cursor_nop.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_iibench.cc b/storage/tokudb/ft-index/src/tests/perf_iibench.cc
index b9d142c65c9..dc7f0fd24b8 100644
--- a/storage/tokudb/ft-index/src/tests/perf_iibench.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_iibench.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_insert.cc b/storage/tokudb/ft-index/src/tests/perf_insert.cc
index 9d621b93c0c..66f34b74903 100644
--- a/storage/tokudb/ft-index/src/tests/perf_insert.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_insert.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_malloc_free.cc b/storage/tokudb/ft-index/src/tests/perf_malloc_free.cc
index ee6ca92edb4..088f0e08d0b 100644
--- a/storage/tokudb/ft-index/src/tests/perf_malloc_free.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_malloc_free.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_nop.cc b/storage/tokudb/ft-index/src/tests/perf_nop.cc
index e6d4d94640f..06fb06cc923 100644
--- a/storage/tokudb/ft-index/src/tests/perf_nop.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_nop.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_ptquery.cc b/storage/tokudb/ft-index/src/tests/perf_ptquery.cc
index 71922782878..9f859c8a703 100644
--- a/storage/tokudb/ft-index/src/tests/perf_ptquery.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_ptquery.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_ptquery2.cc b/storage/tokudb/ft-index/src/tests/perf_ptquery2.cc
index 888081bdb81..0bedda17b29 100644
--- a/storage/tokudb/ft-index/src/tests/perf_ptquery2.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_ptquery2.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_rangequery.cc b/storage/tokudb/ft-index/src/tests/perf_rangequery.cc
index 3d78dd16ab7..489075efabf 100644
--- a/storage/tokudb/ft-index/src/tests/perf_rangequery.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_rangequery.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_read_txn.cc b/storage/tokudb/ft-index/src/tests/perf_read_txn.cc
index 2825f6588ce..627273d277f 100644
--- a/storage/tokudb/ft-index/src/tests/perf_read_txn.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_read_txn.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_read_txn_single_thread.cc b/storage/tokudb/ft-index/src/tests/perf_read_txn_single_thread.cc
index f36b748d853..376e9cfc7eb 100644
--- a/storage/tokudb/ft-index/src/tests/perf_read_txn_single_thread.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_read_txn_single_thread.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_read_write.cc b/storage/tokudb/ft-index/src/tests/perf_read_write.cc
index f5d75f57103..598adab8934 100644
--- a/storage/tokudb/ft-index/src/tests/perf_read_write.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_read_write.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/perf_txn_single_thread.cc b/storage/tokudb/ft-index/src/tests/perf_txn_single_thread.cc
index 52e6d9d7cae..9a165afedc0 100644
--- a/storage/tokudb/ft-index/src/tests/perf_txn_single_thread.cc
+++ b/storage/tokudb/ft-index/src/tests/perf_txn_single_thread.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/powerfail.cc b/storage/tokudb/ft-index/src/tests/powerfail.cc
index 601df047d09..df175812039 100644
--- a/storage/tokudb/ft-index/src/tests/powerfail.cc
+++ b/storage/tokudb/ft-index/src/tests/powerfail.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/preload-db-nested.cc b/storage/tokudb/ft-index/src/tests/preload-db-nested.cc
index 9c0c8282456..44905db5676 100644
--- a/storage/tokudb/ft-index/src/tests/preload-db-nested.cc
+++ b/storage/tokudb/ft-index/src/tests/preload-db-nested.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/preload-db.cc b/storage/tokudb/ft-index/src/tests/preload-db.cc
index 584176bc997..3ece88f47a7 100644
--- a/storage/tokudb/ft-index/src/tests/preload-db.cc
+++ b/storage/tokudb/ft-index/src/tests/preload-db.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/prelock-read-read.cc b/storage/tokudb/ft-index/src/tests/prelock-read-read.cc
index b23c81dd119..b55f5cfaf92 100644
--- a/storage/tokudb/ft-index/src/tests/prelock-read-read.cc
+++ b/storage/tokudb/ft-index/src/tests/prelock-read-read.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/prelock-read-write.cc b/storage/tokudb/ft-index/src/tests/prelock-read-write.cc
index 0a3a3fddf39..eb7f10f455d 100644
--- a/storage/tokudb/ft-index/src/tests/prelock-read-write.cc
+++ b/storage/tokudb/ft-index/src/tests/prelock-read-write.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/prelock-write-read.cc b/storage/tokudb/ft-index/src/tests/prelock-write-read.cc
index 35c194c362d..d894c069d0b 100644
--- a/storage/tokudb/ft-index/src/tests/prelock-write-read.cc
+++ b/storage/tokudb/ft-index/src/tests/prelock-write-read.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/prelock-write-write.cc b/storage/tokudb/ft-index/src/tests/prelock-write-write.cc
index d9f832cdde7..3d34218c2c1 100644
--- a/storage/tokudb/ft-index/src/tests/prelock-write-write.cc
+++ b/storage/tokudb/ft-index/src/tests/prelock-write-write.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/print_engine_status.cc b/storage/tokudb/ft-index/src/tests/print_engine_status.cc
index 34b62bd8fe6..739733500fb 100644
--- a/storage/tokudb/ft-index/src/tests/print_engine_status.cc
+++ b/storage/tokudb/ft-index/src/tests/print_engine_status.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/progress.cc b/storage/tokudb/ft-index/src/tests/progress.cc
index e6af8fb9763..12a07363581 100644
--- a/storage/tokudb/ft-index/src/tests/progress.cc
+++ b/storage/tokudb/ft-index/src/tests/progress.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/put-del-multiple-array-indexing.cc b/storage/tokudb/ft-index/src/tests/put-del-multiple-array-indexing.cc
index 0a29d87369f..db7cbdffcd6 100644
--- a/storage/tokudb/ft-index/src/tests/put-del-multiple-array-indexing.cc
+++ b/storage/tokudb/ft-index/src/tests/put-del-multiple-array-indexing.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/queries_with_deletes.cc b/storage/tokudb/ft-index/src/tests/queries_with_deletes.cc
index a619e5f0f58..e7abc4469b9 100644
--- a/storage/tokudb/ft-index/src/tests/queries_with_deletes.cc
+++ b/storage/tokudb/ft-index/src/tests/queries_with_deletes.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-2483.cc b/storage/tokudb/ft-index/src/tests/recover-2483.cc
index e31361839f8..4c28e75303c 100644
--- a/storage/tokudb/ft-index/src/tests/recover-2483.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-2483.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-3113.cc b/storage/tokudb/ft-index/src/tests/recover-3113.cc
index eeba9baf03c..ba219b5bd6f 100644
--- a/storage/tokudb/ft-index/src/tests/recover-3113.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-3113.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-5146.cc b/storage/tokudb/ft-index/src/tests/recover-5146.cc
index 5e793830f1d..a777af90278 100644
--- a/storage/tokudb/ft-index/src/tests/recover-5146.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-5146.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-checkpoint-fcreate-fdelete-fcreate.cc b/storage/tokudb/ft-index/src/tests/recover-checkpoint-fcreate-fdelete-fcreate.cc
index 0d5d4ff20db..ffb8b4bcef2 100644
--- a/storage/tokudb/ft-index/src/tests/recover-checkpoint-fcreate-fdelete-fcreate.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-checkpoint-fcreate-fdelete-fcreate.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-checkpoint-fopen-abort.cc b/storage/tokudb/ft-index/src/tests/recover-checkpoint-fopen-abort.cc
index bed20966845..6ecdbec4d4c 100644
--- a/storage/tokudb/ft-index/src/tests/recover-checkpoint-fopen-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-checkpoint-fopen-abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-checkpoint-fopen-commit.cc b/storage/tokudb/ft-index/src/tests/recover-checkpoint-fopen-commit.cc
index 2dcdbf6b939..971b77ce615 100644
--- a/storage/tokudb/ft-index/src/tests/recover-checkpoint-fopen-commit.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-checkpoint-fopen-commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-child-rollback.cc b/storage/tokudb/ft-index/src/tests/recover-child-rollback.cc
index 62fbfbda6ef..0ebc9a0c253 100644
--- a/storage/tokudb/ft-index/src/tests/recover-child-rollback.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-child-rollback.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-compare-db-descriptor.cc b/storage/tokudb/ft-index/src/tests/recover-compare-db-descriptor.cc
index 2cbc54efa17..91afe09b3d0 100644
--- a/storage/tokudb/ft-index/src/tests/recover-compare-db-descriptor.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-compare-db-descriptor.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-compare-db.cc b/storage/tokudb/ft-index/src/tests/recover-compare-db.cc
index 6ce16bd479d..f764c706a42 100644
--- a/storage/tokudb/ft-index/src/tests/recover-compare-db.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-compare-db.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-del-multiple-abort.cc b/storage/tokudb/ft-index/src/tests/recover-del-multiple-abort.cc
index 5a7e1710de1..de36eee6fca 100644
--- a/storage/tokudb/ft-index/src/tests/recover-del-multiple-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-del-multiple-abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-del-multiple-srcdb-fdelete-all.cc b/storage/tokudb/ft-index/src/tests/recover-del-multiple-srcdb-fdelete-all.cc
index 632a4805835..3a4d1a06d85 100644
--- a/storage/tokudb/ft-index/src/tests/recover-del-multiple-srcdb-fdelete-all.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-del-multiple-srcdb-fdelete-all.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-del-multiple.cc b/storage/tokudb/ft-index/src/tests/recover-del-multiple.cc
index d4c7303162a..deb316337c4 100644
--- a/storage/tokudb/ft-index/src/tests/recover-del-multiple.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-del-multiple.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-delboth-after-checkpoint.cc b/storage/tokudb/ft-index/src/tests/recover-delboth-after-checkpoint.cc
index 323b5b64ef7..1447b0fd6d1 100644
--- a/storage/tokudb/ft-index/src/tests/recover-delboth-after-checkpoint.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-delboth-after-checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-delboth-checkpoint.cc b/storage/tokudb/ft-index/src/tests/recover-delboth-checkpoint.cc
index 4ee3f5bba66..c0c945f5eae 100644
--- a/storage/tokudb/ft-index/src/tests/recover-delboth-checkpoint.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-delboth-checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-descriptor.cc b/storage/tokudb/ft-index/src/tests/recover-descriptor.cc
index df96b8cbf45..0f853217431 100644
--- a/storage/tokudb/ft-index/src/tests/recover-descriptor.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-descriptor.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-descriptor10.cc b/storage/tokudb/ft-index/src/tests/recover-descriptor10.cc
index db73549eb1f..13fcf9f36b1 100644
--- a/storage/tokudb/ft-index/src/tests/recover-descriptor10.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-descriptor10.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-descriptor11.cc b/storage/tokudb/ft-index/src/tests/recover-descriptor11.cc
index 5d593af25bd..21e79dcad18 100644
--- a/storage/tokudb/ft-index/src/tests/recover-descriptor11.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-descriptor11.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-descriptor12.cc b/storage/tokudb/ft-index/src/tests/recover-descriptor12.cc
index 698fa5d2b63..dc3633051c8 100644
--- a/storage/tokudb/ft-index/src/tests/recover-descriptor12.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-descriptor12.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-descriptor2.cc b/storage/tokudb/ft-index/src/tests/recover-descriptor2.cc
index 62e685962e4..496f8678053 100644
--- a/storage/tokudb/ft-index/src/tests/recover-descriptor2.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-descriptor2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-descriptor3.cc b/storage/tokudb/ft-index/src/tests/recover-descriptor3.cc
index 58d219af9cf..3bb3ba49819 100644
--- a/storage/tokudb/ft-index/src/tests/recover-descriptor3.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-descriptor3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-descriptor4.cc b/storage/tokudb/ft-index/src/tests/recover-descriptor4.cc
index 37d7ca80f1f..8a5dc409af1 100644
--- a/storage/tokudb/ft-index/src/tests/recover-descriptor4.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-descriptor4.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-descriptor5.cc b/storage/tokudb/ft-index/src/tests/recover-descriptor5.cc
index 757116afe19..b42a2430a32 100644
--- a/storage/tokudb/ft-index/src/tests/recover-descriptor5.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-descriptor5.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-descriptor6.cc b/storage/tokudb/ft-index/src/tests/recover-descriptor6.cc
index 68f90b0f276..ebae13eae82 100644
--- a/storage/tokudb/ft-index/src/tests/recover-descriptor6.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-descriptor6.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-descriptor7.cc b/storage/tokudb/ft-index/src/tests/recover-descriptor7.cc
index 9c3a44d01e5..676c27cb1fb 100644
--- a/storage/tokudb/ft-index/src/tests/recover-descriptor7.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-descriptor7.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-descriptor8.cc b/storage/tokudb/ft-index/src/tests/recover-descriptor8.cc
index ac80a3e8a29..7aef9c526c1 100644
--- a/storage/tokudb/ft-index/src/tests/recover-descriptor8.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-descriptor8.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-descriptor9.cc b/storage/tokudb/ft-index/src/tests/recover-descriptor9.cc
index 17da0907374..cf5894b1d7c 100644
--- a/storage/tokudb/ft-index/src/tests/recover-descriptor9.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-descriptor9.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-fassociate.cc b/storage/tokudb/ft-index/src/tests/recover-fassociate.cc
index 81a19f18cd2..cd7896061e2 100644
--- a/storage/tokudb/ft-index/src/tests/recover-fassociate.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-fassociate.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-fclose-in-checkpoint.cc b/storage/tokudb/ft-index/src/tests/recover-fclose-in-checkpoint.cc
index 0519b9ba3c9..a0779381632 100644
--- a/storage/tokudb/ft-index/src/tests/recover-fclose-in-checkpoint.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-fclose-in-checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-fcreate-basementnodesize.cc b/storage/tokudb/ft-index/src/tests/recover-fcreate-basementnodesize.cc
index 25350829505..db910a2695b 100644
--- a/storage/tokudb/ft-index/src/tests/recover-fcreate-basementnodesize.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-fcreate-basementnodesize.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-fcreate-fclose.cc b/storage/tokudb/ft-index/src/tests/recover-fcreate-fclose.cc
index 1dfccc4c3f4..0a6d8c84d1e 100644
--- a/storage/tokudb/ft-index/src/tests/recover-fcreate-fclose.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-fcreate-fclose.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-fcreate-fdelete.cc b/storage/tokudb/ft-index/src/tests/recover-fcreate-fdelete.cc
index 76605330a23..e883292368e 100644
--- a/storage/tokudb/ft-index/src/tests/recover-fcreate-fdelete.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-fcreate-fdelete.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-fcreate-nodesize.cc b/storage/tokudb/ft-index/src/tests/recover-fcreate-nodesize.cc
index 7526c20b474..80fc32a0abc 100644
--- a/storage/tokudb/ft-index/src/tests/recover-fcreate-nodesize.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-fcreate-nodesize.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-fcreate-xabort.cc b/storage/tokudb/ft-index/src/tests/recover-fcreate-xabort.cc
index c18db167449..26f2d2ebb09 100644
--- a/storage/tokudb/ft-index/src/tests/recover-fcreate-xabort.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-fcreate-xabort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-flt1.cc b/storage/tokudb/ft-index/src/tests/recover-flt1.cc
index f395ed8171d..f0bb7947a31 100644
--- a/storage/tokudb/ft-index/src/tests/recover-flt1.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-flt1.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-flt10.cc b/storage/tokudb/ft-index/src/tests/recover-flt10.cc
index ccee07680b6..3cad9590bb7 100644
--- a/storage/tokudb/ft-index/src/tests/recover-flt10.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-flt10.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-flt2.cc b/storage/tokudb/ft-index/src/tests/recover-flt2.cc
index bd6125e2dfe..ef44abd6060 100644
--- a/storage/tokudb/ft-index/src/tests/recover-flt2.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-flt2.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-flt3.cc b/storage/tokudb/ft-index/src/tests/recover-flt3.cc
index f4fa3344e68..457bf4cb6b9 100644
--- a/storage/tokudb/ft-index/src/tests/recover-flt3.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-flt3.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-flt4.cc b/storage/tokudb/ft-index/src/tests/recover-flt4.cc
index d2efee438c9..c2939f7924a 100644
--- a/storage/tokudb/ft-index/src/tests/recover-flt4.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-flt4.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-flt5.cc b/storage/tokudb/ft-index/src/tests/recover-flt5.cc
index d4a4c0cec00..3d3713a1020 100644
--- a/storage/tokudb/ft-index/src/tests/recover-flt5.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-flt5.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-flt6.cc b/storage/tokudb/ft-index/src/tests/recover-flt6.cc
index 184e3933f64..1b50ae46d28 100644
--- a/storage/tokudb/ft-index/src/tests/recover-flt6.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-flt6.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-flt7.cc b/storage/tokudb/ft-index/src/tests/recover-flt7.cc
index e8fce283b71..fc926c4e03f 100644
--- a/storage/tokudb/ft-index/src/tests/recover-flt7.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-flt7.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-flt8.cc b/storage/tokudb/ft-index/src/tests/recover-flt8.cc
index 2f1958b3025..190443aa1ab 100644
--- a/storage/tokudb/ft-index/src/tests/recover-flt8.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-flt8.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-flt9.cc b/storage/tokudb/ft-index/src/tests/recover-flt9.cc
index 28325fbd6c5..a7d9feac2d1 100644
--- a/storage/tokudb/ft-index/src/tests/recover-flt9.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-flt9.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-fopen-checkpoint-fclose.cc b/storage/tokudb/ft-index/src/tests/recover-fopen-checkpoint-fclose.cc
index b8019b1ec79..60b62badc03 100644
--- a/storage/tokudb/ft-index/src/tests/recover-fopen-checkpoint-fclose.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-fopen-checkpoint-fclose.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-fopen-fclose-checkpoint.cc b/storage/tokudb/ft-index/src/tests/recover-fopen-fclose-checkpoint.cc
index bb750cd3c8d..d2f449c864d 100644
--- a/storage/tokudb/ft-index/src/tests/recover-fopen-fclose-checkpoint.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-fopen-fclose-checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-fopen-fdelete-checkpoint-fcreate.cc b/storage/tokudb/ft-index/src/tests/recover-fopen-fdelete-checkpoint-fcreate.cc
index e745b666f86..a8be31f9b67 100644
--- a/storage/tokudb/ft-index/src/tests/recover-fopen-fdelete-checkpoint-fcreate.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-fopen-fdelete-checkpoint-fcreate.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-hotindexer-simple-abort-put.cc b/storage/tokudb/ft-index/src/tests/recover-hotindexer-simple-abort-put.cc
index ae99abb1082..8db8618b6f0 100644
--- a/storage/tokudb/ft-index/src/tests/recover-hotindexer-simple-abort-put.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-hotindexer-simple-abort-put.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-loader-test.cc b/storage/tokudb/ft-index/src/tests/recover-loader-test.cc
index 381a0c600ba..e2320ab57b1 100644
--- a/storage/tokudb/ft-index/src/tests/recover-loader-test.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-loader-test.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-lsn-filter-multiple.cc b/storage/tokudb/ft-index/src/tests/recover-lsn-filter-multiple.cc
index 465f8cffab7..b8296d0f3ab 100644
--- a/storage/tokudb/ft-index/src/tests/recover-lsn-filter-multiple.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-lsn-filter-multiple.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-lsn-filter.cc b/storage/tokudb/ft-index/src/tests/recover-lsn-filter.cc
index 9877923c50c..f979145d4eb 100644
--- a/storage/tokudb/ft-index/src/tests/recover-lsn-filter.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-lsn-filter.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-missing-dbfile-2.cc b/storage/tokudb/ft-index/src/tests/recover-missing-dbfile-2.cc
index 691ffc36162..1cbfd3b73a6 100644
--- a/storage/tokudb/ft-index/src/tests/recover-missing-dbfile-2.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-missing-dbfile-2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-missing-dbfile.cc b/storage/tokudb/ft-index/src/tests/recover-missing-dbfile.cc
index 5af1644176b..01b16676907 100644
--- a/storage/tokudb/ft-index/src/tests/recover-missing-dbfile.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-missing-dbfile.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-missing-logfile.cc b/storage/tokudb/ft-index/src/tests/recover-missing-logfile.cc
index 51681ad0ea8..6980f5fc4ff 100644
--- a/storage/tokudb/ft-index/src/tests/recover-missing-logfile.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-missing-logfile.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-put-multiple-abort.cc b/storage/tokudb/ft-index/src/tests/recover-put-multiple-abort.cc
index abfa78a9283..63ff09220fd 100644
--- a/storage/tokudb/ft-index/src/tests/recover-put-multiple-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-put-multiple-abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-put-multiple-fdelete-all.cc b/storage/tokudb/ft-index/src/tests/recover-put-multiple-fdelete-all.cc
index e65667a0e4f..8347455f36d 100644
--- a/storage/tokudb/ft-index/src/tests/recover-put-multiple-fdelete-all.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-put-multiple-fdelete-all.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-put-multiple-fdelete-some.cc b/storage/tokudb/ft-index/src/tests/recover-put-multiple-fdelete-some.cc
index 4f37a9adf67..e097a46bab1 100644
--- a/storage/tokudb/ft-index/src/tests/recover-put-multiple-fdelete-some.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-put-multiple-fdelete-some.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-put-multiple-srcdb-fdelete-all.cc b/storage/tokudb/ft-index/src/tests/recover-put-multiple-srcdb-fdelete-all.cc
index e612e4d4c9a..aaef9c60a08 100644
--- a/storage/tokudb/ft-index/src/tests/recover-put-multiple-srcdb-fdelete-all.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-put-multiple-srcdb-fdelete-all.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-put-multiple.cc b/storage/tokudb/ft-index/src/tests/recover-put-multiple.cc
index 21a68384860..f6b82ac18ab 100644
--- a/storage/tokudb/ft-index/src/tests/recover-put-multiple.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-put-multiple.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-rollback.cc b/storage/tokudb/ft-index/src/tests/recover-rollback.cc
index 2d976c05b5a..9fd3b89c619 100644
--- a/storage/tokudb/ft-index/src/tests/recover-rollback.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-rollback.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-rollinclude.cc b/storage/tokudb/ft-index/src/tests/recover-rollinclude.cc
index 5a3a89a4052..75a6c511af7 100644
--- a/storage/tokudb/ft-index/src/tests/recover-rollinclude.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-rollinclude.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-split-checkpoint.cc b/storage/tokudb/ft-index/src/tests/recover-split-checkpoint.cc
index 4e6b3d16d98..860d20d23e0 100644
--- a/storage/tokudb/ft-index/src/tests/recover-split-checkpoint.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-split-checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-straddle-txn-nested.cc b/storage/tokudb/ft-index/src/tests/recover-straddle-txn-nested.cc
index 03887ac19e5..f6b206b7eaf 100644
--- a/storage/tokudb/ft-index/src/tests/recover-straddle-txn-nested.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-straddle-txn-nested.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-straddle-txn.cc b/storage/tokudb/ft-index/src/tests/recover-straddle-txn.cc
index a728a7de17d..5c96deacc6e 100644
--- a/storage/tokudb/ft-index/src/tests/recover-straddle-txn.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-straddle-txn.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-tablelock.cc b/storage/tokudb/ft-index/src/tests/recover-tablelock.cc
index eb2a4318a20..0ebe25d18c5 100644
--- a/storage/tokudb/ft-index/src/tests/recover-tablelock.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-tablelock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-test-logsuppress-put.cc b/storage/tokudb/ft-index/src/tests/recover-test-logsuppress-put.cc
index c022fdf6243..25781feb8e1 100644
--- a/storage/tokudb/ft-index/src/tests/recover-test-logsuppress-put.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-test-logsuppress-put.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-test-logsuppress.cc b/storage/tokudb/ft-index/src/tests/recover-test-logsuppress.cc
index 020cfbd6122..ca338d42a49 100644
--- a/storage/tokudb/ft-index/src/tests/recover-test-logsuppress.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-test-logsuppress.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-test1.cc b/storage/tokudb/ft-index/src/tests/recover-test1.cc
index 6529d6ac968..a22c5e3857e 100644
--- a/storage/tokudb/ft-index/src/tests/recover-test1.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-test1.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-test2.cc b/storage/tokudb/ft-index/src/tests/recover-test2.cc
index e6bf69b92fe..4be4f4eedeb 100644
--- a/storage/tokudb/ft-index/src/tests/recover-test2.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-test2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-test3.cc b/storage/tokudb/ft-index/src/tests/recover-test3.cc
index fa40c494a96..28a642044b8 100644
--- a/storage/tokudb/ft-index/src/tests/recover-test3.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-test3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-test_crash_in_flusher_thread.h b/storage/tokudb/ft-index/src/tests/recover-test_crash_in_flusher_thread.h
index 82d57b48867..3b29c8b822b 100644
--- a/storage/tokudb/ft-index/src/tests/recover-test_crash_in_flusher_thread.h
+++ b/storage/tokudb/ft-index/src/tests/recover-test_crash_in_flusher_thread.h
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-test_stress1.cc b/storage/tokudb/ft-index/src/tests/recover-test_stress1.cc
index a45667cd8a1..1ec2f1196e2 100644
--- a/storage/tokudb/ft-index/src/tests/recover-test_stress1.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-test_stress1.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-test_stress2.cc b/storage/tokudb/ft-index/src/tests/recover-test_stress2.cc
index e78f8a222b1..691483e0191 100644
--- a/storage/tokudb/ft-index/src/tests/recover-test_stress2.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-test_stress2.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-test_stress3.cc b/storage/tokudb/ft-index/src/tests/recover-test_stress3.cc
index 9794271ec6b..ea9fe9f4a45 100644
--- a/storage/tokudb/ft-index/src/tests/recover-test_stress3.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-test_stress3.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-test_stress_openclose.cc b/storage/tokudb/ft-index/src/tests/recover-test_stress_openclose.cc
index e84c9f2c9f6..c12b0437f67 100644
--- a/storage/tokudb/ft-index/src/tests/recover-test_stress_openclose.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-test_stress_openclose.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update-multiple-abort.cc b/storage/tokudb/ft-index/src/tests/recover-update-multiple-abort.cc
index 4d0e0164aa3..64e58a101d9 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update-multiple-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update-multiple-abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update-multiple.cc b/storage/tokudb/ft-index/src/tests/recover-update-multiple.cc
index fe436c95a4d..b607c88a7fd 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update-multiple.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update-multiple.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_aborts.cc b/storage/tokudb/ft-index/src/tests/recover-update_aborts.cc
index 82ffd511c2a..1fbd52ec7e6 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_aborts.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_aborts.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_aborts_before_checkpoint.cc b/storage/tokudb/ft-index/src/tests/recover-update_aborts_before_checkpoint.cc
index 46723760c88..39cec3bab39 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_aborts_before_checkpoint.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_aborts_before_checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_aborts_before_close.cc b/storage/tokudb/ft-index/src/tests/recover-update_aborts_before_close.cc
index feac9dba77d..4d5b3c8a6d1 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_aborts_before_close.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_aborts_before_close.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts.cc b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts.cc
index 05904b0ae7f..1c6be6f0f87 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts2.cc b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts2.cc
index d88d483bd17..420de9ecc3c 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts2.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts3.cc b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts3.cc
index c1f1baada13..3ac66ed1f76 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts3.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts_before_checkpoint.cc b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts_before_checkpoint.cc
index 0768def9255..af94978ccf9 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts_before_checkpoint.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts_before_checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts_before_close.cc b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts_before_close.cc
index 0d18ad7bacb..a61c9beaa14 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts_before_close.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_aborts_before_close.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values.cc b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values.cc
index b8cd95c91b6..b29892bc1e0 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values2.cc b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values2.cc
index f1a776bc7f5..45bd122925e 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values2.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values3.cc b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values3.cc
index 9ec99677ad0..2f8771798ed 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values3.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values_before_checkpoint.cc b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values_before_checkpoint.cc
index 8197f8ad2fe..f9c6944feba 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values_before_checkpoint.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values_before_checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values_before_close.cc b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values_before_close.cc
index 8d462e82f57..993110dfcba 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values_before_close.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_broadcast_changes_values_before_close.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_changes_values.cc b/storage/tokudb/ft-index/src/tests/recover-update_changes_values.cc
index 65a55a12125..f32e0808e62 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_changes_values.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_changes_values.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_changes_values_before_checkpoint.cc b/storage/tokudb/ft-index/src/tests/recover-update_changes_values_before_checkpoint.cc
index ab97b660724..92278e68015 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_changes_values_before_checkpoint.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_changes_values_before_checkpoint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-update_changes_values_before_close.cc b/storage/tokudb/ft-index/src/tests/recover-update_changes_values_before_close.cc
index f17edbd1317..8341b4272a5 100644
--- a/storage/tokudb/ft-index/src/tests/recover-update_changes_values_before_close.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-update_changes_values_before_close.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor-multihandle.cc b/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor-multihandle.cc
index c2b8543dba8..1630be213a9 100644
--- a/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor-multihandle.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor-multihandle.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor.cc b/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor.cc
index 9db973bc13b..97bda607569 100644
--- a/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-x1-abort.cc b/storage/tokudb/ft-index/src/tests/recover-x1-abort.cc
index c962f9c1c29..b21aae2c3ea 100644
--- a/storage/tokudb/ft-index/src/tests/recover-x1-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-x1-abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-x1-commit.cc b/storage/tokudb/ft-index/src/tests/recover-x1-commit.cc
index 2c0883294e4..27a8c0f4a28 100644
--- a/storage/tokudb/ft-index/src/tests/recover-x1-commit.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-x1-commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-x1-nested-abort.cc b/storage/tokudb/ft-index/src/tests/recover-x1-nested-abort.cc
index b23235b2af8..249dd5ad24b 100644
--- a/storage/tokudb/ft-index/src/tests/recover-x1-nested-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-x1-nested-abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-x1-nested-commit.cc b/storage/tokudb/ft-index/src/tests/recover-x1-nested-commit.cc
index 0426ac54cd7..013c3aebfa5 100644
--- a/storage/tokudb/ft-index/src/tests/recover-x1-nested-commit.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-x1-nested-commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-x2-abort.cc b/storage/tokudb/ft-index/src/tests/recover-x2-abort.cc
index 9335aa5e7fb..6ad11fc6243 100644
--- a/storage/tokudb/ft-index/src/tests/recover-x2-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-x2-abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recover-x2-commit.cc b/storage/tokudb/ft-index/src/tests/recover-x2-commit.cc
index 4a2dfa8013b..54c6b35ff64 100644
--- a/storage/tokudb/ft-index/src/tests/recover-x2-commit.cc
+++ b/storage/tokudb/ft-index/src/tests/recover-x2-commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recovery_fileops_stress.cc b/storage/tokudb/ft-index/src/tests/recovery_fileops_stress.cc
index 4ac3bccf0a2..7fcc217a836 100644
--- a/storage/tokudb/ft-index/src/tests/recovery_fileops_stress.cc
+++ b/storage/tokudb/ft-index/src/tests/recovery_fileops_stress.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recovery_fileops_unit.cc b/storage/tokudb/ft-index/src/tests/recovery_fileops_unit.cc
index 9c9681ae5e6..c5c4072274b 100644
--- a/storage/tokudb/ft-index/src/tests/recovery_fileops_unit.cc
+++ b/storage/tokudb/ft-index/src/tests/recovery_fileops_unit.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/recovery_stress.cc b/storage/tokudb/ft-index/src/tests/recovery_stress.cc
index 8e704bbc3f6..d7121fc8dfb 100644
--- a/storage/tokudb/ft-index/src/tests/recovery_stress.cc
+++ b/storage/tokudb/ft-index/src/tests/recovery_stress.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/redirect.cc b/storage/tokudb/ft-index/src/tests/redirect.cc
index 9cf9d979f2f..566f63d381b 100644
--- a/storage/tokudb/ft-index/src/tests/redirect.cc
+++ b/storage/tokudb/ft-index/src/tests/redirect.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/replace-into-write-lock.cc b/storage/tokudb/ft-index/src/tests/replace-into-write-lock.cc
index 77a03436407..c806c01aaf0 100644
--- a/storage/tokudb/ft-index/src/tests/replace-into-write-lock.cc
+++ b/storage/tokudb/ft-index/src/tests/replace-into-write-lock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/root_fifo_1.cc b/storage/tokudb/ft-index/src/tests/root_fifo_1.cc
index c83fe05c9fa..23ab16aba20 100644
--- a/storage/tokudb/ft-index/src/tests/root_fifo_1.cc
+++ b/storage/tokudb/ft-index/src/tests/root_fifo_1.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/root_fifo_2.cc b/storage/tokudb/ft-index/src/tests/root_fifo_2.cc
index 1902774cd99..697cc2850f4 100644
--- a/storage/tokudb/ft-index/src/tests/root_fifo_2.cc
+++ b/storage/tokudb/ft-index/src/tests/root_fifo_2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/root_fifo_31.cc b/storage/tokudb/ft-index/src/tests/root_fifo_31.cc
index 495073c8e82..726d89af893 100644
--- a/storage/tokudb/ft-index/src/tests/root_fifo_31.cc
+++ b/storage/tokudb/ft-index/src/tests/root_fifo_31.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/root_fifo_32.cc b/storage/tokudb/ft-index/src/tests/root_fifo_32.cc
index d75f81dc012..acd9a3f808e 100644
--- a/storage/tokudb/ft-index/src/tests/root_fifo_32.cc
+++ b/storage/tokudb/ft-index/src/tests/root_fifo_32.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/root_fifo_41.cc b/storage/tokudb/ft-index/src/tests/root_fifo_41.cc
index 91fb63985d8..09e41c8b06e 100644
--- a/storage/tokudb/ft-index/src/tests/root_fifo_41.cc
+++ b/storage/tokudb/ft-index/src/tests/root_fifo_41.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/rowsize.cc b/storage/tokudb/ft-index/src/tests/rowsize.cc
index 7e84173006b..b36847d8e93 100644
--- a/storage/tokudb/ft-index/src/tests/rowsize.cc
+++ b/storage/tokudb/ft-index/src/tests/rowsize.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/seqinsert.cc b/storage/tokudb/ft-index/src/tests/seqinsert.cc
index 85d20bf8941..a11ee3371bb 100644
--- a/storage/tokudb/ft-index/src/tests/seqinsert.cc
+++ b/storage/tokudb/ft-index/src/tests/seqinsert.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/shutdown-3344.cc b/storage/tokudb/ft-index/src/tests/shutdown-3344.cc
index 94716b558ec..a82e0a4aa2d 100644
--- a/storage/tokudb/ft-index/src/tests/shutdown-3344.cc
+++ b/storage/tokudb/ft-index/src/tests/shutdown-3344.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/simple.cc b/storage/tokudb/ft-index/src/tests/simple.cc
index 0733a005283..ba457c5d2a8 100644
--- a/storage/tokudb/ft-index/src/tests/simple.cc
+++ b/storage/tokudb/ft-index/src/tests/simple.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/stat64-create-modify-times.cc b/storage/tokudb/ft-index/src/tests/stat64-create-modify-times.cc
index 46c25dc7208..8ea42cd185c 100644
--- a/storage/tokudb/ft-index/src/tests/stat64-create-modify-times.cc
+++ b/storage/tokudb/ft-index/src/tests/stat64-create-modify-times.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/stat64-null-txn.cc b/storage/tokudb/ft-index/src/tests/stat64-null-txn.cc
index 3ca90823b86..e2863e0b19f 100644
--- a/storage/tokudb/ft-index/src/tests/stat64-null-txn.cc
+++ b/storage/tokudb/ft-index/src/tests/stat64-null-txn.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/stat64-root-changes.cc b/storage/tokudb/ft-index/src/tests/stat64-root-changes.cc
index 80cf022f946..dacf965b355 100644
--- a/storage/tokudb/ft-index/src/tests/stat64-root-changes.cc
+++ b/storage/tokudb/ft-index/src/tests/stat64-root-changes.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/stat64.cc b/storage/tokudb/ft-index/src/tests/stat64.cc
index 8e115fc20d6..d7e228c4f21 100644
--- a/storage/tokudb/ft-index/src/tests/stat64.cc
+++ b/storage/tokudb/ft-index/src/tests/stat64.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/stress-gc.cc b/storage/tokudb/ft-index/src/tests/stress-gc.cc
index c67f9b8ed40..0e0c8619087 100644
--- a/storage/tokudb/ft-index/src/tests/stress-gc.cc
+++ b/storage/tokudb/ft-index/src/tests/stress-gc.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/stress-gc2.cc b/storage/tokudb/ft-index/src/tests/stress-gc2.cc
index d0a63a874ec..4c363afe80c 100644
--- a/storage/tokudb/ft-index/src/tests/stress-gc2.cc
+++ b/storage/tokudb/ft-index/src/tests/stress-gc2.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/stress-test.cc b/storage/tokudb/ft-index/src/tests/stress-test.cc
index 87238a62d18..69af236e231 100644
--- a/storage/tokudb/ft-index/src/tests/stress-test.cc
+++ b/storage/tokudb/ft-index/src/tests/stress-test.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/stress_openclose.h b/storage/tokudb/ft-index/src/tests/stress_openclose.h
index ab15960a310..53f3f28be01 100644
--- a/storage/tokudb/ft-index/src/tests/stress_openclose.h
+++ b/storage/tokudb/ft-index/src/tests/stress_openclose.h
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test-5138.cc b/storage/tokudb/ft-index/src/tests/test-5138.cc
index 546fe6d9368..374c9b082fe 100644
--- a/storage/tokudb/ft-index/src/tests/test-5138.cc
+++ b/storage/tokudb/ft-index/src/tests/test-5138.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test-nested-xopen-eclose.cc b/storage/tokudb/ft-index/src/tests/test-nested-xopen-eclose.cc
index e78d2130ea3..12870b70de6 100644
--- a/storage/tokudb/ft-index/src/tests/test-nested-xopen-eclose.cc
+++ b/storage/tokudb/ft-index/src/tests/test-nested-xopen-eclose.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test-prepare.cc b/storage/tokudb/ft-index/src/tests/test-prepare.cc
index 73d2105fa86..b652a4d8a31 100644
--- a/storage/tokudb/ft-index/src/tests/test-prepare.cc
+++ b/storage/tokudb/ft-index/src/tests/test-prepare.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test-prepare2.cc b/storage/tokudb/ft-index/src/tests/test-prepare2.cc
index 12d78e4da7c..67b00577fd4 100644
--- a/storage/tokudb/ft-index/src/tests/test-prepare2.cc
+++ b/storage/tokudb/ft-index/src/tests/test-prepare2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test-prepare3.cc b/storage/tokudb/ft-index/src/tests/test-prepare3.cc
index 30c5c728e94..9fcc6c235bd 100644
--- a/storage/tokudb/ft-index/src/tests/test-prepare3.cc
+++ b/storage/tokudb/ft-index/src/tests/test-prepare3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test-rollinclude.cc b/storage/tokudb/ft-index/src/tests/test-rollinclude.cc
index 6ece4beb671..224a4d8f4fc 100644
--- a/storage/tokudb/ft-index/src/tests/test-rollinclude.cc
+++ b/storage/tokudb/ft-index/src/tests/test-rollinclude.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test-xa-prepare.cc b/storage/tokudb/ft-index/src/tests/test-xa-prepare.cc
index d3b1352f55d..4f30c6ed2a9 100644
--- a/storage/tokudb/ft-index/src/tests/test-xa-prepare.cc
+++ b/storage/tokudb/ft-index/src/tests/test-xa-prepare.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test-xopen-eclose.cc b/storage/tokudb/ft-index/src/tests/test-xopen-eclose.cc
index 82f2bc6d159..aed84704bde 100644
--- a/storage/tokudb/ft-index/src/tests/test-xopen-eclose.cc
+++ b/storage/tokudb/ft-index/src/tests/test-xopen-eclose.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test.h b/storage/tokudb/ft-index/src/tests/test.h
index c8e98862038..e2c4781ec64 100644
--- a/storage/tokudb/ft-index/src/tests/test.h
+++ b/storage/tokudb/ft-index/src/tests/test.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test1572.cc b/storage/tokudb/ft-index/src/tests/test1572.cc
index 0ea04a9c401..3b2d03db897 100644
--- a/storage/tokudb/ft-index/src/tests/test1572.cc
+++ b/storage/tokudb/ft-index/src/tests/test1572.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test1753.cc b/storage/tokudb/ft-index/src/tests/test1753.cc
index e50b828c92c..a0ad440fdb1 100644
--- a/storage/tokudb/ft-index/src/tests/test1753.cc
+++ b/storage/tokudb/ft-index/src/tests/test1753.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test1842.cc b/storage/tokudb/ft-index/src/tests/test1842.cc
index 20b014d4a33..7b3950246b0 100644
--- a/storage/tokudb/ft-index/src/tests/test1842.cc
+++ b/storage/tokudb/ft-index/src/tests/test1842.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test3039.cc b/storage/tokudb/ft-index/src/tests/test3039.cc
index 35b22b374c0..20592fe396f 100644
--- a/storage/tokudb/ft-index/src/tests/test3039.cc
+++ b/storage/tokudb/ft-index/src/tests/test3039.cc
@@ -32,7 +32,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test3219.cc b/storage/tokudb/ft-index/src/tests/test3219.cc
index d5de370fd60..685ec370ba0 100644
--- a/storage/tokudb/ft-index/src/tests/test3219.cc
+++ b/storage/tokudb/ft-index/src/tests/test3219.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test3522.cc b/storage/tokudb/ft-index/src/tests/test3522.cc
index 7166c561f70..e787d4bf52f 100644
--- a/storage/tokudb/ft-index/src/tests/test3522.cc
+++ b/storage/tokudb/ft-index/src/tests/test3522.cc
@@ -31,7 +31,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test3522b.cc b/storage/tokudb/ft-index/src/tests/test3522b.cc
index 09c9807dd2b..3e4db99cf0f 100644
--- a/storage/tokudb/ft-index/src/tests/test3522b.cc
+++ b/storage/tokudb/ft-index/src/tests/test3522b.cc
@@ -32,7 +32,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test3529.cc b/storage/tokudb/ft-index/src/tests/test3529.cc
index 2c605c3028a..d6f67ce0005 100644
--- a/storage/tokudb/ft-index/src/tests/test3529.cc
+++ b/storage/tokudb/ft-index/src/tests/test3529.cc
@@ -36,7 +36,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test4573-logtrim.cc b/storage/tokudb/ft-index/src/tests/test4573-logtrim.cc
index 9dba89f04f1..99df8f8af8f 100644
--- a/storage/tokudb/ft-index/src/tests/test4573-logtrim.cc
+++ b/storage/tokudb/ft-index/src/tests/test4573-logtrim.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test5092.cc b/storage/tokudb/ft-index/src/tests/test5092.cc
index 8ef31ae0340..4589f58f8e6 100644
--- a/storage/tokudb/ft-index/src/tests/test5092.cc
+++ b/storage/tokudb/ft-index/src/tests/test5092.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test938.cc b/storage/tokudb/ft-index/src/tests/test938.cc
index d6896894b54..bdff072cd20 100644
--- a/storage/tokudb/ft-index/src/tests/test938.cc
+++ b/storage/tokudb/ft-index/src/tests/test938.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test938b.cc b/storage/tokudb/ft-index/src/tests/test938b.cc
index 78830d8d4c8..62e1ad994d0 100644
--- a/storage/tokudb/ft-index/src/tests/test938b.cc
+++ b/storage/tokudb/ft-index/src/tests/test938b.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test938c.cc b/storage/tokudb/ft-index/src/tests/test938c.cc
index 154bf05862d..11879f3ab04 100644
--- a/storage/tokudb/ft-index/src/tests/test938c.cc
+++ b/storage/tokudb/ft-index/src/tests/test938c.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_3529_insert_2.cc b/storage/tokudb/ft-index/src/tests/test_3529_insert_2.cc
index d024143415d..0a354597e56 100644
--- a/storage/tokudb/ft-index/src/tests/test_3529_insert_2.cc
+++ b/storage/tokudb/ft-index/src/tests/test_3529_insert_2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_3529_table_lock.cc b/storage/tokudb/ft-index/src/tests/test_3529_table_lock.cc
index cb9137a10a0..feeb621273c 100644
--- a/storage/tokudb/ft-index/src/tests/test_3529_table_lock.cc
+++ b/storage/tokudb/ft-index/src/tests/test_3529_table_lock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_3645.cc b/storage/tokudb/ft-index/src/tests/test_3645.cc
index 1e7c3b5faf6..f32f39f6ed4 100644
--- a/storage/tokudb/ft-index/src/tests/test_3645.cc
+++ b/storage/tokudb/ft-index/src/tests/test_3645.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_3755.cc b/storage/tokudb/ft-index/src/tests/test_3755.cc
index a678352ba19..3eb3636ad4b 100644
--- a/storage/tokudb/ft-index/src/tests/test_3755.cc
+++ b/storage/tokudb/ft-index/src/tests/test_3755.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_4015.cc b/storage/tokudb/ft-index/src/tests/test_4015.cc
index c0538b7976c..c0ec7eba844 100644
--- a/storage/tokudb/ft-index/src/tests/test_4015.cc
+++ b/storage/tokudb/ft-index/src/tests/test_4015.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_4368.cc b/storage/tokudb/ft-index/src/tests/test_4368.cc
index ab55a6ee173..616056061f9 100644
--- a/storage/tokudb/ft-index/src/tests/test_4368.cc
+++ b/storage/tokudb/ft-index/src/tests/test_4368.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_4657.cc b/storage/tokudb/ft-index/src/tests/test_4657.cc
index 6ab9ce56d73..5ad49a7aa50 100644
--- a/storage/tokudb/ft-index/src/tests/test_4657.cc
+++ b/storage/tokudb/ft-index/src/tests/test_4657.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_5015.cc b/storage/tokudb/ft-index/src/tests/test_5015.cc
index 50900d342d0..898c7f90a49 100644
--- a/storage/tokudb/ft-index/src/tests/test_5015.cc
+++ b/storage/tokudb/ft-index/src/tests/test_5015.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_5469.cc b/storage/tokudb/ft-index/src/tests/test_5469.cc
index cbbcb3721cb..64c42298dea 100644
--- a/storage/tokudb/ft-index/src/tests/test_5469.cc
+++ b/storage/tokudb/ft-index/src/tests/test_5469.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_789.cc b/storage/tokudb/ft-index/src/tests/test_789.cc
index 31cdd6ef777..f7ab7c624ab 100644
--- a/storage/tokudb/ft-index/src/tests/test_789.cc
+++ b/storage/tokudb/ft-index/src/tests/test_789.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_935.cc b/storage/tokudb/ft-index/src/tests/test_935.cc
index a676db32460..04a293bc6ed 100644
--- a/storage/tokudb/ft-index/src/tests/test_935.cc
+++ b/storage/tokudb/ft-index/src/tests/test_935.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_abort1.cc b/storage/tokudb/ft-index/src/tests/test_abort1.cc
index 7a8b3384ce8..d3762d9fa84 100644
--- a/storage/tokudb/ft-index/src/tests/test_abort1.cc
+++ b/storage/tokudb/ft-index/src/tests/test_abort1.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_abort2.cc b/storage/tokudb/ft-index/src/tests/test_abort2.cc
index 881bc97ad1b..f9851db36b9 100644
--- a/storage/tokudb/ft-index/src/tests/test_abort2.cc
+++ b/storage/tokudb/ft-index/src/tests/test_abort2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_abort3.cc b/storage/tokudb/ft-index/src/tests/test_abort3.cc
index 4542ad3b1c4..3145e9cc5b3 100644
--- a/storage/tokudb/ft-index/src/tests/test_abort3.cc
+++ b/storage/tokudb/ft-index/src/tests/test_abort3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_abort4.cc b/storage/tokudb/ft-index/src/tests/test_abort4.cc
index 29581dc6285..680ceb98f43 100644
--- a/storage/tokudb/ft-index/src/tests/test_abort4.cc
+++ b/storage/tokudb/ft-index/src/tests/test_abort4.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_abort5.cc b/storage/tokudb/ft-index/src/tests/test_abort5.cc
index 34bf564d9ac..1592d04fb41 100644
--- a/storage/tokudb/ft-index/src/tests/test_abort5.cc
+++ b/storage/tokudb/ft-index/src/tests/test_abort5.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_abort_delete_first.cc b/storage/tokudb/ft-index/src/tests/test_abort_delete_first.cc
index fb983474462..1ce0d4f8a08 100644
--- a/storage/tokudb/ft-index/src/tests/test_abort_delete_first.cc
+++ b/storage/tokudb/ft-index/src/tests/test_abort_delete_first.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_archive0.cc b/storage/tokudb/ft-index/src/tests/test_archive0.cc
index 8ffa87e2a6d..a9604e4be39 100644
--- a/storage/tokudb/ft-index/src/tests/test_archive0.cc
+++ b/storage/tokudb/ft-index/src/tests/test_archive0.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_archive1.cc b/storage/tokudb/ft-index/src/tests/test_archive1.cc
index 5208a5eb1b6..c4b4ec884dd 100644
--- a/storage/tokudb/ft-index/src/tests/test_archive1.cc
+++ b/storage/tokudb/ft-index/src/tests/test_archive1.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_archive2.cc b/storage/tokudb/ft-index/src/tests/test_archive2.cc
index faa73171f7e..cfdf3989cf2 100644
--- a/storage/tokudb/ft-index/src/tests/test_archive2.cc
+++ b/storage/tokudb/ft-index/src/tests/test_archive2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_bad_implicit_promotion.cc b/storage/tokudb/ft-index/src/tests/test_bad_implicit_promotion.cc
index c7555d2d3f6..39421ce45a0 100644
--- a/storage/tokudb/ft-index/src/tests/test_bad_implicit_promotion.cc
+++ b/storage/tokudb/ft-index/src/tests/test_bad_implicit_promotion.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_blobs_leaf_split.cc b/storage/tokudb/ft-index/src/tests/test_blobs_leaf_split.cc
index eae30421f79..b23265ea243 100644
--- a/storage/tokudb/ft-index/src/tests/test_blobs_leaf_split.cc
+++ b/storage/tokudb/ft-index/src/tests/test_blobs_leaf_split.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_bulk_fetch.cc b/storage/tokudb/ft-index/src/tests/test_bulk_fetch.cc
index 800212a6751..5f866832592 100644
--- a/storage/tokudb/ft-index/src/tests/test_bulk_fetch.cc
+++ b/storage/tokudb/ft-index/src/tests/test_bulk_fetch.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cachesize.cc b/storage/tokudb/ft-index/src/tests/test_cachesize.cc
index d161dd89033..577b6f703c6 100644
--- a/storage/tokudb/ft-index/src/tests/test_cachesize.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cachesize.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cmp_descriptor.cc b/storage/tokudb/ft-index/src/tests/test_cmp_descriptor.cc
index 3d318ddd346..ce248d2bb9e 100644
--- a/storage/tokudb/ft-index/src/tests/test_cmp_descriptor.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cmp_descriptor.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_compression_methods.cc b/storage/tokudb/ft-index/src/tests/test_compression_methods.cc
index 272cf4f145d..fc9149fc1b4 100644
--- a/storage/tokudb/ft-index/src/tests/test_compression_methods.cc
+++ b/storage/tokudb/ft-index/src/tests/test_compression_methods.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cursor_2.cc b/storage/tokudb/ft-index/src/tests/test_cursor_2.cc
index d07eb95122e..036133e4dfb 100644
--- a/storage/tokudb/ft-index/src/tests/test_cursor_2.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cursor_2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cursor_3.cc b/storage/tokudb/ft-index/src/tests/test_cursor_3.cc
index f9f256fc884..d7869bebf23 100644
--- a/storage/tokudb/ft-index/src/tests/test_cursor_3.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cursor_3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cursor_DB_NEXT_no_dup.cc b/storage/tokudb/ft-index/src/tests/test_cursor_DB_NEXT_no_dup.cc
index 125bbee9d52..92ba762d348 100644
--- a/storage/tokudb/ft-index/src/tests/test_cursor_DB_NEXT_no_dup.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cursor_DB_NEXT_no_dup.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cursor_db_current.cc b/storage/tokudb/ft-index/src/tests/test_cursor_db_current.cc
index 2f8fbb9149f..d33be8b2965 100644
--- a/storage/tokudb/ft-index/src/tests/test_cursor_db_current.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cursor_db_current.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cursor_delete2.cc b/storage/tokudb/ft-index/src/tests/test_cursor_delete2.cc
index 1fcda002bc5..dac7179d8d2 100644
--- a/storage/tokudb/ft-index/src/tests/test_cursor_delete2.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cursor_delete2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cursor_flags.cc b/storage/tokudb/ft-index/src/tests/test_cursor_flags.cc
index 60ca37a0ac4..7e8d5916f1e 100644
--- a/storage/tokudb/ft-index/src/tests/test_cursor_flags.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cursor_flags.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cursor_interrupt.cc b/storage/tokudb/ft-index/src/tests/test_cursor_interrupt.cc
index 5583b0283a6..fadd76e9a58 100644
--- a/storage/tokudb/ft-index/src/tests/test_cursor_interrupt.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cursor_interrupt.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cursor_nonleaf_expand.cc b/storage/tokudb/ft-index/src/tests/test_cursor_nonleaf_expand.cc
index 6464a2fda83..306ffbc25c8 100644
--- a/storage/tokudb/ft-index/src/tests/test_cursor_nonleaf_expand.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cursor_nonleaf_expand.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cursor_null.cc b/storage/tokudb/ft-index/src/tests/test_cursor_null.cc
index 6c7bf382a8d..81041590580 100644
--- a/storage/tokudb/ft-index/src/tests/test_cursor_null.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cursor_null.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cursor_stickyness.cc b/storage/tokudb/ft-index/src/tests/test_cursor_stickyness.cc
index 62178e14137..f12847aa423 100644
--- a/storage/tokudb/ft-index/src/tests/test_cursor_stickyness.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cursor_stickyness.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_cursor_with_read_txn.cc b/storage/tokudb/ft-index/src/tests/test_cursor_with_read_txn.cc
index d4e3148ec62..4a96a038196 100644
--- a/storage/tokudb/ft-index/src/tests/test_cursor_with_read_txn.cc
+++ b/storage/tokudb/ft-index/src/tests/test_cursor_with_read_txn.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_already_exists.cc b/storage/tokudb/ft-index/src/tests/test_db_already_exists.cc
index ce4008a06d8..acd89363775 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_already_exists.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_already_exists.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_change_pagesize.cc b/storage/tokudb/ft-index/src/tests/test_db_change_pagesize.cc
index d596782c919..a6e9ac1e25b 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_change_pagesize.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_change_pagesize.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_change_xxx.cc b/storage/tokudb/ft-index/src/tests/test_db_change_xxx.cc
index 2033cc6cb04..0e5e6511a92 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_change_xxx.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_change_xxx.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_close_no_open.cc b/storage/tokudb/ft-index/src/tests/test_db_close_no_open.cc
index 7f433e09393..3e69092bec6 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_close_no_open.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_close_no_open.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_current_clobbers_db.cc b/storage/tokudb/ft-index/src/tests/test_db_current_clobbers_db.cc
index 962d1ae5256..dec77d28eb2 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_current_clobbers_db.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_current_clobbers_db.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_dbt_mem_behavior.cc b/storage/tokudb/ft-index/src/tests/test_db_dbt_mem_behavior.cc
index 8a0a385f82e..d4ce8674e36 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_dbt_mem_behavior.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_dbt_mem_behavior.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_delete.cc b/storage/tokudb/ft-index/src/tests/test_db_delete.cc
index 4ee9b0fba83..e3997f4d9f1 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_delete.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_delete.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_descriptor.cc b/storage/tokudb/ft-index/src/tests/test_db_descriptor.cc
index a9403174818..87e55ccc679 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_descriptor.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_descriptor.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_env_open_close.cc b/storage/tokudb/ft-index/src/tests/test_db_env_open_close.cc
index 4bb22a026b2..4422668c328 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_env_open_close.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_env_open_close.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_env_open_nocreate.cc b/storage/tokudb/ft-index/src/tests/test_db_env_open_nocreate.cc
index a97ec7de733..729444999e3 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_env_open_nocreate.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_env_open_nocreate.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_env_open_open_close.cc b/storage/tokudb/ft-index/src/tests/test_db_env_open_open_close.cc
index 9a2d665edbf..19c508db6f8 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_env_open_open_close.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_env_open_open_close.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_env_set_errpfx.cc b/storage/tokudb/ft-index/src/tests/test_db_env_set_errpfx.cc
index ef7bf85b528..ac4bb7d3ce4 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_env_set_errpfx.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_env_set_errpfx.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_env_set_lg_dir.cc b/storage/tokudb/ft-index/src/tests/test_db_env_set_lg_dir.cc
index 0baa9185d15..54eca58193d 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_env_set_lg_dir.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_env_set_lg_dir.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_env_set_tmp_dir.cc b/storage/tokudb/ft-index/src/tests/test_db_env_set_tmp_dir.cc
index b1adbb30120..c35597c9181 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_env_set_tmp_dir.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_env_set_tmp_dir.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_env_strdup_null.cc b/storage/tokudb/ft-index/src/tests/test_db_env_strdup_null.cc
index 01ba0792e4a..62da51f71f6 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_env_strdup_null.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_env_strdup_null.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_get_put_flags.cc b/storage/tokudb/ft-index/src/tests/test_db_get_put_flags.cc
index 1c716cc747a..404229fa7e8 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_get_put_flags.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_get_put_flags.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_named_delete_last.cc b/storage/tokudb/ft-index/src/tests/test_db_named_delete_last.cc
index ba63986af79..6f188fcd8ba 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_named_delete_last.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_named_delete_last.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_no_env.cc b/storage/tokudb/ft-index/src/tests/test_db_no_env.cc
index 8f7a336af5b..781102680f7 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_no_env.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_no_env.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_open_notexist_reopen.cc b/storage/tokudb/ft-index/src/tests/test_db_open_notexist_reopen.cc
index 70580b8f868..3cbaf17f76b 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_open_notexist_reopen.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_open_notexist_reopen.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_remove.cc b/storage/tokudb/ft-index/src/tests/test_db_remove.cc
index e736784a7c4..ff71bddc637 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_remove.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_remove.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_remove_subdb.cc b/storage/tokudb/ft-index/src/tests/test_db_remove_subdb.cc
index 8f3e50a649c..66849ec5d43 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_remove_subdb.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_remove_subdb.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_set_flags.cc b/storage/tokudb/ft-index/src/tests/test_db_set_flags.cc
index b106c70589f..8ffeffd095c 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_set_flags.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_set_flags.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_subdb.cc b/storage/tokudb/ft-index/src/tests/test_db_subdb.cc
index f29dd14a3fa..6ee18aba742 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_subdb.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_subdb.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_subdb_different_flags.cc b/storage/tokudb/ft-index/src/tests/test_db_subdb_different_flags.cc
index c12e1bdfce9..2592982ad71 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_subdb_different_flags.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_subdb_different_flags.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_txn_locks_nonheaviside.cc b/storage/tokudb/ft-index/src/tests/test_db_txn_locks_nonheaviside.cc
index 381bce27596..c99f9f88440 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_txn_locks_nonheaviside.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_txn_locks_nonheaviside.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_txn_locks_read_uncommitted.cc b/storage/tokudb/ft-index/src/tests/test_db_txn_locks_read_uncommitted.cc
index 0dd73590b84..3ec302274c8 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_txn_locks_read_uncommitted.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_txn_locks_read_uncommitted.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_db_version.cc b/storage/tokudb/ft-index/src/tests/test_db_version.cc
index 6ce4574ae57..d38bb2a7330 100644
--- a/storage/tokudb/ft-index/src/tests/test_db_version.cc
+++ b/storage/tokudb/ft-index/src/tests/test_db_version.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_env_close_flags.cc b/storage/tokudb/ft-index/src/tests/test_env_close_flags.cc
index dd532627502..ce1dabcef16 100644
--- a/storage/tokudb/ft-index/src/tests/test_env_close_flags.cc
+++ b/storage/tokudb/ft-index/src/tests/test_env_close_flags.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_env_create_db_create.cc b/storage/tokudb/ft-index/src/tests/test_env_create_db_create.cc
index d45bd7002ab..ce40d530d95 100644
--- a/storage/tokudb/ft-index/src/tests/test_env_create_db_create.cc
+++ b/storage/tokudb/ft-index/src/tests/test_env_create_db_create.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_env_open_flags.cc b/storage/tokudb/ft-index/src/tests/test_env_open_flags.cc
index 1b621b8005d..2ce1eec09a6 100644
--- a/storage/tokudb/ft-index/src/tests/test_env_open_flags.cc
+++ b/storage/tokudb/ft-index/src/tests/test_env_open_flags.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_equal_keys_with_different_bytes.cc b/storage/tokudb/ft-index/src/tests/test_equal_keys_with_different_bytes.cc
index d91f965ebc8..a10b2c20438 100644
--- a/storage/tokudb/ft-index/src/tests/test_equal_keys_with_different_bytes.cc
+++ b/storage/tokudb/ft-index/src/tests/test_equal_keys_with_different_bytes.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_error.cc b/storage/tokudb/ft-index/src/tests/test_error.cc
index 84c6289990e..1ed2c634b4a 100644
--- a/storage/tokudb/ft-index/src/tests/test_error.cc
+++ b/storage/tokudb/ft-index/src/tests/test_error.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_forkjoin.cc b/storage/tokudb/ft-index/src/tests/test_forkjoin.cc
index 1fb01b53712..df3b9ba552b 100644
--- a/storage/tokudb/ft-index/src/tests/test_forkjoin.cc
+++ b/storage/tokudb/ft-index/src/tests/test_forkjoin.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_get_max_row_size.cc b/storage/tokudb/ft-index/src/tests/test_get_max_row_size.cc
index 5ddddac9bd6..9bb99a1dc05 100644
--- a/storage/tokudb/ft-index/src/tests/test_get_max_row_size.cc
+++ b/storage/tokudb/ft-index/src/tests/test_get_max_row_size.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_get_zeroed_dbt.cc b/storage/tokudb/ft-index/src/tests/test_get_zeroed_dbt.cc
index 384f4e91f46..c969729acd2 100644
--- a/storage/tokudb/ft-index/src/tests/test_get_zeroed_dbt.cc
+++ b/storage/tokudb/ft-index/src/tests/test_get_zeroed_dbt.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_groupcommit_count.cc b/storage/tokudb/ft-index/src/tests/test_groupcommit_count.cc
index f5bb46c35db..6dc951afce6 100644
--- a/storage/tokudb/ft-index/src/tests/test_groupcommit_count.cc
+++ b/storage/tokudb/ft-index/src/tests/test_groupcommit_count.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_groupcommit_perf.cc b/storage/tokudb/ft-index/src/tests/test_groupcommit_perf.cc
index ade56e24e4e..47b7d03a7b1 100644
--- a/storage/tokudb/ft-index/src/tests/test_groupcommit_perf.cc
+++ b/storage/tokudb/ft-index/src/tests/test_groupcommit_perf.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_hsoc.cc b/storage/tokudb/ft-index/src/tests/test_hsoc.cc
index 28368456501..95f8c8a38a8 100644
--- a/storage/tokudb/ft-index/src/tests/test_hsoc.cc
+++ b/storage/tokudb/ft-index/src/tests/test_hsoc.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_insert_cursor_delete_insert.cc b/storage/tokudb/ft-index/src/tests/test_insert_cursor_delete_insert.cc
index 8b09698fcee..ca4de1539e7 100644
--- a/storage/tokudb/ft-index/src/tests/test_insert_cursor_delete_insert.cc
+++ b/storage/tokudb/ft-index/src/tests/test_insert_cursor_delete_insert.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_insert_many_gc.cc b/storage/tokudb/ft-index/src/tests/test_insert_many_gc.cc
index be66e852021..9cc980a7ed1 100644
--- a/storage/tokudb/ft-index/src/tests/test_insert_many_gc.cc
+++ b/storage/tokudb/ft-index/src/tests/test_insert_many_gc.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_insert_memleak.cc b/storage/tokudb/ft-index/src/tests/test_insert_memleak.cc
index 8168ae477a1..9a91a4079a6 100644
--- a/storage/tokudb/ft-index/src/tests/test_insert_memleak.cc
+++ b/storage/tokudb/ft-index/src/tests/test_insert_memleak.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_insert_unique.cc b/storage/tokudb/ft-index/src/tests/test_insert_unique.cc
index e38ae892a67..0b86ab64307 100644
--- a/storage/tokudb/ft-index/src/tests/test_insert_unique.cc
+++ b/storage/tokudb/ft-index/src/tests/test_insert_unique.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_iterate_live_transactions.cc b/storage/tokudb/ft-index/src/tests/test_iterate_live_transactions.cc
index c104c5c8541..e47b9b8f8a8 100644
--- a/storage/tokudb/ft-index/src/tests/test_iterate_live_transactions.cc
+++ b/storage/tokudb/ft-index/src/tests/test_iterate_live_transactions.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_iterate_pending_lock_requests.cc b/storage/tokudb/ft-index/src/tests/test_iterate_pending_lock_requests.cc
index 03dcce49ffd..a958154fa0a 100644
--- a/storage/tokudb/ft-index/src/tests/test_iterate_pending_lock_requests.cc
+++ b/storage/tokudb/ft-index/src/tests/test_iterate_pending_lock_requests.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_keylen_diff.cc b/storage/tokudb/ft-index/src/tests/test_keylen_diff.cc
index d37c03db566..18a09249ff3 100644
--- a/storage/tokudb/ft-index/src/tests/test_keylen_diff.cc
+++ b/storage/tokudb/ft-index/src/tests/test_keylen_diff.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_kv_gen.h b/storage/tokudb/ft-index/src/tests/test_kv_gen.h
index 49bb3acdb42..d4c0fab5a57 100644
--- a/storage/tokudb/ft-index/src/tests/test_kv_gen.h
+++ b/storage/tokudb/ft-index/src/tests/test_kv_gen.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_kv_limits.cc b/storage/tokudb/ft-index/src/tests/test_kv_limits.cc
index 70390bb2802..5ce7e32a2b1 100644
--- a/storage/tokudb/ft-index/src/tests/test_kv_limits.cc
+++ b/storage/tokudb/ft-index/src/tests/test_kv_limits.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_large_update_broadcast_small_cachetable.cc b/storage/tokudb/ft-index/src/tests/test_large_update_broadcast_small_cachetable.cc
index e5ccb3071b8..a599c3062e3 100644
--- a/storage/tokudb/ft-index/src/tests/test_large_update_broadcast_small_cachetable.cc
+++ b/storage/tokudb/ft-index/src/tests/test_large_update_broadcast_small_cachetable.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_lock_timeout_callback.cc b/storage/tokudb/ft-index/src/tests/test_lock_timeout_callback.cc
index 74daae7897f..b7e9f10719c 100644
--- a/storage/tokudb/ft-index/src/tests/test_lock_timeout_callback.cc
+++ b/storage/tokudb/ft-index/src/tests/test_lock_timeout_callback.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_locking_with_read_txn.cc b/storage/tokudb/ft-index/src/tests/test_locking_with_read_txn.cc
index f3cb36d1df5..33d023ddbcd 100644
--- a/storage/tokudb/ft-index/src/tests/test_locking_with_read_txn.cc
+++ b/storage/tokudb/ft-index/src/tests/test_locking_with_read_txn.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_locktree_close.cc b/storage/tokudb/ft-index/src/tests/test_locktree_close.cc
index b5735fd1495..b9b9b503380 100644
--- a/storage/tokudb/ft-index/src/tests/test_locktree_close.cc
+++ b/storage/tokudb/ft-index/src/tests/test_locktree_close.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log0.cc b/storage/tokudb/ft-index/src/tests/test_log0.cc
index c597affc562..3efeae811cd 100644
--- a/storage/tokudb/ft-index/src/tests/test_log0.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log0.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log1.cc b/storage/tokudb/ft-index/src/tests/test_log1.cc
index 8379d20ba45..c25a1b6097f 100644
--- a/storage/tokudb/ft-index/src/tests/test_log1.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log1.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log10.cc b/storage/tokudb/ft-index/src/tests/test_log10.cc
index 053efc0f07d..7792c005ca2 100644
--- a/storage/tokudb/ft-index/src/tests/test_log10.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log10.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log1_abort.cc b/storage/tokudb/ft-index/src/tests/test_log1_abort.cc
index 6861698740f..e7fed449fa2 100644
--- a/storage/tokudb/ft-index/src/tests/test_log1_abort.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log1_abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log2.cc b/storage/tokudb/ft-index/src/tests/test_log2.cc
index d2a2e6d5006..b03dac9c3f5 100644
--- a/storage/tokudb/ft-index/src/tests/test_log2.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log2_abort.cc b/storage/tokudb/ft-index/src/tests/test_log2_abort.cc
index 9ed3f8a1a6f..ea1e0f9669c 100644
--- a/storage/tokudb/ft-index/src/tests/test_log2_abort.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log2_abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log3.cc b/storage/tokudb/ft-index/src/tests/test_log3.cc
index a8b71fa90db..6efd80f87fa 100644
--- a/storage/tokudb/ft-index/src/tests/test_log3.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log3_abort.cc b/storage/tokudb/ft-index/src/tests/test_log3_abort.cc
index d08dab0c033..2cbe34fdd60 100644
--- a/storage/tokudb/ft-index/src/tests/test_log3_abort.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log3_abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log4.cc b/storage/tokudb/ft-index/src/tests/test_log4.cc
index 2117907f1b0..40606f415ee 100644
--- a/storage/tokudb/ft-index/src/tests/test_log4.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log4.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log4_abort.cc b/storage/tokudb/ft-index/src/tests/test_log4_abort.cc
index 37a00085812..d30149262ea 100644
--- a/storage/tokudb/ft-index/src/tests/test_log4_abort.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log4_abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log5.cc b/storage/tokudb/ft-index/src/tests/test_log5.cc
index 82a122c045a..9db33d45e4c 100644
--- a/storage/tokudb/ft-index/src/tests/test_log5.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log5.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log5_abort.cc b/storage/tokudb/ft-index/src/tests/test_log5_abort.cc
index dcd512abd61..77535850291 100644
--- a/storage/tokudb/ft-index/src/tests/test_log5_abort.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log5_abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log6.cc b/storage/tokudb/ft-index/src/tests/test_log6.cc
index 710519d70a7..7ee7b72bb4a 100644
--- a/storage/tokudb/ft-index/src/tests/test_log6.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log6.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log6_abort.cc b/storage/tokudb/ft-index/src/tests/test_log6_abort.cc
index 09db439b22b..8a952434383 100644
--- a/storage/tokudb/ft-index/src/tests/test_log6_abort.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log6_abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log6a_abort.cc b/storage/tokudb/ft-index/src/tests/test_log6a_abort.cc
index b5ddb6b4c3c..1174cfefb54 100644
--- a/storage/tokudb/ft-index/src/tests/test_log6a_abort.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log6a_abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log7.cc b/storage/tokudb/ft-index/src/tests/test_log7.cc
index afa9a5ab82c..0315179ff67 100644
--- a/storage/tokudb/ft-index/src/tests/test_log7.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log7.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log8.cc b/storage/tokudb/ft-index/src/tests/test_log8.cc
index 39c607b3623..1208c97bb76 100644
--- a/storage/tokudb/ft-index/src/tests/test_log8.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log8.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_log9.cc b/storage/tokudb/ft-index/src/tests/test_log9.cc
index 6b7f1fddb44..f20bbb36c76 100644
--- a/storage/tokudb/ft-index/src/tests/test_log9.cc
+++ b/storage/tokudb/ft-index/src/tests/test_log9.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_logflush.cc b/storage/tokudb/ft-index/src/tests/test_logflush.cc
index 6ea09b83916..aa85ccb2cad 100644
--- a/storage/tokudb/ft-index/src/tests/test_logflush.cc
+++ b/storage/tokudb/ft-index/src/tests/test_logflush.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_logmax.cc b/storage/tokudb/ft-index/src/tests/test_logmax.cc
index 89c9284ea6b..d74a51f52b1 100644
--- a/storage/tokudb/ft-index/src/tests/test_logmax.cc
+++ b/storage/tokudb/ft-index/src/tests/test_logmax.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_memcmp_magic.cc b/storage/tokudb/ft-index/src/tests/test_memcmp_magic.cc
index 5ddb473a6ed..29c69496dd3 100644
--- a/storage/tokudb/ft-index/src/tests/test_memcmp_magic.cc
+++ b/storage/tokudb/ft-index/src/tests/test_memcmp_magic.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_mostly_seq.cc b/storage/tokudb/ft-index/src/tests/test_mostly_seq.cc
index f4f8d16e312..6fbd980dd08 100644
--- a/storage/tokudb/ft-index/src/tests/test_mostly_seq.cc
+++ b/storage/tokudb/ft-index/src/tests/test_mostly_seq.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_multiple_checkpoints_block_commit.cc b/storage/tokudb/ft-index/src/tests/test_multiple_checkpoints_block_commit.cc
index 5accd55dadc..105dd1cee6c 100644
--- a/storage/tokudb/ft-index/src/tests/test_multiple_checkpoints_block_commit.cc
+++ b/storage/tokudb/ft-index/src/tests/test_multiple_checkpoints_block_commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_nested.cc b/storage/tokudb/ft-index/src/tests/test_nested.cc
index 9ce288435ce..ccd13f2d3a4 100644
--- a/storage/tokudb/ft-index/src/tests/test_nested.cc
+++ b/storage/tokudb/ft-index/src/tests/test_nested.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_nodup_set.cc b/storage/tokudb/ft-index/src/tests/test_nodup_set.cc
index 81c0d258af3..70db3c14d4c 100644
--- a/storage/tokudb/ft-index/src/tests/test_nodup_set.cc
+++ b/storage/tokudb/ft-index/src/tests/test_nodup_set.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_query.cc b/storage/tokudb/ft-index/src/tests/test_query.cc
index db199ea2b80..44aea32f1a4 100644
--- a/storage/tokudb/ft-index/src/tests/test_query.cc
+++ b/storage/tokudb/ft-index/src/tests/test_query.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_rand_insert.cc b/storage/tokudb/ft-index/src/tests/test_rand_insert.cc
index 76c12a9d124..6c6a744deb7 100644
--- a/storage/tokudb/ft-index/src/tests/test_rand_insert.cc
+++ b/storage/tokudb/ft-index/src/tests/test_rand_insert.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_read_txn_invalid_ops.cc b/storage/tokudb/ft-index/src/tests/test_read_txn_invalid_ops.cc
index 93cab3cd0c0..8c60cbd187b 100644
--- a/storage/tokudb/ft-index/src/tests/test_read_txn_invalid_ops.cc
+++ b/storage/tokudb/ft-index/src/tests/test_read_txn_invalid_ops.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_redirect_func.cc b/storage/tokudb/ft-index/src/tests/test_redirect_func.cc
index 2107fda3093..104adb775fc 100644
--- a/storage/tokudb/ft-index/src/tests/test_redirect_func.cc
+++ b/storage/tokudb/ft-index/src/tests/test_redirect_func.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_restrict.cc b/storage/tokudb/ft-index/src/tests/test_restrict.cc
index fe71111a6bb..af633b49f87 100644
--- a/storage/tokudb/ft-index/src/tests/test_restrict.cc
+++ b/storage/tokudb/ft-index/src/tests/test_restrict.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_reverse_compare_fun.cc b/storage/tokudb/ft-index/src/tests/test_reverse_compare_fun.cc
index f50cc6fc18e..e78cb54f411 100644
--- a/storage/tokudb/ft-index/src/tests/test_reverse_compare_fun.cc
+++ b/storage/tokudb/ft-index/src/tests/test_reverse_compare_fun.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_set_func_malloc.cc b/storage/tokudb/ft-index/src/tests/test_set_func_malloc.cc
index 0acea21e863..64334356f56 100644
--- a/storage/tokudb/ft-index/src/tests/test_set_func_malloc.cc
+++ b/storage/tokudb/ft-index/src/tests/test_set_func_malloc.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_simple_read_txn.cc b/storage/tokudb/ft-index/src/tests/test_simple_read_txn.cc
index 4449a6287b8..7514c58069f 100644
--- a/storage/tokudb/ft-index/src/tests/test_simple_read_txn.cc
+++ b/storage/tokudb/ft-index/src/tests/test_simple_read_txn.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_stress0.cc b/storage/tokudb/ft-index/src/tests/test_stress0.cc
index 26192d851aa..7b8a8e6dfb4 100644
--- a/storage/tokudb/ft-index/src/tests/test_stress0.cc
+++ b/storage/tokudb/ft-index/src/tests/test_stress0.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_stress1.cc b/storage/tokudb/ft-index/src/tests/test_stress1.cc
index 81095299265..96c01299ba9 100644
--- a/storage/tokudb/ft-index/src/tests/test_stress1.cc
+++ b/storage/tokudb/ft-index/src/tests/test_stress1.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_stress2.cc b/storage/tokudb/ft-index/src/tests/test_stress2.cc
index cbd798f318b..c3cc63c4751 100644
--- a/storage/tokudb/ft-index/src/tests/test_stress2.cc
+++ b/storage/tokudb/ft-index/src/tests/test_stress2.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_stress3.cc b/storage/tokudb/ft-index/src/tests/test_stress3.cc
index b47e4f812ae..763ea5c9037 100644
--- a/storage/tokudb/ft-index/src/tests/test_stress3.cc
+++ b/storage/tokudb/ft-index/src/tests/test_stress3.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_stress4.cc b/storage/tokudb/ft-index/src/tests/test_stress4.cc
index 3d420561f5e..d558442f31e 100644
--- a/storage/tokudb/ft-index/src/tests/test_stress4.cc
+++ b/storage/tokudb/ft-index/src/tests/test_stress4.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_stress5.cc b/storage/tokudb/ft-index/src/tests/test_stress5.cc
index a591b340025..8a4e3e46ca9 100644
--- a/storage/tokudb/ft-index/src/tests/test_stress5.cc
+++ b/storage/tokudb/ft-index/src/tests/test_stress5.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_stress6.cc b/storage/tokudb/ft-index/src/tests/test_stress6.cc
index d616622353b..3c442f7c3f3 100644
--- a/storage/tokudb/ft-index/src/tests/test_stress6.cc
+++ b/storage/tokudb/ft-index/src/tests/test_stress6.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_stress7.cc b/storage/tokudb/ft-index/src/tests/test_stress7.cc
index cdf03ce8036..0f6f0ae581f 100644
--- a/storage/tokudb/ft-index/src/tests/test_stress7.cc
+++ b/storage/tokudb/ft-index/src/tests/test_stress7.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_stress_hot_indexing.cc b/storage/tokudb/ft-index/src/tests/test_stress_hot_indexing.cc
index d70f0411e01..ac62e02e950 100644
--- a/storage/tokudb/ft-index/src/tests/test_stress_hot_indexing.cc
+++ b/storage/tokudb/ft-index/src/tests/test_stress_hot_indexing.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_stress_openclose.cc b/storage/tokudb/ft-index/src/tests/test_stress_openclose.cc
index 54c8e784b18..26a9e7ae60d 100644
--- a/storage/tokudb/ft-index/src/tests/test_stress_openclose.cc
+++ b/storage/tokudb/ft-index/src/tests/test_stress_openclose.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_stress_with_verify.cc b/storage/tokudb/ft-index/src/tests/test_stress_with_verify.cc
index d259d09d25a..f9e123b55ee 100644
--- a/storage/tokudb/ft-index/src/tests/test_stress_with_verify.cc
+++ b/storage/tokudb/ft-index/src/tests/test_stress_with_verify.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_thread_flags.cc b/storage/tokudb/ft-index/src/tests/test_thread_flags.cc
index 2ff2dabab98..a14f21a0b03 100644
--- a/storage/tokudb/ft-index/src/tests/test_thread_flags.cc
+++ b/storage/tokudb/ft-index/src/tests/test_thread_flags.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_thread_insert.cc b/storage/tokudb/ft-index/src/tests/test_thread_insert.cc
index a1044948e0e..1b035b10d9b 100644
--- a/storage/tokudb/ft-index/src/tests/test_thread_insert.cc
+++ b/storage/tokudb/ft-index/src/tests/test_thread_insert.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt.cc b/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt.cc
index 5d2196b13f8..b629750b9e5 100644
--- a/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt.cc
+++ b/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt2.cc b/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt2.cc
index 3a215a8b6f2..66b2172e039 100644
--- a/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt2.cc
+++ b/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt3.cc b/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt3.cc
index 6644cdabaa2..c8dac9a48e1 100644
--- a/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt3.cc
+++ b/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt4.cc b/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt4.cc
index 3a215a8b6f2..66b2172e039 100644
--- a/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt4.cc
+++ b/storage/tokudb/ft-index/src/tests/test_trans_desc_during_chkpt4.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_transactional_descriptor.cc b/storage/tokudb/ft-index/src/tests/test_transactional_descriptor.cc
index 4f2e66a9381..e712a27ddfc 100644
--- a/storage/tokudb/ft-index/src/tests/test_transactional_descriptor.cc
+++ b/storage/tokudb/ft-index/src/tests/test_transactional_descriptor.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_abort5.cc b/storage/tokudb/ft-index/src/tests/test_txn_abort5.cc
index fb3a522c995..ec5e1ad32c5 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_abort5.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_abort5.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_abort5a.cc b/storage/tokudb/ft-index/src/tests/test_txn_abort5a.cc
index 6678a959805..e74d3195fe1 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_abort5a.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_abort5a.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_abort6.cc b/storage/tokudb/ft-index/src/tests/test_txn_abort6.cc
index f61aea8e0bd..dcdb6f1eb4c 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_abort6.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_abort6.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_abort7.cc b/storage/tokudb/ft-index/src/tests/test_txn_abort7.cc
index f7f0840680f..4089dc7246e 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_abort7.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_abort7.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_begin_commit.cc b/storage/tokudb/ft-index/src/tests/test_txn_begin_commit.cc
index 7e686e3e885..6a8027ec1ec 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_begin_commit.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_begin_commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_close_before_commit.cc b/storage/tokudb/ft-index/src/tests/test_txn_close_before_commit.cc
index 24ef8a0fb72..0b6eef2b84b 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_close_before_commit.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_close_before_commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_close_before_prepare_commit.cc b/storage/tokudb/ft-index/src/tests/test_txn_close_before_prepare_commit.cc
index 31267b17686..a0c93ea9a36 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_close_before_prepare_commit.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_close_before_prepare_commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_cursor_last.cc b/storage/tokudb/ft-index/src/tests/test_txn_cursor_last.cc
index 82a15e0b515..fae73d450d5 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_cursor_last.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_cursor_last.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_nested1.cc b/storage/tokudb/ft-index/src/tests/test_txn_nested1.cc
index 7797d88e478..e8d98e9c7a8 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_nested1.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_nested1.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_nested2.cc b/storage/tokudb/ft-index/src/tests/test_txn_nested2.cc
index f5c0d2b4e51..46a2fdd3a4c 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_nested2.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_nested2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_nested3.cc b/storage/tokudb/ft-index/src/tests/test_txn_nested3.cc
index 16ede714422..2b080abc55d 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_nested3.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_nested3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_nested4.cc b/storage/tokudb/ft-index/src/tests/test_txn_nested4.cc
index 0bca6309169..fa2d9cfec3d 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_nested4.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_nested4.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_nested5.cc b/storage/tokudb/ft-index/src/tests/test_txn_nested5.cc
index 02692be3d08..3cf938a96cc 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_nested5.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_nested5.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_nested_abort.cc b/storage/tokudb/ft-index/src/tests/test_txn_nested_abort.cc
index 10be3fea79d..1bf0b5e8861 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_nested_abort.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_nested_abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_nested_abort2.cc b/storage/tokudb/ft-index/src/tests/test_txn_nested_abort2.cc
index 6e1928b4891..629446b33d8 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_nested_abort2.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_nested_abort2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_nested_abort3.cc b/storage/tokudb/ft-index/src/tests/test_txn_nested_abort3.cc
index 2fa58b86b2a..7108a615200 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_nested_abort3.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_nested_abort3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_nested_abort4.cc b/storage/tokudb/ft-index/src/tests/test_txn_nested_abort4.cc
index b412aeec884..68b36a758f1 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_nested_abort4.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_nested_abort4.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_txn_recover3.cc b/storage/tokudb/ft-index/src/tests/test_txn_recover3.cc
index 55cf772f207..a372eab3fde 100644
--- a/storage/tokudb/ft-index/src/tests/test_txn_recover3.cc
+++ b/storage/tokudb/ft-index/src/tests/test_txn_recover3.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_unused_memory_crash.cc b/storage/tokudb/ft-index/src/tests/test_unused_memory_crash.cc
index 9c13a08368f..1d2b6350869 100644
--- a/storage/tokudb/ft-index/src/tests/test_unused_memory_crash.cc
+++ b/storage/tokudb/ft-index/src/tests/test_unused_memory_crash.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_abort_works.cc b/storage/tokudb/ft-index/src/tests/test_update_abort_works.cc
index 4a0d815749b..b85db6750e7 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_abort_works.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_abort_works.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_broadcast_abort_works.cc b/storage/tokudb/ft-index/src/tests/test_update_broadcast_abort_works.cc
index c11fffe643f..e4f694ae82c 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_broadcast_abort_works.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_broadcast_abort_works.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_broadcast_calls_back.cc b/storage/tokudb/ft-index/src/tests/test_update_broadcast_calls_back.cc
index db12a74832b..cdbe512f279 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_broadcast_calls_back.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_broadcast_calls_back.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_broadcast_can_delete_elements.cc b/storage/tokudb/ft-index/src/tests/test_update_broadcast_can_delete_elements.cc
index 804161402ba..a05cf9a0ade 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_broadcast_can_delete_elements.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_broadcast_can_delete_elements.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_broadcast_changes_values.cc b/storage/tokudb/ft-index/src/tests/test_update_broadcast_changes_values.cc
index 304c799de07..cb0d769282f 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_broadcast_changes_values.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_broadcast_changes_values.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_broadcast_indexer.cc b/storage/tokudb/ft-index/src/tests/test_update_broadcast_indexer.cc
index 4a7fa176424..8f0a013e630 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_broadcast_indexer.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_broadcast_indexer.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_broadcast_loader.cc b/storage/tokudb/ft-index/src/tests/test_update_broadcast_loader.cc
index 4e3db6380ae..f687dfc4aec 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_broadcast_loader.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_broadcast_loader.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_broadcast_nested_updates.cc b/storage/tokudb/ft-index/src/tests/test_update_broadcast_nested_updates.cc
index 2f858beffcd..a072a3576ce 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_broadcast_nested_updates.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_broadcast_nested_updates.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_broadcast_previously_deleted.cc b/storage/tokudb/ft-index/src/tests/test_update_broadcast_previously_deleted.cc
index 348dd71f941..08648a30b1a 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_broadcast_previously_deleted.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_broadcast_previously_deleted.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_broadcast_stress.cc b/storage/tokudb/ft-index/src/tests/test_update_broadcast_stress.cc
index fb294e40446..a8dbdd76d35 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_broadcast_stress.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_broadcast_stress.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_broadcast_update_fun_has_choices.cc b/storage/tokudb/ft-index/src/tests/test_update_broadcast_update_fun_has_choices.cc
index 6f6481d3175..4d7207fc7a5 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_broadcast_update_fun_has_choices.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_broadcast_update_fun_has_choices.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_broadcast_with_empty_table.cc b/storage/tokudb/ft-index/src/tests/test_update_broadcast_with_empty_table.cc
index 5aa27c10b69..e8678264924 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_broadcast_with_empty_table.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_broadcast_with_empty_table.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_calls_back.cc b/storage/tokudb/ft-index/src/tests/test_update_calls_back.cc
index 4970cc6ad4c..06b66651aa1 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_calls_back.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_calls_back.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_can_delete_elements.cc b/storage/tokudb/ft-index/src/tests/test_update_can_delete_elements.cc
index 328a569bf56..901faf0b9fe 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_can_delete_elements.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_can_delete_elements.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_changes_values.cc b/storage/tokudb/ft-index/src/tests/test_update_changes_values.cc
index ee346f54947..360f3768c73 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_changes_values.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_changes_values.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_nested_updates.cc b/storage/tokudb/ft-index/src/tests/test_update_nested_updates.cc
index cb44a5bff29..09c99bacbb1 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_nested_updates.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_nested_updates.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_nonexistent_keys.cc b/storage/tokudb/ft-index/src/tests/test_update_nonexistent_keys.cc
index 1d609aabb9a..dd11dbfae01 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_nonexistent_keys.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_nonexistent_keys.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_previously_deleted.cc b/storage/tokudb/ft-index/src/tests/test_update_previously_deleted.cc
index 7e9e4bcb5ba..e55d6bf4452 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_previously_deleted.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_previously_deleted.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_stress.cc b/storage/tokudb/ft-index/src/tests/test_update_stress.cc
index 0c0d2c9926a..4632ddd3bec 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_stress.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_stress.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_txn_snapshot_works_concurrently.cc b/storage/tokudb/ft-index/src/tests/test_update_txn_snapshot_works_concurrently.cc
index 99acf3f7f8e..ac1575fd81c 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_txn_snapshot_works_concurrently.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_txn_snapshot_works_concurrently.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_txn_snapshot_works_correctly_with_deletes.cc b/storage/tokudb/ft-index/src/tests/test_update_txn_snapshot_works_correctly_with_deletes.cc
index 61a346c928d..3434dfa4fa9 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_txn_snapshot_works_correctly_with_deletes.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_txn_snapshot_works_correctly_with_deletes.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_update_with_empty_table.cc b/storage/tokudb/ft-index/src/tests/test_update_with_empty_table.cc
index 6d54ee93b19..772bb62ee1c 100644
--- a/storage/tokudb/ft-index/src/tests/test_update_with_empty_table.cc
+++ b/storage/tokudb/ft-index/src/tests/test_update_with_empty_table.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_updates_single_key.cc b/storage/tokudb/ft-index/src/tests/test_updates_single_key.cc
index 0b4dff69b9f..b3de85e000f 100644
--- a/storage/tokudb/ft-index/src/tests/test_updates_single_key.cc
+++ b/storage/tokudb/ft-index/src/tests/test_updates_single_key.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_weakxaction.cc b/storage/tokudb/ft-index/src/tests/test_weakxaction.cc
index e99f6510a0c..bad63dd8fcc 100644
--- a/storage/tokudb/ft-index/src/tests/test_weakxaction.cc
+++ b/storage/tokudb/ft-index/src/tests/test_weakxaction.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/test_zero_length_keys.cc b/storage/tokudb/ft-index/src/tests/test_zero_length_keys.cc
index c7b4dd1ac75..2e98042e8ab 100644
--- a/storage/tokudb/ft-index/src/tests/test_zero_length_keys.cc
+++ b/storage/tokudb/ft-index/src/tests/test_zero_length_keys.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/threaded_stress_test_helpers.h b/storage/tokudb/ft-index/src/tests/threaded_stress_test_helpers.h
index fc4acecff10..24049bef067 100644
--- a/storage/tokudb/ft-index/src/tests/threaded_stress_test_helpers.h
+++ b/storage/tokudb/ft-index/src/tests/threaded_stress_test_helpers.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/time_create_db.cc b/storage/tokudb/ft-index/src/tests/time_create_db.cc
index 2365df4701d..6832e72ad2c 100644
--- a/storage/tokudb/ft-index/src/tests/time_create_db.cc
+++ b/storage/tokudb/ft-index/src/tests/time_create_db.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/transactional_fileops.cc b/storage/tokudb/ft-index/src/tests/transactional_fileops.cc
index ea1f8af6e16..12a145dc9ab 100644
--- a/storage/tokudb/ft-index/src/tests/transactional_fileops.cc
+++ b/storage/tokudb/ft-index/src/tests/transactional_fileops.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/update-multiple-data-diagonal.cc b/storage/tokudb/ft-index/src/tests/update-multiple-data-diagonal.cc
index c39005d0f00..4f31e87a271 100644
--- a/storage/tokudb/ft-index/src/tests/update-multiple-data-diagonal.cc
+++ b/storage/tokudb/ft-index/src/tests/update-multiple-data-diagonal.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/update-multiple-key0.cc b/storage/tokudb/ft-index/src/tests/update-multiple-key0.cc
index 51257fd7377..ff630567538 100644
--- a/storage/tokudb/ft-index/src/tests/update-multiple-key0.cc
+++ b/storage/tokudb/ft-index/src/tests/update-multiple-key0.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/update-multiple-nochange.cc b/storage/tokudb/ft-index/src/tests/update-multiple-nochange.cc
index 19a668a67c8..94ac0f7e053 100644
--- a/storage/tokudb/ft-index/src/tests/update-multiple-nochange.cc
+++ b/storage/tokudb/ft-index/src/tests/update-multiple-nochange.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/update-multiple-with-indexer-array.cc b/storage/tokudb/ft-index/src/tests/update-multiple-with-indexer-array.cc
index 9101771c4d8..935810dba92 100644
--- a/storage/tokudb/ft-index/src/tests/update-multiple-with-indexer-array.cc
+++ b/storage/tokudb/ft-index/src/tests/update-multiple-with-indexer-array.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/update-multiple-with-indexer.cc b/storage/tokudb/ft-index/src/tests/update-multiple-with-indexer.cc
index 444bcf17106..71d1e26fcd7 100644
--- a/storage/tokudb/ft-index/src/tests/update-multiple-with-indexer.cc
+++ b/storage/tokudb/ft-index/src/tests/update-multiple-with-indexer.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/update.cc b/storage/tokudb/ft-index/src/tests/update.cc
index aa0c4f0dd18..751c44c7b62 100644
--- a/storage/tokudb/ft-index/src/tests/update.cc
+++ b/storage/tokudb/ft-index/src/tests/update.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/upgrade-test-1.cc b/storage/tokudb/ft-index/src/tests/upgrade-test-1.cc
index 1f30ab21cf2..26de5f85e7f 100644
--- a/storage/tokudb/ft-index/src/tests/upgrade-test-1.cc
+++ b/storage/tokudb/ft-index/src/tests/upgrade-test-1.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/upgrade-test-2.cc b/storage/tokudb/ft-index/src/tests/upgrade-test-2.cc
index 33003f6780b..8d3164e31d3 100644
--- a/storage/tokudb/ft-index/src/tests/upgrade-test-2.cc
+++ b/storage/tokudb/ft-index/src/tests/upgrade-test-2.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/upgrade-test-3.cc b/storage/tokudb/ft-index/src/tests/upgrade-test-3.cc
index 61994a2de66..f5f4f9f6958 100644
--- a/storage/tokudb/ft-index/src/tests/upgrade-test-3.cc
+++ b/storage/tokudb/ft-index/src/tests/upgrade-test-3.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/upgrade-test-4.cc b/storage/tokudb/ft-index/src/tests/upgrade-test-4.cc
index 0d083d9d87a..b613cc67b01 100644
--- a/storage/tokudb/ft-index/src/tests/upgrade-test-4.cc
+++ b/storage/tokudb/ft-index/src/tests/upgrade-test-4.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/upgrade-test-5.cc b/storage/tokudb/ft-index/src/tests/upgrade-test-5.cc
index 2f5d1863e51..8fc69d29f90 100644
--- a/storage/tokudb/ft-index/src/tests/upgrade-test-5.cc
+++ b/storage/tokudb/ft-index/src/tests/upgrade-test-5.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/upgrade-test-6.cc b/storage/tokudb/ft-index/src/tests/upgrade-test-6.cc
index a1e137c980f..b2ab846171b 100644
--- a/storage/tokudb/ft-index/src/tests/upgrade-test-6.cc
+++ b/storage/tokudb/ft-index/src/tests/upgrade-test-6.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/upgrade-test-7.cc b/storage/tokudb/ft-index/src/tests/upgrade-test-7.cc
index 429f4cddf2c..883637c61a9 100644
--- a/storage/tokudb/ft-index/src/tests/upgrade-test-7.cc
+++ b/storage/tokudb/ft-index/src/tests/upgrade-test-7.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/upgrade_simple.cc b/storage/tokudb/ft-index/src/tests/upgrade_simple.cc
index 678953c4ff7..a8fa67524b9 100644
--- a/storage/tokudb/ft-index/src/tests/upgrade_simple.cc
+++ b/storage/tokudb/ft-index/src/tests/upgrade_simple.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/xa-dirty-commit.cc b/storage/tokudb/ft-index/src/tests/xa-dirty-commit.cc
index 008a41274ae..8e048b65d68 100644
--- a/storage/tokudb/ft-index/src/tests/xa-dirty-commit.cc
+++ b/storage/tokudb/ft-index/src/tests/xa-dirty-commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/xa-dirty-rollback.cc b/storage/tokudb/ft-index/src/tests/xa-dirty-rollback.cc
index 3f0debe4116..aaf5ae79899 100644
--- a/storage/tokudb/ft-index/src/tests/xa-dirty-rollback.cc
+++ b/storage/tokudb/ft-index/src/tests/xa-dirty-rollback.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/xa-txn-discard-abort.cc b/storage/tokudb/ft-index/src/tests/xa-txn-discard-abort.cc
index 95852c68192..0f8e9b1c4c4 100644
--- a/storage/tokudb/ft-index/src/tests/xa-txn-discard-abort.cc
+++ b/storage/tokudb/ft-index/src/tests/xa-txn-discard-abort.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/xa-txn-discard-commit.cc b/storage/tokudb/ft-index/src/tests/xa-txn-discard-commit.cc
index a21f8813f90..6261d4bc1e4 100644
--- a/storage/tokudb/ft-index/src/tests/xa-txn-discard-commit.cc
+++ b/storage/tokudb/ft-index/src/tests/xa-txn-discard-commit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/tests/zombie_db.cc b/storage/tokudb/ft-index/src/tests/zombie_db.cc
index 56ff71f13da..a479949ba3f 100644
--- a/storage/tokudb/ft-index/src/tests/zombie_db.cc
+++ b/storage/tokudb/ft-index/src/tests/zombie_db.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/toku_patent.cc b/storage/tokudb/ft-index/src/toku_patent.cc
index 5261b6f3a79..40874f0f55d 100644
--- a/storage/tokudb/ft-index/src/toku_patent.cc
+++ b/storage/tokudb/ft-index/src/toku_patent.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
@@ -111,7 +111,7 @@ const char *toku_patent_string = "COPYING CONDITIONS NOTICE:\n\
   You should have received a copy of the GNU General Public License\n\
   along with this program; if not, write to the Free Software\n\
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n\
-  02110-1301, USA.\n\
+  02110-1335  USA.\n\
 \n\
 COPYRIGHT NOTICE:\n\
 \n\
diff --git a/storage/tokudb/ft-index/src/ydb-internal.h b/storage/tokudb/ft-index/src/ydb-internal.h
index 26cc8419f4a..7a6c7e4da44 100644
--- a/storage/tokudb/ft-index/src/ydb-internal.h
+++ b/storage/tokudb/ft-index/src/ydb-internal.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb.cc b/storage/tokudb/ft-index/src/ydb.cc
index ab15a44489e..81cf7e9e031 100644
--- a/storage/tokudb/ft-index/src/ydb.cc
+++ b/storage/tokudb/ft-index/src/ydb.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb.h b/storage/tokudb/ft-index/src/ydb.h
index fad41f382f3..f672485c169 100644
--- a/storage/tokudb/ft-index/src/ydb.h
+++ b/storage/tokudb/ft-index/src/ydb.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_cursor.cc b/storage/tokudb/ft-index/src/ydb_cursor.cc
index eed519455fc..869db512343 100644
--- a/storage/tokudb/ft-index/src/ydb_cursor.cc
+++ b/storage/tokudb/ft-index/src/ydb_cursor.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_cursor.h b/storage/tokudb/ft-index/src/ydb_cursor.h
index a10e32f3002..3fdcb7b1acd 100644
--- a/storage/tokudb/ft-index/src/ydb_cursor.h
+++ b/storage/tokudb/ft-index/src/ydb_cursor.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_db.cc b/storage/tokudb/ft-index/src/ydb_db.cc
index 57f28b33d69..a6e41dba02e 100644
--- a/storage/tokudb/ft-index/src/ydb_db.cc
+++ b/storage/tokudb/ft-index/src/ydb_db.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_db.h b/storage/tokudb/ft-index/src/ydb_db.h
index edbc72cb0d3..70f9c5fad41 100644
--- a/storage/tokudb/ft-index/src/ydb_db.h
+++ b/storage/tokudb/ft-index/src/ydb_db.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_env_func.cc b/storage/tokudb/ft-index/src/ydb_env_func.cc
index e7a1a31fcce..4dda9027fff 100644
--- a/storage/tokudb/ft-index/src/ydb_env_func.cc
+++ b/storage/tokudb/ft-index/src/ydb_env_func.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_env_func.h b/storage/tokudb/ft-index/src/ydb_env_func.h
index 2fb0c202f90..1e86d1897ee 100644
--- a/storage/tokudb/ft-index/src/ydb_env_func.h
+++ b/storage/tokudb/ft-index/src/ydb_env_func.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_lib.cc b/storage/tokudb/ft-index/src/ydb_lib.cc
index 12742cad5c2..c1fa2930264 100644
--- a/storage/tokudb/ft-index/src/ydb_lib.cc
+++ b/storage/tokudb/ft-index/src/ydb_lib.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_load.h b/storage/tokudb/ft-index/src/ydb_load.h
index c815969a97c..985185f3141 100644
--- a/storage/tokudb/ft-index/src/ydb_load.h
+++ b/storage/tokudb/ft-index/src/ydb_load.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_row_lock.cc b/storage/tokudb/ft-index/src/ydb_row_lock.cc
index 4dd527220ec..2f67ea80c63 100644
--- a/storage/tokudb/ft-index/src/ydb_row_lock.cc
+++ b/storage/tokudb/ft-index/src/ydb_row_lock.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_row_lock.h b/storage/tokudb/ft-index/src/ydb_row_lock.h
index 2c3a10d92d6..79f25394343 100644
--- a/storage/tokudb/ft-index/src/ydb_row_lock.h
+++ b/storage/tokudb/ft-index/src/ydb_row_lock.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_txn.cc b/storage/tokudb/ft-index/src/ydb_txn.cc
index 885c6b713b2..cef5eedb1e5 100644
--- a/storage/tokudb/ft-index/src/ydb_txn.cc
+++ b/storage/tokudb/ft-index/src/ydb_txn.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_txn.h b/storage/tokudb/ft-index/src/ydb_txn.h
index a2e5a3b09e2..012bacebe1d 100644
--- a/storage/tokudb/ft-index/src/ydb_txn.h
+++ b/storage/tokudb/ft-index/src/ydb_txn.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_write.cc b/storage/tokudb/ft-index/src/ydb_write.cc
index b6d9ac6b338..253489d35ac 100644
--- a/storage/tokudb/ft-index/src/ydb_write.cc
+++ b/storage/tokudb/ft-index/src/ydb_write.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/src/ydb_write.h b/storage/tokudb/ft-index/src/ydb_write.h
index 00c4ab4da5e..8b83ea057a3 100644
--- a/storage/tokudb/ft-index/src/ydb_write.h
+++ b/storage/tokudb/ft-index/src/ydb_write.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/COPYING.GPLv2 b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/COPYING.GPLv2
index d511905c164..6e475df5526 100644
--- a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/COPYING.GPLv2
+++ b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/COPYING.GPLv2
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have 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.
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/COPYING.LGPLv2.1 b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/COPYING.LGPLv2.1
index 5ab7695ab8c..dbe030ddc61 100644
--- a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/COPYING.LGPLv2.1
+++ b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/COPYING.LGPLv2.1
@@ -2,7 +2,7 @@
 		       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; 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
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.guess b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.guess
index da833146088..f2f52511126 100755
--- a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.guess
+++ b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.guess
@@ -19,7 +19,7 @@ timestamp='2009-04-27'
 # You should have 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.
+# 02110-1335  USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.sub b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.sub
index a39437d0158..8b9b9b533cd 100755
--- a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.sub
+++ b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.sub
@@ -23,7 +23,7 @@ timestamp='2009-04-17'
 # You should have 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.
+# 02110-1335  USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/ltmain.sh b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/ltmain.sh
index b36c4ad366c..58923bb7bfe 100755
--- a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/ltmain.sh
+++ b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/ltmain.sh
@@ -26,7 +26,7 @@
 # along with GNU Libtool; see the file COPYING.  If not, a copy
 # can be downloaded from http://www.gnu.org/licenses/gpl.html,
 # or obtained by writing 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.
 
 # Usage: $progname [OPTION]... [MODE-ARG]...
 #
diff --git a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/configure b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/configure
index 9dc3178ba75..d621f231a1b 100755
--- a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/configure
+++ b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/configure
@@ -22183,7 +22183,7 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
 # along with GNU Libtool; see the file COPYING.  If not, a copy
 # can be downloaded from http://www.gnu.org/licenses/gpl.html, or
 # obtained by writing 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.
 
 
 # The names of the tagged configurations supported by this script.
diff --git a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt.c b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt.c
index a5908a4ad37..e5a2e45c7fe 100644
--- a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt.c
+++ b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt.c
@@ -20,7 +20,7 @@
 
    You should have received a copy of the GNU Lesser 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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335  USA.  */
 
 #ifndef _LIBC
 # include 
diff --git a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt.in.h b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt.in.h
index fc2a1351026..9b79b63d101 100644
--- a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt.in.h
+++ b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt.in.h
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU Lesser 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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335  USA.  */
 
 #ifndef _GETOPT_H
 
diff --git a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt1.c b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt1.c
index e7df1c8b17c..53e588d5493 100644
--- a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt1.c
+++ b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt1.c
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU Lesser 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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335  USA.  */
 
 #ifdef _LIBC
 # include 
diff --git a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt_int.h b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt_int.h
index 7eed4f1a8ba..1585d4106d0 100644
--- a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt_int.h
+++ b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/lib/getopt_int.h
@@ -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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335  USA.  */
 
 #ifndef _GETOPT_INT_H
 #define _GETOPT_INT_H	1
diff --git a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/m4/libtool.m4 b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/m4/libtool.m4
index 39ba996cb96..7cb4594d5cd 100644
--- a/storage/tokudb/ft-index/third_party/xz-4.999.9beta/m4/libtool.m4
+++ b/storage/tokudb/ft-index/third_party/xz-4.999.9beta/m4/libtool.m4
@@ -34,7 +34,7 @@ m4_define([_LT_COPYING], [dnl
 # along with GNU Libtool; see the file COPYING.  If not, a copy
 # can be downloaded from http://www.gnu.org/licenses/gpl.html, or
 # obtained by writing 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.
 ])
 
 # serial 56 LT_INIT
diff --git a/storage/tokudb/ft-index/tools/ba_replay.cc b/storage/tokudb/ft-index/tools/ba_replay.cc
index 8f2bc3a02ec..8a9d8e13bf3 100644
--- a/storage/tokudb/ft-index/tools/ba_replay.cc
+++ b/storage/tokudb/ft-index/tools/ba_replay.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/tools/ftverify.cc b/storage/tokudb/ft-index/tools/ftverify.cc
index 13e171f9f92..25f045f4d21 100644
--- a/storage/tokudb/ft-index/tools/ftverify.cc
+++ b/storage/tokudb/ft-index/tools/ftverify.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/tools/tdb-recover.cc b/storage/tokudb/ft-index/tools/tdb-recover.cc
index 8f185bedb04..d211940f4fd 100644
--- a/storage/tokudb/ft-index/tools/tdb-recover.cc
+++ b/storage/tokudb/ft-index/tools/tdb-recover.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/tools/tokudb_dump.cc b/storage/tokudb/ft-index/tools/tokudb_dump.cc
index b162c5caece..a4b58adbeb9 100644
--- a/storage/tokudb/ft-index/tools/tokudb_dump.cc
+++ b/storage/tokudb/ft-index/tools/tokudb_dump.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/tools/tokuft_logprint.cc b/storage/tokudb/ft-index/tools/tokuft_logprint.cc
index 1dd7581b9f5..6db781da8b4 100644
--- a/storage/tokudb/ft-index/tools/tokuft_logprint.cc
+++ b/storage/tokudb/ft-index/tools/tokuft_logprint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/tools/tokuftdump.cc b/storage/tokudb/ft-index/tools/tokuftdump.cc
index 14c3c31a061..0ee2dbeda4c 100644
--- a/storage/tokudb/ft-index/tools/tokuftdump.cc
+++ b/storage/tokudb/ft-index/tools/tokuftdump.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/bytestring.h b/storage/tokudb/ft-index/util/bytestring.h
index 1fea03ecfd1..a8282943419 100644
--- a/storage/tokudb/ft-index/util/bytestring.h
+++ b/storage/tokudb/ft-index/util/bytestring.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/circular_buffer.cc b/storage/tokudb/ft-index/util/circular_buffer.cc
index 92d9af521f7..921d24d8249 100644
--- a/storage/tokudb/ft-index/util/circular_buffer.cc
+++ b/storage/tokudb/ft-index/util/circular_buffer.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/circular_buffer.h b/storage/tokudb/ft-index/util/circular_buffer.h
index 904dfed7c49..8bf0d6982de 100644
--- a/storage/tokudb/ft-index/util/circular_buffer.h
+++ b/storage/tokudb/ft-index/util/circular_buffer.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/constexpr.h b/storage/tokudb/ft-index/util/constexpr.h
index ed71daaf3fe..bca9369980c 100644
--- a/storage/tokudb/ft-index/util/constexpr.h
+++ b/storage/tokudb/ft-index/util/constexpr.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/context.cc b/storage/tokudb/ft-index/util/context.cc
index 6166be41294..f6f1f7184dd 100644
--- a/storage/tokudb/ft-index/util/context.cc
+++ b/storage/tokudb/ft-index/util/context.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/context.h b/storage/tokudb/ft-index/util/context.h
index 04aef5c5e3b..2c3368e6057 100644
--- a/storage/tokudb/ft-index/util/context.h
+++ b/storage/tokudb/ft-index/util/context.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/dbt.cc b/storage/tokudb/ft-index/util/dbt.cc
index aa26a9b0dd9..0cc84aa6f11 100644
--- a/storage/tokudb/ft-index/util/dbt.cc
+++ b/storage/tokudb/ft-index/util/dbt.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/dbt.h b/storage/tokudb/ft-index/util/dbt.h
index 4d78068cb67..64696164e48 100644
--- a/storage/tokudb/ft-index/util/dbt.h
+++ b/storage/tokudb/ft-index/util/dbt.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/dmt.cc b/storage/tokudb/ft-index/util/dmt.cc
index 1a7e2db9f40..91542f21a1e 100644
--- a/storage/tokudb/ft-index/util/dmt.cc
+++ b/storage/tokudb/ft-index/util/dmt.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/dmt.h b/storage/tokudb/ft-index/util/dmt.h
index 43e44df6a70..84e15198cc0 100644
--- a/storage/tokudb/ft-index/util/dmt.h
+++ b/storage/tokudb/ft-index/util/dmt.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/doubly_linked_list.h b/storage/tokudb/ft-index/util/doubly_linked_list.h
index 738e2736fa1..c110630d39b 100644
--- a/storage/tokudb/ft-index/util/doubly_linked_list.h
+++ b/storage/tokudb/ft-index/util/doubly_linked_list.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/frwlock.cc b/storage/tokudb/ft-index/util/frwlock.cc
index fac0c07967b..feb525262fb 100644
--- a/storage/tokudb/ft-index/util/frwlock.cc
+++ b/storage/tokudb/ft-index/util/frwlock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/frwlock.h b/storage/tokudb/ft-index/util/frwlock.h
index 985c92bccb4..7bdb818cbe1 100644
--- a/storage/tokudb/ft-index/util/frwlock.h
+++ b/storage/tokudb/ft-index/util/frwlock.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/growable_array.h b/storage/tokudb/ft-index/util/growable_array.h
index b452f94366c..ba0eb6ec79d 100644
--- a/storage/tokudb/ft-index/util/growable_array.h
+++ b/storage/tokudb/ft-index/util/growable_array.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/kibbutz.cc b/storage/tokudb/ft-index/util/kibbutz.cc
index ad0c0b30788..16c0354c011 100644
--- a/storage/tokudb/ft-index/util/kibbutz.cc
+++ b/storage/tokudb/ft-index/util/kibbutz.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/kibbutz.h b/storage/tokudb/ft-index/util/kibbutz.h
index 25515887700..b8b83d867c5 100644
--- a/storage/tokudb/ft-index/util/kibbutz.h
+++ b/storage/tokudb/ft-index/util/kibbutz.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/memarena.cc b/storage/tokudb/ft-index/util/memarena.cc
index d8c0daa0ba0..05ba27ffb17 100644
--- a/storage/tokudb/ft-index/util/memarena.cc
+++ b/storage/tokudb/ft-index/util/memarena.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/memarena.h b/storage/tokudb/ft-index/util/memarena.h
index 8d1b577222e..30401669b36 100644
--- a/storage/tokudb/ft-index/util/memarena.h
+++ b/storage/tokudb/ft-index/util/memarena.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/mempool.cc b/storage/tokudb/ft-index/util/mempool.cc
index 23200ee41ad..d2cfa95368e 100644
--- a/storage/tokudb/ft-index/util/mempool.cc
+++ b/storage/tokudb/ft-index/util/mempool.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/mempool.h b/storage/tokudb/ft-index/util/mempool.h
index e1a47e66591..93160bbe89e 100644
--- a/storage/tokudb/ft-index/util/mempool.h
+++ b/storage/tokudb/ft-index/util/mempool.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/minicron.cc b/storage/tokudb/ft-index/util/minicron.cc
index 601e1fd40d4..4dcee91c02a 100644
--- a/storage/tokudb/ft-index/util/minicron.cc
+++ b/storage/tokudb/ft-index/util/minicron.cc
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/minicron.h b/storage/tokudb/ft-index/util/minicron.h
index b97c5687561..175e2fa8b91 100644
--- a/storage/tokudb/ft-index/util/minicron.h
+++ b/storage/tokudb/ft-index/util/minicron.h
@@ -24,7 +24,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/nb_mutex.h b/storage/tokudb/ft-index/util/nb_mutex.h
index cc350813622..2eb6685fa6a 100644
--- a/storage/tokudb/ft-index/util/nb_mutex.h
+++ b/storage/tokudb/ft-index/util/nb_mutex.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/omt.cc b/storage/tokudb/ft-index/util/omt.cc
index bb3fc34c513..20dbebf8532 100644
--- a/storage/tokudb/ft-index/util/omt.cc
+++ b/storage/tokudb/ft-index/util/omt.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/omt.h b/storage/tokudb/ft-index/util/omt.h
index 6cf3f80d2bc..df2e78add20 100644
--- a/storage/tokudb/ft-index/util/omt.h
+++ b/storage/tokudb/ft-index/util/omt.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/partitioned_counter.cc b/storage/tokudb/ft-index/util/partitioned_counter.cc
index 70dff209f3b..74226af7d8f 100644
--- a/storage/tokudb/ft-index/util/partitioned_counter.cc
+++ b/storage/tokudb/ft-index/util/partitioned_counter.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/partitioned_counter.h b/storage/tokudb/ft-index/util/partitioned_counter.h
index 4da0e084a82..3f4d1856433 100644
--- a/storage/tokudb/ft-index/util/partitioned_counter.h
+++ b/storage/tokudb/ft-index/util/partitioned_counter.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/queue.cc b/storage/tokudb/ft-index/util/queue.cc
index 7a2fefaefec..fff81c3e627 100644
--- a/storage/tokudb/ft-index/util/queue.cc
+++ b/storage/tokudb/ft-index/util/queue.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/queue.h b/storage/tokudb/ft-index/util/queue.h
index 88c7d99c200..bf742d704b8 100644
--- a/storage/tokudb/ft-index/util/queue.h
+++ b/storage/tokudb/ft-index/util/queue.h
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/rwlock.h b/storage/tokudb/ft-index/util/rwlock.h
index 14b447a450f..7c117773d14 100644
--- a/storage/tokudb/ft-index/util/rwlock.h
+++ b/storage/tokudb/ft-index/util/rwlock.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/scoped_malloc.cc b/storage/tokudb/ft-index/util/scoped_malloc.cc
index 15d4fb3e52e..e4c6fc9024d 100644
--- a/storage/tokudb/ft-index/util/scoped_malloc.cc
+++ b/storage/tokudb/ft-index/util/scoped_malloc.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/scoped_malloc.h b/storage/tokudb/ft-index/util/scoped_malloc.h
index 0233b0f1aa5..4345c9a7b7b 100644
--- a/storage/tokudb/ft-index/util/scoped_malloc.h
+++ b/storage/tokudb/ft-index/util/scoped_malloc.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/sort.h b/storage/tokudb/ft-index/util/sort.h
index 2925f791029..efa0b52f4ef 100644
--- a/storage/tokudb/ft-index/util/sort.h
+++ b/storage/tokudb/ft-index/util/sort.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/status.h b/storage/tokudb/ft-index/util/status.h
index 1ab6d35e560..0bdb8430bfd 100644
--- a/storage/tokudb/ft-index/util/status.h
+++ b/storage/tokudb/ft-index/util/status.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/marked-omt-test.cc b/storage/tokudb/ft-index/util/tests/marked-omt-test.cc
index 97e4cf72d61..e7c344fbd44 100644
--- a/storage/tokudb/ft-index/util/tests/marked-omt-test.cc
+++ b/storage/tokudb/ft-index/util/tests/marked-omt-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/memarena-test.cc b/storage/tokudb/ft-index/util/tests/memarena-test.cc
index 7374539d11a..7fe5c088d72 100644
--- a/storage/tokudb/ft-index/util/tests/memarena-test.cc
+++ b/storage/tokudb/ft-index/util/tests/memarena-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/minicron-test.cc b/storage/tokudb/ft-index/util/tests/minicron-test.cc
index 7729edbda84..32645663385 100644
--- a/storage/tokudb/ft-index/util/tests/minicron-test.cc
+++ b/storage/tokudb/ft-index/util/tests/minicron-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/omt-test.cc b/storage/tokudb/ft-index/util/tests/omt-test.cc
index 28daed80965..672bcc0e748 100644
--- a/storage/tokudb/ft-index/util/tests/omt-test.cc
+++ b/storage/tokudb/ft-index/util/tests/omt-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/omt-tmpl-test.cc b/storage/tokudb/ft-index/util/tests/omt-tmpl-test.cc
index 455502d50e9..771e2414d1d 100644
--- a/storage/tokudb/ft-index/util/tests/omt-tmpl-test.cc
+++ b/storage/tokudb/ft-index/util/tests/omt-tmpl-test.cc
@@ -26,7 +26,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/queue-test.cc b/storage/tokudb/ft-index/util/tests/queue-test.cc
index d15e9ccab96..fa3f90fda78 100644
--- a/storage/tokudb/ft-index/util/tests/queue-test.cc
+++ b/storage/tokudb/ft-index/util/tests/queue-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/rwlock_condvar.h b/storage/tokudb/ft-index/util/tests/rwlock_condvar.h
index 58e7a61ae42..7c08321100d 100644
--- a/storage/tokudb/ft-index/util/tests/rwlock_condvar.h
+++ b/storage/tokudb/ft-index/util/tests/rwlock_condvar.h
@@ -29,7 +29,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/sm-basic.cc b/storage/tokudb/ft-index/util/tests/sm-basic.cc
index 5df64294721..6eddc1e3a09 100644
--- a/storage/tokudb/ft-index/util/tests/sm-basic.cc
+++ b/storage/tokudb/ft-index/util/tests/sm-basic.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/sm-crash-double-free.cc b/storage/tokudb/ft-index/util/tests/sm-crash-double-free.cc
index 653d4148fd0..a0066f2505f 100644
--- a/storage/tokudb/ft-index/util/tests/sm-crash-double-free.cc
+++ b/storage/tokudb/ft-index/util/tests/sm-crash-double-free.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/sort-tmpl-test.cc b/storage/tokudb/ft-index/util/tests/sort-tmpl-test.cc
index 7597c4fa5a7..ed4d6ba8c38 100644
--- a/storage/tokudb/ft-index/util/tests/sort-tmpl-test.cc
+++ b/storage/tokudb/ft-index/util/tests/sort-tmpl-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/test-kibbutz.cc b/storage/tokudb/ft-index/util/tests/test-kibbutz.cc
index dd5a7facf64..e6912c3b3a5 100644
--- a/storage/tokudb/ft-index/util/tests/test-kibbutz.cc
+++ b/storage/tokudb/ft-index/util/tests/test-kibbutz.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/test-kibbutz2.cc b/storage/tokudb/ft-index/util/tests/test-kibbutz2.cc
index 80b97ff69c6..601d1b0579d 100644
--- a/storage/tokudb/ft-index/util/tests/test-kibbutz2.cc
+++ b/storage/tokudb/ft-index/util/tests/test-kibbutz2.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/test-rwlock-cheapness.cc b/storage/tokudb/ft-index/util/tests/test-rwlock-cheapness.cc
index ac04da16b85..7bec8d9db18 100644
--- a/storage/tokudb/ft-index/util/tests/test-rwlock-cheapness.cc
+++ b/storage/tokudb/ft-index/util/tests/test-rwlock-cheapness.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/test-rwlock.cc b/storage/tokudb/ft-index/util/tests/test-rwlock.cc
index c4988aab85d..12ff7f2d99d 100644
--- a/storage/tokudb/ft-index/util/tests/test-rwlock.cc
+++ b/storage/tokudb/ft-index/util/tests/test-rwlock.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/test.h b/storage/tokudb/ft-index/util/tests/test.h
index 6ca60105d93..4247b08cf84 100644
--- a/storage/tokudb/ft-index/util/tests/test.h
+++ b/storage/tokudb/ft-index/util/tests/test.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/test_circular_buffer.cc b/storage/tokudb/ft-index/util/tests/test_circular_buffer.cc
index 8bf0b646e4a..2430dbec4ca 100644
--- a/storage/tokudb/ft-index/util/tests/test_circular_buffer.cc
+++ b/storage/tokudb/ft-index/util/tests/test_circular_buffer.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/test_doubly_linked_list.cc b/storage/tokudb/ft-index/util/tests/test_doubly_linked_list.cc
index 94e6b0a3489..b2f6cd07e2a 100644
--- a/storage/tokudb/ft-index/util/tests/test_doubly_linked_list.cc
+++ b/storage/tokudb/ft-index/util/tests/test_doubly_linked_list.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/test_partitioned_counter.cc b/storage/tokudb/ft-index/util/tests/test_partitioned_counter.cc
index ce09aa04229..0b1b4cf9f03 100644
--- a/storage/tokudb/ft-index/util/tests/test_partitioned_counter.cc
+++ b/storage/tokudb/ft-index/util/tests/test_partitioned_counter.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/test_partitioned_counter_5833.cc b/storage/tokudb/ft-index/util/tests/test_partitioned_counter_5833.cc
index 2e42e4d4b4e..e8e0291aa2f 100644
--- a/storage/tokudb/ft-index/util/tests/test_partitioned_counter_5833.cc
+++ b/storage/tokudb/ft-index/util/tests/test_partitioned_counter_5833.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/threadpool-nproc-limit.cc b/storage/tokudb/ft-index/util/tests/threadpool-nproc-limit.cc
index 3395a30238b..5deefa5e2f4 100644
--- a/storage/tokudb/ft-index/util/tests/threadpool-nproc-limit.cc
+++ b/storage/tokudb/ft-index/util/tests/threadpool-nproc-limit.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/threadpool-test.cc b/storage/tokudb/ft-index/util/tests/threadpool-test.cc
index b9bebc5db7d..3ad8d90ea8e 100644
--- a/storage/tokudb/ft-index/util/tests/threadpool-test.cc
+++ b/storage/tokudb/ft-index/util/tests/threadpool-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/threadpool-testrunf.cc b/storage/tokudb/ft-index/util/tests/threadpool-testrunf.cc
index b7744cbf54c..8a8e37135dc 100644
--- a/storage/tokudb/ft-index/util/tests/threadpool-testrunf.cc
+++ b/storage/tokudb/ft-index/util/tests/threadpool-testrunf.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/tests/x1764-test.cc b/storage/tokudb/ft-index/util/tests/x1764-test.cc
index 5f47e007f50..86936210fc7 100644
--- a/storage/tokudb/ft-index/util/tests/x1764-test.cc
+++ b/storage/tokudb/ft-index/util/tests/x1764-test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/threadpool.cc b/storage/tokudb/ft-index/util/threadpool.cc
index 7c8fade7ed6..4a44be974ae 100644
--- a/storage/tokudb/ft-index/util/threadpool.cc
+++ b/storage/tokudb/ft-index/util/threadpool.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/threadpool.h b/storage/tokudb/ft-index/util/threadpool.h
index ed43dea93be..31d17bd1bd1 100644
--- a/storage/tokudb/ft-index/util/threadpool.h
+++ b/storage/tokudb/ft-index/util/threadpool.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/x1764.cc b/storage/tokudb/ft-index/util/x1764.cc
index 5fb20daccee..8445a5c43a2 100644
--- a/storage/tokudb/ft-index/util/x1764.cc
+++ b/storage/tokudb/ft-index/util/x1764.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ft-index/util/x1764.h b/storage/tokudb/ft-index/util/x1764.h
index 1d83e5a1853..e5b2b9e3718 100644
--- a/storage/tokudb/ft-index/util/x1764.h
+++ b/storage/tokudb/ft-index/util/x1764.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc
index 2eb8004a296..6db65ee4476 100644
--- a/storage/tokudb/ha_tokudb.cc
+++ b/storage/tokudb/ha_tokudb.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ha_tokudb.h b/storage/tokudb/ha_tokudb.h
index 6c4055fc621..6b5a2c4ecfe 100644
--- a/storage/tokudb/ha_tokudb.h
+++ b/storage/tokudb/ha_tokudb.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ha_tokudb_admin.cc b/storage/tokudb/ha_tokudb_admin.cc
index 42205c6d6be..ba87fedb487 100644
--- a/storage/tokudb/ha_tokudb_admin.cc
+++ b/storage/tokudb/ha_tokudb_admin.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ha_tokudb_alter_55.cc b/storage/tokudb/ha_tokudb_alter_55.cc
index af46b24be3a..2b02d616dff 100644
--- a/storage/tokudb/ha_tokudb_alter_55.cc
+++ b/storage/tokudb/ha_tokudb_alter_55.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ha_tokudb_alter_56.cc b/storage/tokudb/ha_tokudb_alter_56.cc
index 213b58459bc..81517e7f8a4 100644
--- a/storage/tokudb/ha_tokudb_alter_56.cc
+++ b/storage/tokudb/ha_tokudb_alter_56.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ha_tokudb_alter_common.cc b/storage/tokudb/ha_tokudb_alter_common.cc
index 414e8280daf..405903471bc 100644
--- a/storage/tokudb/ha_tokudb_alter_common.cc
+++ b/storage/tokudb/ha_tokudb_alter_common.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ha_tokudb_mrr_maria.cc b/storage/tokudb/ha_tokudb_mrr_maria.cc
index 7bf975a2221..627dfb00d20 100644
--- a/storage/tokudb/ha_tokudb_mrr_maria.cc
+++ b/storage/tokudb/ha_tokudb_mrr_maria.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ha_tokudb_mrr_mysql.cc b/storage/tokudb/ha_tokudb_mrr_mysql.cc
index fba4556337a..11552a766b1 100644
--- a/storage/tokudb/ha_tokudb_mrr_mysql.cc
+++ b/storage/tokudb/ha_tokudb_mrr_mysql.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/ha_tokudb_update.cc b/storage/tokudb/ha_tokudb_update.cc
index 14cc7dd87f6..b2bced994d6 100644
--- a/storage/tokudb/ha_tokudb_update.cc
+++ b/storage/tokudb/ha_tokudb_update.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/hatoku_cmp.cc b/storage/tokudb/hatoku_cmp.cc
index 42c0db81c8d..ba6d9eee139 100644
--- a/storage/tokudb/hatoku_cmp.cc
+++ b/storage/tokudb/hatoku_cmp.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/hatoku_cmp.h b/storage/tokudb/hatoku_cmp.h
index af77d4da7e0..aba546eb7bd 100644
--- a/storage/tokudb/hatoku_cmp.h
+++ b/storage/tokudb/hatoku_cmp.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/hatoku_defines.h b/storage/tokudb/hatoku_defines.h
index 862c8f3cf23..3e7b10d8772 100644
--- a/storage/tokudb/hatoku_defines.h
+++ b/storage/tokudb/hatoku_defines.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc
index 6c6794b05a0..a164d77c9ca 100644
--- a/storage/tokudb/hatoku_hton.cc
+++ b/storage/tokudb/hatoku_hton.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/hatoku_hton.h b/storage/tokudb/hatoku_hton.h
index b74e997841d..f711ef5878e 100644
--- a/storage/tokudb/hatoku_hton.h
+++ b/storage/tokudb/hatoku_hton.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/card_1.cc b/storage/tokudb/tests/card_1.cc
index 8d0e431b778..da0aa670184 100644
--- a/storage/tokudb/tests/card_1.cc
+++ b/storage/tokudb/tests/card_1.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/card_etime.cc b/storage/tokudb/tests/card_etime.cc
index 006a3b7a7a9..3ddf9d45a79 100644
--- a/storage/tokudb/tests/card_etime.cc
+++ b/storage/tokudb/tests/card_etime.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/card_inf.cc b/storage/tokudb/tests/card_inf.cc
index 53f798a787d..944d1716291 100644
--- a/storage/tokudb/tests/card_inf.cc
+++ b/storage/tokudb/tests/card_inf.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/card_inf_1.cc b/storage/tokudb/tests/card_inf_1.cc
index 8cd86146de1..4de7b03a981 100644
--- a/storage/tokudb/tests/card_inf_1.cc
+++ b/storage/tokudb/tests/card_inf_1.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/card_random_1.cc b/storage/tokudb/tests/card_random_1.cc
index 42028b90cfe..9e8bf7da23a 100644
--- a/storage/tokudb/tests/card_random_1.cc
+++ b/storage/tokudb/tests/card_random_1.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/card_test.cc b/storage/tokudb/tests/card_test.cc
index 0bd78d78cc7..c0c60ef4daa 100644
--- a/storage/tokudb/tests/card_test.cc
+++ b/storage/tokudb/tests/card_test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/card_test_alter.cc b/storage/tokudb/tests/card_test_alter.cc
index 2a3e9396b3f..447d1fdab50 100644
--- a/storage/tokudb/tests/card_test_alter.cc
+++ b/storage/tokudb/tests/card_test_alter.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/card_test_key_info.cc b/storage/tokudb/tests/card_test_key_info.cc
index 68f61942397..3bf5b3c9b47 100644
--- a/storage/tokudb/tests/card_test_key_info.cc
+++ b/storage/tokudb/tests/card_test_key_info.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/fake_mysql.h b/storage/tokudb/tests/fake_mysql.h
index 82be0f01de0..5cc2fb508eb 100644
--- a/storage/tokudb/tests/fake_mysql.h
+++ b/storage/tokudb/tests/fake_mysql.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/math_test_int.cc b/storage/tokudb/tests/math_test_int.cc
index 1121c9f4a9d..a356cb2e56c 100644
--- a/storage/tokudb/tests/math_test_int.cc
+++ b/storage/tokudb/tests/math_test_int.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/math_test_uint.cc b/storage/tokudb/tests/math_test_uint.cc
index b44dc83c146..3371a486f28 100644
--- a/storage/tokudb/tests/math_test_uint.cc
+++ b/storage/tokudb/tests/math_test_uint.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/max_test.cc b/storage/tokudb/tests/max_test.cc
index c0207dc0b13..c745eeacdac 100644
--- a/storage/tokudb/tests/max_test.cc
+++ b/storage/tokudb/tests/max_test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/sint_test.cc b/storage/tokudb/tests/sint_test.cc
index bba536d33db..5374b030b35 100644
--- a/storage/tokudb/tests/sint_test.cc
+++ b/storage/tokudb/tests/sint_test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/tokudb_buffer_test.cc b/storage/tokudb/tests/tokudb_buffer_test.cc
index 2793d549258..396c29ea1ec 100644
--- a/storage/tokudb/tests/tokudb_buffer_test.cc
+++ b/storage/tokudb/tests/tokudb_buffer_test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/uint_test.cc b/storage/tokudb/tests/uint_test.cc
index 07b2e33c80d..87d37dd346d 100644
--- a/storage/tokudb/tests/uint_test.cc
+++ b/storage/tokudb/tests/uint_test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/vlq_test.cc b/storage/tokudb/tests/vlq_test.cc
index 7cd17dda15f..4343f06a185 100644
--- a/storage/tokudb/tests/vlq_test.cc
+++ b/storage/tokudb/tests/vlq_test.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/vlq_test_uint32.cc b/storage/tokudb/tests/vlq_test_uint32.cc
index 494d3155389..6eeb3bc84f2 100644
--- a/storage/tokudb/tests/vlq_test_uint32.cc
+++ b/storage/tokudb/tests/vlq_test_uint32.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tests/vlq_test_uint64.cc b/storage/tokudb/tests/vlq_test_uint64.cc
index 79b83a9427a..cfdbd85527c 100644
--- a/storage/tokudb/tests/vlq_test_uint64.cc
+++ b/storage/tokudb/tests/vlq_test_uint64.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tokudb_buffer.h b/storage/tokudb/tokudb_buffer.h
index 6beaa859f08..dee45ad0be3 100644
--- a/storage/tokudb/tokudb_buffer.h
+++ b/storage/tokudb/tokudb_buffer.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tokudb_card.h b/storage/tokudb/tokudb_card.h
index 22e6fb9b3da..4374653d967 100644
--- a/storage/tokudb/tokudb_card.h
+++ b/storage/tokudb/tokudb_card.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tokudb_math.h b/storage/tokudb/tokudb_math.h
index b6a7f9e22d0..cf9b7d41ff4 100644
--- a/storage/tokudb/tokudb_math.h
+++ b/storage/tokudb/tokudb_math.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tokudb_status.h b/storage/tokudb/tokudb_status.h
index e352092d56b..b928804934f 100644
--- a/storage/tokudb/tokudb_status.h
+++ b/storage/tokudb/tokudb_status.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tokudb_update_fun.cc b/storage/tokudb/tokudb_update_fun.cc
index 9754dc989a2..6f0b9747e74 100644
--- a/storage/tokudb/tokudb_update_fun.cc
+++ b/storage/tokudb/tokudb_update_fun.cc
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/tokudb/tokudb_vlq.h b/storage/tokudb/tokudb_vlq.h
index 1885eb2e0dd..818b325c5c7 100644
--- a/storage/tokudb/tokudb_vlq.h
+++ b/storage/tokudb/tokudb_vlq.h
@@ -25,7 +25,7 @@ COPYING CONDITIONS NOTICE:
   You should have 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.
+  02110-1335  USA.
 
 COPYRIGHT NOTICE:
 
diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt
index fe86358a594..5a89e8ccc54 100644
--- a/storage/xtradb/CMakeLists.txt
+++ b/storage/xtradb/CMakeLists.txt
@@ -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 is the CMakeLists for XtraDB
 
diff --git a/storage/xtradb/btr/btr0pcur.c b/storage/xtradb/btr/btr0pcur.c
index c197009b003..5c67e40b9fa 100644
--- a/storage/xtradb/btr/btr0pcur.c
+++ b/storage/xtradb/btr/btr0pcur.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/btr/btr0sea.c b/storage/xtradb/btr/btr0sea.c
index 9fe6fa54b97..a1355156b27 100644
--- a/storage/xtradb/btr/btr0sea.c
+++ b/storage/xtradb/btr/btr0sea.c
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/buf/buf0buddy.c b/storage/xtradb/buf/buf0buddy.c
index 9e37ad2a7cb..40c917d5662 100644
--- a/storage/xtradb/buf/buf0buddy.c
+++ b/storage/xtradb/buf/buf0buddy.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/buf/buf0buf.c b/storage/xtradb/buf/buf0buf.c
index 0b0a00cd1ed..70241a01a59 100644
--- a/storage/xtradb/buf/buf0buf.c
+++ b/storage/xtradb/buf/buf0buf.c
@@ -20,7 +20,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/buf/buf0flu.c b/storage/xtradb/buf/buf0flu.c
index 45fe2aa3f53..59011245beb 100644
--- a/storage/xtradb/buf/buf0flu.c
+++ b/storage/xtradb/buf/buf0flu.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/buf/buf0lru.c b/storage/xtradb/buf/buf0lru.c
index 9c0b171d3f6..815ced00a27 100644
--- a/storage/xtradb/buf/buf0lru.c
+++ b/storage/xtradb/buf/buf0lru.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/buf/buf0rea.c b/storage/xtradb/buf/buf0rea.c
index e4e6415c341..ed1e0c96c31 100644
--- a/storage/xtradb/buf/buf0rea.c
+++ b/storage/xtradb/buf/buf0rea.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/data/data0data.c b/storage/xtradb/data/data0data.c
index 51054679762..daf10404073 100644
--- a/storage/xtradb/data/data0data.c
+++ b/storage/xtradb/data/data0data.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/data/data0type.c b/storage/xtradb/data/data0type.c
index c278cc8821e..bc5288cb1a8 100644
--- a/storage/xtradb/data/data0type.c
+++ b/storage/xtradb/data/data0type.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/dict/dict0boot.c b/storage/xtradb/dict/dict0boot.c
index 692c37cc5a2..4bbf552fb48 100644
--- a/storage/xtradb/dict/dict0boot.c
+++ b/storage/xtradb/dict/dict0boot.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/dict/dict0crea.c b/storage/xtradb/dict/dict0crea.c
index e9484a04176..9486dd76647 100644
--- a/storage/xtradb/dict/dict0crea.c
+++ b/storage/xtradb/dict/dict0crea.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/dict/dict0load.c b/storage/xtradb/dict/dict0load.c
index 3582e2cf085..17fa2903c7a 100644
--- a/storage/xtradb/dict/dict0load.c
+++ b/storage/xtradb/dict/dict0load.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/dict/dict0mem.c b/storage/xtradb/dict/dict0mem.c
index 253d766d5b3..e205c79836c 100644
--- a/storage/xtradb/dict/dict0mem.c
+++ b/storage/xtradb/dict/dict0mem.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/eval/eval0eval.c b/storage/xtradb/eval/eval0eval.c
index fc34ce83a0f..12a17be7112 100644
--- a/storage/xtradb/eval/eval0eval.c
+++ b/storage/xtradb/eval/eval0eval.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/eval/eval0proc.c b/storage/xtradb/eval/eval0proc.c
index ba93fdd3977..0a5c2ccfa5b 100644
--- a/storage/xtradb/eval/eval0proc.c
+++ b/storage/xtradb/eval/eval0proc.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/fil/fil0fil.c b/storage/xtradb/fil/fil0fil.c
index fc305c7e01f..35969a16937 100644
--- a/storage/xtradb/fil/fil0fil.c
+++ b/storage/xtradb/fil/fil0fil.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/fut/fut0fut.c b/storage/xtradb/fut/fut0fut.c
index 35dc66b8914..9e16f760cac 100644
--- a/storage/xtradb/fut/fut0fut.c
+++ b/storage/xtradb/fut/fut0fut.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/fut/fut0lst.c b/storage/xtradb/fut/fut0lst.c
index a008b7453a1..f86c7d3b61e 100644
--- a/storage/xtradb/fut/fut0lst.c
+++ b/storage/xtradb/fut/fut0lst.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/ha/ha0ha.c b/storage/xtradb/ha/ha0ha.c
index 4e0b9a78841..517287e948c 100644
--- a/storage/xtradb/ha/ha0ha.c
+++ b/storage/xtradb/ha/ha0ha.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/ha/ha0storage.c b/storage/xtradb/ha/ha0storage.c
index 95973753906..804370ca7cc 100644
--- a/storage/xtradb/ha/ha0storage.c
+++ b/storage/xtradb/ha/ha0storage.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/ha/hash0hash.c b/storage/xtradb/ha/hash0hash.c
index e594b3f6bd2..31feea77dd2 100644
--- a/storage/xtradb/ha/hash0hash.c
+++ b/storage/xtradb/ha/hash0hash.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/handler/ha_innodb.h b/storage/xtradb/handler/ha_innodb.h
index 4c2e865e6ae..f8b7a056ac8 100644
--- a/storage/xtradb/handler/ha_innodb.h
+++ b/storage/xtradb/handler/ha_innodb.h
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/handler/i_s.cc b/storage/xtradb/handler/i_s.cc
index 9f05a8a751c..09504965f35 100644
--- a/storage/xtradb/handler/i_s.cc
+++ b/storage/xtradb/handler/i_s.cc
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/handler/i_s.h b/storage/xtradb/handler/i_s.h
index 4d3913a544c..027f00691d5 100644
--- a/storage/xtradb/handler/i_s.h
+++ b/storage/xtradb/handler/i_s.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/btr0btr.ic b/storage/xtradb/include/btr0btr.ic
index 21eaa9bd026..4ad2cfa2b4e 100644
--- a/storage/xtradb/include/btr0btr.ic
+++ b/storage/xtradb/include/btr0btr.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/btr0pcur.h b/storage/xtradb/include/btr0pcur.h
index d9ce02283d7..d79cd466a0e 100644
--- a/storage/xtradb/include/btr0pcur.h
+++ b/storage/xtradb/include/btr0pcur.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/btr0pcur.ic b/storage/xtradb/include/btr0pcur.ic
index 647e8d0cde9..ab132e1415c 100644
--- a/storage/xtradb/include/btr0pcur.ic
+++ b/storage/xtradb/include/btr0pcur.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/btr0sea.h b/storage/xtradb/include/btr0sea.h
index bdffe402277..c9647bdb1d1 100644
--- a/storage/xtradb/include/btr0sea.h
+++ b/storage/xtradb/include/btr0sea.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/btr0sea.ic b/storage/xtradb/include/btr0sea.ic
index 677cb52f458..a52856e3e98 100644
--- a/storage/xtradb/include/btr0sea.ic
+++ b/storage/xtradb/include/btr0sea.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/btr0types.h b/storage/xtradb/include/btr0types.h
index a7cd64df276..c27c3bb1960 100644
--- a/storage/xtradb/include/btr0types.h
+++ b/storage/xtradb/include/btr0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/buf0buddy.h b/storage/xtradb/include/buf0buddy.h
index 7060316dad9..c93f7e223ab 100644
--- a/storage/xtradb/include/buf0buddy.h
+++ b/storage/xtradb/include/buf0buddy.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/buf0buddy.ic b/storage/xtradb/include/buf0buddy.ic
index 2b5e62e97b2..09ca470e662 100644
--- a/storage/xtradb/include/buf0buddy.ic
+++ b/storage/xtradb/include/buf0buddy.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/buf0flu.h b/storage/xtradb/include/buf0flu.h
index 81085ab9552..ed01b627bf4 100644
--- a/storage/xtradb/include/buf0flu.h
+++ b/storage/xtradb/include/buf0flu.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/buf0flu.ic b/storage/xtradb/include/buf0flu.ic
index c8d95d1849c..5f676fbfe60 100644
--- a/storage/xtradb/include/buf0flu.ic
+++ b/storage/xtradb/include/buf0flu.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/buf0lru.h b/storage/xtradb/include/buf0lru.h
index 2c845e6fbc4..6549bd101ae 100644
--- a/storage/xtradb/include/buf0lru.h
+++ b/storage/xtradb/include/buf0lru.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/buf0lru.ic b/storage/xtradb/include/buf0lru.ic
index d1a89b9fbee..fdec086d4f0 100644
--- a/storage/xtradb/include/buf0lru.ic
+++ b/storage/xtradb/include/buf0lru.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/buf0rea.h b/storage/xtradb/include/buf0rea.h
index 613b89e9f5c..51051007624 100644
--- a/storage/xtradb/include/buf0rea.h
+++ b/storage/xtradb/include/buf0rea.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/buf0types.h b/storage/xtradb/include/buf0types.h
index 9a0af8b648b..1eeff49060d 100644
--- a/storage/xtradb/include/buf0types.h
+++ b/storage/xtradb/include/buf0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/data0data.h b/storage/xtradb/include/data0data.h
index c6e864dafc9..61e65d98c1b 100644
--- a/storage/xtradb/include/data0data.h
+++ b/storage/xtradb/include/data0data.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/data0data.ic b/storage/xtradb/include/data0data.ic
index 2059eefaf89..961e28fb3fe 100644
--- a/storage/xtradb/include/data0data.ic
+++ b/storage/xtradb/include/data0data.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/data0type.h b/storage/xtradb/include/data0type.h
index 852e18153c2..6b6da11732c 100644
--- a/storage/xtradb/include/data0type.h
+++ b/storage/xtradb/include/data0type.h
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/data0type.ic b/storage/xtradb/include/data0type.ic
index 9b52983a7bb..fa5cbdca4a9 100644
--- a/storage/xtradb/include/data0type.ic
+++ b/storage/xtradb/include/data0type.ic
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/data0types.h b/storage/xtradb/include/data0types.h
index 245aca599c0..3f733d14d0c 100644
--- a/storage/xtradb/include/data0types.h
+++ b/storage/xtradb/include/data0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/dict0boot.h b/storage/xtradb/include/dict0boot.h
index 27e87d16750..abba619be29 100644
--- a/storage/xtradb/include/dict0boot.h
+++ b/storage/xtradb/include/dict0boot.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/dict0boot.ic b/storage/xtradb/include/dict0boot.ic
index 5fa33837640..068cca739b4 100644
--- a/storage/xtradb/include/dict0boot.ic
+++ b/storage/xtradb/include/dict0boot.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/dict0crea.h b/storage/xtradb/include/dict0crea.h
index c67910f0d55..4e4c166bc4d 100644
--- a/storage/xtradb/include/dict0crea.h
+++ b/storage/xtradb/include/dict0crea.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/dict0crea.ic b/storage/xtradb/include/dict0crea.ic
index 36f77e5c7d1..a22ff7d7093 100644
--- a/storage/xtradb/include/dict0crea.ic
+++ b/storage/xtradb/include/dict0crea.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/dict0load.h b/storage/xtradb/include/dict0load.h
index dcfa7847a8b..10495df6db3 100644
--- a/storage/xtradb/include/dict0load.h
+++ b/storage/xtradb/include/dict0load.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/dict0load.ic b/storage/xtradb/include/dict0load.ic
index da224db7927..cb53ad32e5c 100644
--- a/storage/xtradb/include/dict0load.ic
+++ b/storage/xtradb/include/dict0load.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/dict0mem.ic b/storage/xtradb/include/dict0mem.ic
index 41dacb1c643..c1788bf2a26 100644
--- a/storage/xtradb/include/dict0mem.ic
+++ b/storage/xtradb/include/dict0mem.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/dict0types.h b/storage/xtradb/include/dict0types.h
index 22407e2408e..6f7a9f3a3c3 100644
--- a/storage/xtradb/include/dict0types.h
+++ b/storage/xtradb/include/dict0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/eval0eval.h b/storage/xtradb/include/eval0eval.h
index c12df320b88..c1fb84c5956 100644
--- a/storage/xtradb/include/eval0eval.h
+++ b/storage/xtradb/include/eval0eval.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/eval0eval.ic b/storage/xtradb/include/eval0eval.ic
index d0ca4c9bea5..f6ad5074452 100644
--- a/storage/xtradb/include/eval0eval.ic
+++ b/storage/xtradb/include/eval0eval.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/eval0proc.h b/storage/xtradb/include/eval0proc.h
index 450fd5a27c3..b2900557cf2 100644
--- a/storage/xtradb/include/eval0proc.h
+++ b/storage/xtradb/include/eval0proc.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/eval0proc.ic b/storage/xtradb/include/eval0proc.ic
index 6949af1557b..e2b94b0bd65 100644
--- a/storage/xtradb/include/eval0proc.ic
+++ b/storage/xtradb/include/eval0proc.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/fil0fil.h b/storage/xtradb/include/fil0fil.h
index d138bd472b7..724f787594c 100644
--- a/storage/xtradb/include/fil0fil.h
+++ b/storage/xtradb/include/fil0fil.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/fsp0types.h b/storage/xtradb/include/fsp0types.h
index 6e46d647657..f0c851061bc 100644
--- a/storage/xtradb/include/fsp0types.h
+++ b/storage/xtradb/include/fsp0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/fut0fut.h b/storage/xtradb/include/fut0fut.h
index 6a68bfffc72..b8098a64a9c 100644
--- a/storage/xtradb/include/fut0fut.h
+++ b/storage/xtradb/include/fut0fut.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/fut0fut.ic b/storage/xtradb/include/fut0fut.ic
index b881baff13c..e468912439b 100644
--- a/storage/xtradb/include/fut0fut.ic
+++ b/storage/xtradb/include/fut0fut.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/fut0lst.h b/storage/xtradb/include/fut0lst.h
index c75efd2aab2..5dc246d82d9 100644
--- a/storage/xtradb/include/fut0lst.h
+++ b/storage/xtradb/include/fut0lst.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/fut0lst.ic b/storage/xtradb/include/fut0lst.ic
index 74d00dc488e..cf6e8b9ee81 100644
--- a/storage/xtradb/include/fut0lst.ic
+++ b/storage/xtradb/include/fut0lst.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ha0ha.h b/storage/xtradb/include/ha0ha.h
index afa9152a317..d042349e77f 100644
--- a/storage/xtradb/include/ha0ha.h
+++ b/storage/xtradb/include/ha0ha.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ha0ha.ic b/storage/xtradb/include/ha0ha.ic
index 4c69fe63f91..68f0579165b 100644
--- a/storage/xtradb/include/ha0ha.ic
+++ b/storage/xtradb/include/ha0ha.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ha0storage.h b/storage/xtradb/include/ha0storage.h
index 8109646a8e9..245087591bc 100644
--- a/storage/xtradb/include/ha0storage.h
+++ b/storage/xtradb/include/ha0storage.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ha0storage.ic b/storage/xtradb/include/ha0storage.ic
index 86f2e578090..e50d3f68370 100644
--- a/storage/xtradb/include/ha0storage.ic
+++ b/storage/xtradb/include/ha0storage.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ha_prototypes.h b/storage/xtradb/include/ha_prototypes.h
index c430d7cc590..7759c93ea52 100644
--- a/storage/xtradb/include/ha_prototypes.h
+++ b/storage/xtradb/include/ha_prototypes.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/handler0alter.h b/storage/xtradb/include/handler0alter.h
index 3107fb32881..31ed836012c 100644
--- a/storage/xtradb/include/handler0alter.h
+++ b/storage/xtradb/include/handler0alter.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/hash0hash.h b/storage/xtradb/include/hash0hash.h
index 05b538ed5f5..c6233d358aa 100644
--- a/storage/xtradb/include/hash0hash.h
+++ b/storage/xtradb/include/hash0hash.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/hash0hash.ic b/storage/xtradb/include/hash0hash.ic
index 2c708cc594b..20b8e4dd5f0 100644
--- a/storage/xtradb/include/hash0hash.ic
+++ b/storage/xtradb/include/hash0hash.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ibuf0ibuf.h b/storage/xtradb/include/ibuf0ibuf.h
index d0d09d3c753..b92394a7e19 100644
--- a/storage/xtradb/include/ibuf0ibuf.h
+++ b/storage/xtradb/include/ibuf0ibuf.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ibuf0ibuf.ic b/storage/xtradb/include/ibuf0ibuf.ic
index 043d7c472d8..63cc1e2044c 100644
--- a/storage/xtradb/include/ibuf0ibuf.ic
+++ b/storage/xtradb/include/ibuf0ibuf.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ibuf0types.h b/storage/xtradb/include/ibuf0types.h
index d3e6f9299da..b2d2843a52e 100644
--- a/storage/xtradb/include/ibuf0types.h
+++ b/storage/xtradb/include/ibuf0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/lock0iter.h b/storage/xtradb/include/lock0iter.h
index ce6f28dc514..63363c0b4f4 100644
--- a/storage/xtradb/include/lock0iter.h
+++ b/storage/xtradb/include/lock0iter.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/lock0lock.h b/storage/xtradb/include/lock0lock.h
index c6684f36300..38351da406f 100644
--- a/storage/xtradb/include/lock0lock.h
+++ b/storage/xtradb/include/lock0lock.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/lock0lock.ic b/storage/xtradb/include/lock0lock.ic
index 30b6e25fb9a..d50228d10bb 100644
--- a/storage/xtradb/include/lock0lock.ic
+++ b/storage/xtradb/include/lock0lock.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/lock0priv.h b/storage/xtradb/include/lock0priv.h
index 491cad95329..599b8aebcdc 100644
--- a/storage/xtradb/include/lock0priv.h
+++ b/storage/xtradb/include/lock0priv.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/lock0priv.ic b/storage/xtradb/include/lock0priv.ic
index 98b2189680c..2117d4d33b3 100644
--- a/storage/xtradb/include/lock0priv.ic
+++ b/storage/xtradb/include/lock0priv.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/lock0types.h b/storage/xtradb/include/lock0types.h
index 2eb71e2939f..89c03d2d497 100644
--- a/storage/xtradb/include/lock0types.h
+++ b/storage/xtradb/include/lock0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/log0log.ic b/storage/xtradb/include/log0log.ic
index 36bc5186c22..935b90156f5 100644
--- a/storage/xtradb/include/log0log.ic
+++ b/storage/xtradb/include/log0log.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/log0online.h b/storage/xtradb/include/log0online.h
index ee06ec1951e..3a8699945ee 100644
--- a/storage/xtradb/include/log0online.h
+++ b/storage/xtradb/include/log0online.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
-Street, Fifth Floor, Boston, MA 02110-1301, USA
+Street, Fifth Floor, Boston, MA 02110-1335  USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/log0recv.h b/storage/xtradb/include/log0recv.h
index afac0d4f4ab..af420592321 100644
--- a/storage/xtradb/include/log0recv.h
+++ b/storage/xtradb/include/log0recv.h
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/log0recv.ic b/storage/xtradb/include/log0recv.ic
index 62fd5c18e30..a8f41640d4d 100644
--- a/storage/xtradb/include/log0recv.ic
+++ b/storage/xtradb/include/log0recv.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/mach0data.h b/storage/xtradb/include/mach0data.h
index d9a4a9170c7..12855ae7762 100644
--- a/storage/xtradb/include/mach0data.h
+++ b/storage/xtradb/include/mach0data.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/mach0data.ic b/storage/xtradb/include/mach0data.ic
index fdcb07ca29b..676d6a50ec7 100644
--- a/storage/xtradb/include/mach0data.ic
+++ b/storage/xtradb/include/mach0data.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/mem0dbg.h b/storage/xtradb/include/mem0dbg.h
index 1c387706c98..8e3b4ec11d9 100644
--- a/storage/xtradb/include/mem0dbg.h
+++ b/storage/xtradb/include/mem0dbg.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/mem0dbg.ic b/storage/xtradb/include/mem0dbg.ic
index 72c63e0a4c4..058383a1ad0 100644
--- a/storage/xtradb/include/mem0dbg.ic
+++ b/storage/xtradb/include/mem0dbg.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/mem0mem.h b/storage/xtradb/include/mem0mem.h
index 7dff3e7a2b8..cd7173948ad 100644
--- a/storage/xtradb/include/mem0mem.h
+++ b/storage/xtradb/include/mem0mem.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/mem0mem.ic b/storage/xtradb/include/mem0mem.ic
index b0b24526031..fb9e565badc 100644
--- a/storage/xtradb/include/mem0mem.ic
+++ b/storage/xtradb/include/mem0mem.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/mem0pool.h b/storage/xtradb/include/mem0pool.h
index 26bac1c814b..4e044d79f65 100644
--- a/storage/xtradb/include/mem0pool.h
+++ b/storage/xtradb/include/mem0pool.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/mem0pool.ic b/storage/xtradb/include/mem0pool.ic
index f0e724648a1..c3e8c4ff402 100644
--- a/storage/xtradb/include/mem0pool.ic
+++ b/storage/xtradb/include/mem0pool.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/mtr0log.h b/storage/xtradb/include/mtr0log.h
index 8cccb982b48..0027c53ced8 100644
--- a/storage/xtradb/include/mtr0log.h
+++ b/storage/xtradb/include/mtr0log.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/mtr0log.ic b/storage/xtradb/include/mtr0log.ic
index 3458d4903c9..b66740e39c5 100644
--- a/storage/xtradb/include/mtr0log.ic
+++ b/storage/xtradb/include/mtr0log.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/mtr0types.h b/storage/xtradb/include/mtr0types.h
index eb76c824666..5a32e79a8a7 100644
--- a/storage/xtradb/include/mtr0types.h
+++ b/storage/xtradb/include/mtr0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/os0file.h b/storage/xtradb/include/os0file.h
index 618d6f540ae..85b4d8ab5d2 100644
--- a/storage/xtradb/include/os0file.h
+++ b/storage/xtradb/include/os0file.h
@@ -21,7 +21,7 @@ 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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
 
 ***********************************************************************/
 
diff --git a/storage/xtradb/include/os0file.ic b/storage/xtradb/include/os0file.ic
index 137ce59b62d..a9d79833dff 100644
--- a/storage/xtradb/include/os0file.ic
+++ b/storage/xtradb/include/os0file.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/os0proc.h b/storage/xtradb/include/os0proc.h
index 7cf80217bec..0421b997864 100644
--- a/storage/xtradb/include/os0proc.h
+++ b/storage/xtradb/include/os0proc.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/os0proc.ic b/storage/xtradb/include/os0proc.ic
index 6d7eb1be37c..0f2172ce968 100644
--- a/storage/xtradb/include/os0proc.ic
+++ b/storage/xtradb/include/os0proc.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/os0stacktrace.h b/storage/xtradb/include/os0stacktrace.h
index e79347c6189..ba09c0041e8 100644
--- a/storage/xtradb/include/os0stacktrace.h
+++ b/storage/xtradb/include/os0stacktrace.h
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/os0sync.h b/storage/xtradb/include/os0sync.h
index 08da9dff4e3..29766337e5b 100644
--- a/storage/xtradb/include/os0sync.h
+++ b/storage/xtradb/include/os0sync.h
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/os0sync.ic b/storage/xtradb/include/os0sync.ic
index 836e51f3399..a59f06b2709 100644
--- a/storage/xtradb/include/os0sync.ic
+++ b/storage/xtradb/include/os0sync.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/os0thread.h b/storage/xtradb/include/os0thread.h
index e8538247d10..8e9a85a427f 100644
--- a/storage/xtradb/include/os0thread.h
+++ b/storage/xtradb/include/os0thread.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/os0thread.ic b/storage/xtradb/include/os0thread.ic
index 5615791c77e..7b5aac8b4f8 100644
--- a/storage/xtradb/include/os0thread.ic
+++ b/storage/xtradb/include/os0thread.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/page0cur.h b/storage/xtradb/include/page0cur.h
index 5081a1de0ab..09a43143fbd 100644
--- a/storage/xtradb/include/page0cur.h
+++ b/storage/xtradb/include/page0cur.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/page0cur.ic b/storage/xtradb/include/page0cur.ic
index 1903fedf9e5..c6739a35adc 100644
--- a/storage/xtradb/include/page0cur.ic
+++ b/storage/xtradb/include/page0cur.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/page0types.h b/storage/xtradb/include/page0types.h
index 4e76e52ecfb..e2883834435 100644
--- a/storage/xtradb/include/page0types.h
+++ b/storage/xtradb/include/page0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/page0zip.h b/storage/xtradb/include/page0zip.h
index abd62ab99a5..ac6a0878d2e 100644
--- a/storage/xtradb/include/page0zip.h
+++ b/storage/xtradb/include/page0zip.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/page0zip.ic b/storage/xtradb/include/page0zip.ic
index a2fa13c94df..b9a0130f9cc 100644
--- a/storage/xtradb/include/page0zip.ic
+++ b/storage/xtradb/include/page0zip.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/pars0grm.h b/storage/xtradb/include/pars0grm.h
index abaffb66c1e..2fbdce65239 100644
--- a/storage/xtradb/include/pars0grm.h
+++ b/storage/xtradb/include/pars0grm.h
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/pars0opt.h b/storage/xtradb/include/pars0opt.h
index fd6b9726019..17b6540e2f2 100644
--- a/storage/xtradb/include/pars0opt.h
+++ b/storage/xtradb/include/pars0opt.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/pars0opt.ic b/storage/xtradb/include/pars0opt.ic
index f303fe91d3b..ae89678525d 100644
--- a/storage/xtradb/include/pars0opt.ic
+++ b/storage/xtradb/include/pars0opt.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/pars0pars.h b/storage/xtradb/include/pars0pars.h
index eb79dcb18c1..7b5a9ea398d 100644
--- a/storage/xtradb/include/pars0pars.h
+++ b/storage/xtradb/include/pars0pars.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/pars0pars.ic b/storage/xtradb/include/pars0pars.ic
index 558d1093bfe..f0ad9952def 100644
--- a/storage/xtradb/include/pars0pars.ic
+++ b/storage/xtradb/include/pars0pars.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/pars0sym.h b/storage/xtradb/include/pars0sym.h
index 9241aff3be1..ae9f9f4844b 100644
--- a/storage/xtradb/include/pars0sym.h
+++ b/storage/xtradb/include/pars0sym.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/pars0sym.ic b/storage/xtradb/include/pars0sym.ic
index ecf014908a9..7c3a4da16ae 100644
--- a/storage/xtradb/include/pars0sym.ic
+++ b/storage/xtradb/include/pars0sym.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/pars0types.h b/storage/xtradb/include/pars0types.h
index 4f3b2c06db6..7dd10d99667 100644
--- a/storage/xtradb/include/pars0types.h
+++ b/storage/xtradb/include/pars0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/que0que.h b/storage/xtradb/include/que0que.h
index 8de221580fd..fbdb1ce5230 100644
--- a/storage/xtradb/include/que0que.h
+++ b/storage/xtradb/include/que0que.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/que0que.ic b/storage/xtradb/include/que0que.ic
index 2de679e3894..5df9cd197fa 100644
--- a/storage/xtradb/include/que0que.ic
+++ b/storage/xtradb/include/que0que.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/que0types.h b/storage/xtradb/include/que0types.h
index 69fb0557d8b..e210fa5a33d 100644
--- a/storage/xtradb/include/que0types.h
+++ b/storage/xtradb/include/que0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/read0read.h b/storage/xtradb/include/read0read.h
index c6ba9557d32..dfb57cc7566 100644
--- a/storage/xtradb/include/read0read.h
+++ b/storage/xtradb/include/read0read.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/read0read.ic b/storage/xtradb/include/read0read.ic
index 62c47e05b9d..2b69167282d 100644
--- a/storage/xtradb/include/read0read.ic
+++ b/storage/xtradb/include/read0read.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/read0types.h b/storage/xtradb/include/read0types.h
index 4bb9618448b..7ed740f5bac 100644
--- a/storage/xtradb/include/read0types.h
+++ b/storage/xtradb/include/read0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/rem0cmp.h b/storage/xtradb/include/rem0cmp.h
index c5ef0d5438a..c59c6131c78 100644
--- a/storage/xtradb/include/rem0cmp.h
+++ b/storage/xtradb/include/rem0cmp.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/rem0cmp.ic b/storage/xtradb/include/rem0cmp.ic
index 22db4b0cd47..8e1bf141898 100644
--- a/storage/xtradb/include/rem0cmp.ic
+++ b/storage/xtradb/include/rem0cmp.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/rem0rec.h b/storage/xtradb/include/rem0rec.h
index 18e89eacccd..6a0a218571a 100644
--- a/storage/xtradb/include/rem0rec.h
+++ b/storage/xtradb/include/rem0rec.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/rem0rec.ic b/storage/xtradb/include/rem0rec.ic
index b727523e1aa..4d65aced312 100644
--- a/storage/xtradb/include/rem0rec.ic
+++ b/storage/xtradb/include/rem0rec.ic
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/rem0types.h b/storage/xtradb/include/rem0types.h
index 248ce27eee3..d0449ace29f 100644
--- a/storage/xtradb/include/rem0types.h
+++ b/storage/xtradb/include/rem0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0ext.h b/storage/xtradb/include/row0ext.h
index 71c7b6ecce4..1da685de9ed 100644
--- a/storage/xtradb/include/row0ext.h
+++ b/storage/xtradb/include/row0ext.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0ext.ic b/storage/xtradb/include/row0ext.ic
index 56e71d9a968..4432f20a799 100644
--- a/storage/xtradb/include/row0ext.ic
+++ b/storage/xtradb/include/row0ext.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0ins.h b/storage/xtradb/include/row0ins.h
index 1da3ef48a81..b52fe1ad3d4 100644
--- a/storage/xtradb/include/row0ins.h
+++ b/storage/xtradb/include/row0ins.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0ins.ic b/storage/xtradb/include/row0ins.ic
index 6e96e9fd675..8331d76b718 100644
--- a/storage/xtradb/include/row0ins.ic
+++ b/storage/xtradb/include/row0ins.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0merge.h b/storage/xtradb/include/row0merge.h
index 22786fd7e49..87b07c3f8e0 100644
--- a/storage/xtradb/include/row0merge.h
+++ b/storage/xtradb/include/row0merge.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0mysql.h b/storage/xtradb/include/row0mysql.h
index e228289bdae..b148363a3bd 100644
--- a/storage/xtradb/include/row0mysql.h
+++ b/storage/xtradb/include/row0mysql.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0mysql.ic b/storage/xtradb/include/row0mysql.ic
index 878523528b2..3a44b86732c 100644
--- a/storage/xtradb/include/row0mysql.ic
+++ b/storage/xtradb/include/row0mysql.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0purge.h b/storage/xtradb/include/row0purge.h
index 64353bc8434..0ed81c8a941 100644
--- a/storage/xtradb/include/row0purge.h
+++ b/storage/xtradb/include/row0purge.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0purge.ic b/storage/xtradb/include/row0purge.ic
index 6465c2ca971..628e6047e8c 100644
--- a/storage/xtradb/include/row0purge.ic
+++ b/storage/xtradb/include/row0purge.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0row.h b/storage/xtradb/include/row0row.h
index bf135217bd0..419cf07106a 100644
--- a/storage/xtradb/include/row0row.h
+++ b/storage/xtradb/include/row0row.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0row.ic b/storage/xtradb/include/row0row.ic
index 831c2339d96..d3c3b52a60b 100644
--- a/storage/xtradb/include/row0row.ic
+++ b/storage/xtradb/include/row0row.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0sel.h b/storage/xtradb/include/row0sel.h
index 830615effc2..702cec5c928 100644
--- a/storage/xtradb/include/row0sel.h
+++ b/storage/xtradb/include/row0sel.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0sel.ic b/storage/xtradb/include/row0sel.ic
index 03c30e80dfe..178ede5e67d 100644
--- a/storage/xtradb/include/row0sel.ic
+++ b/storage/xtradb/include/row0sel.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0types.h b/storage/xtradb/include/row0types.h
index b40094d05d6..7593932eb94 100644
--- a/storage/xtradb/include/row0types.h
+++ b/storage/xtradb/include/row0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0uins.h b/storage/xtradb/include/row0uins.h
index 6809c6d9317..fb3ee410dd8 100644
--- a/storage/xtradb/include/row0uins.h
+++ b/storage/xtradb/include/row0uins.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0uins.ic b/storage/xtradb/include/row0uins.ic
index fb8a335191d..91bf4b6ce27 100644
--- a/storage/xtradb/include/row0uins.ic
+++ b/storage/xtradb/include/row0uins.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0umod.h b/storage/xtradb/include/row0umod.h
index aca35ce2170..0c63e907849 100644
--- a/storage/xtradb/include/row0umod.h
+++ b/storage/xtradb/include/row0umod.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0umod.ic b/storage/xtradb/include/row0umod.ic
index dd9e217fa20..60c72da5c56 100644
--- a/storage/xtradb/include/row0umod.ic
+++ b/storage/xtradb/include/row0umod.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0undo.h b/storage/xtradb/include/row0undo.h
index d783c94a110..7bc13afb623 100644
--- a/storage/xtradb/include/row0undo.h
+++ b/storage/xtradb/include/row0undo.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0undo.ic b/storage/xtradb/include/row0undo.ic
index 21723c88ecb..55aeee1b497 100644
--- a/storage/xtradb/include/row0undo.ic
+++ b/storage/xtradb/include/row0undo.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0upd.h b/storage/xtradb/include/row0upd.h
index e23a71374c2..a948dfb9f10 100644
--- a/storage/xtradb/include/row0upd.h
+++ b/storage/xtradb/include/row0upd.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0upd.ic b/storage/xtradb/include/row0upd.ic
index 9b699455665..89c2835626a 100644
--- a/storage/xtradb/include/row0upd.ic
+++ b/storage/xtradb/include/row0upd.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0vers.h b/storage/xtradb/include/row0vers.h
index 48d5fc43fd1..ae9f7378f6f 100644
--- a/storage/xtradb/include/row0vers.h
+++ b/storage/xtradb/include/row0vers.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/row0vers.ic b/storage/xtradb/include/row0vers.ic
index 2687d1a9e15..c63c56b79ee 100644
--- a/storage/xtradb/include/row0vers.ic
+++ b/storage/xtradb/include/row0vers.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/srv0srv.h b/storage/xtradb/include/srv0srv.h
index 6eee44c93d7..dd4de365743 100644
--- a/storage/xtradb/include/srv0srv.h
+++ b/storage/xtradb/include/srv0srv.h
@@ -28,7 +28,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/srv0srv.ic b/storage/xtradb/include/srv0srv.ic
index 19ba62cc3c2..9ae9fbfd5b1 100644
--- a/storage/xtradb/include/srv0srv.ic
+++ b/storage/xtradb/include/srv0srv.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/srv0start.h b/storage/xtradb/include/srv0start.h
index ffbb0dafa5d..f5c4d9d5d7a 100644
--- a/storage/xtradb/include/srv0start.h
+++ b/storage/xtradb/include/srv0start.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/sync0arr.h b/storage/xtradb/include/sync0arr.h
index 5fb0330aa10..b20c0ceca62 100644
--- a/storage/xtradb/include/sync0arr.h
+++ b/storage/xtradb/include/sync0arr.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/sync0arr.ic b/storage/xtradb/include/sync0arr.ic
index b49dce34017..08da53b5f6a 100644
--- a/storage/xtradb/include/sync0arr.ic
+++ b/storage/xtradb/include/sync0arr.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/sync0rw.h b/storage/xtradb/include/sync0rw.h
index d666131f3be..95240322e35 100644
--- a/storage/xtradb/include/sync0rw.h
+++ b/storage/xtradb/include/sync0rw.h
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/sync0rw.ic b/storage/xtradb/include/sync0rw.ic
index 031c57aff0d..745a34f5513 100644
--- a/storage/xtradb/include/sync0rw.ic
+++ b/storage/xtradb/include/sync0rw.ic
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/sync0sync.ic b/storage/xtradb/include/sync0sync.ic
index c733becf6df..a01d63d6063 100644
--- a/storage/xtradb/include/sync0sync.ic
+++ b/storage/xtradb/include/sync0sync.ic
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/sync0types.h b/storage/xtradb/include/sync0types.h
index 5e800240888..00391fdf0f8 100644
--- a/storage/xtradb/include/sync0types.h
+++ b/storage/xtradb/include/sync0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0i_s.h b/storage/xtradb/include/trx0i_s.h
index c67227369a7..3356c7006d1 100644
--- a/storage/xtradb/include/trx0i_s.h
+++ b/storage/xtradb/include/trx0i_s.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0purge.h b/storage/xtradb/include/trx0purge.h
index 9b1532f32b9..6cc9f221332 100644
--- a/storage/xtradb/include/trx0purge.h
+++ b/storage/xtradb/include/trx0purge.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0purge.ic b/storage/xtradb/include/trx0purge.ic
index 800d26ba51b..b461a0a9a86 100644
--- a/storage/xtradb/include/trx0purge.ic
+++ b/storage/xtradb/include/trx0purge.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0rec.h b/storage/xtradb/include/trx0rec.h
index 6e3233c685b..da3e1e869cc 100644
--- a/storage/xtradb/include/trx0rec.h
+++ b/storage/xtradb/include/trx0rec.h
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0roll.h b/storage/xtradb/include/trx0roll.h
index db68ae0a8d6..6368042d939 100644
--- a/storage/xtradb/include/trx0roll.h
+++ b/storage/xtradb/include/trx0roll.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0roll.ic b/storage/xtradb/include/trx0roll.ic
index 6a4a5f54459..40b4dc6d4c1 100644
--- a/storage/xtradb/include/trx0roll.ic
+++ b/storage/xtradb/include/trx0roll.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0rseg.h b/storage/xtradb/include/trx0rseg.h
index 703b6e411a5..027f960fa8a 100644
--- a/storage/xtradb/include/trx0rseg.h
+++ b/storage/xtradb/include/trx0rseg.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0rseg.ic b/storage/xtradb/include/trx0rseg.ic
index bb2684576d3..9a113cbd64c 100644
--- a/storage/xtradb/include/trx0rseg.ic
+++ b/storage/xtradb/include/trx0rseg.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0sys.h b/storage/xtradb/include/trx0sys.h
index f284790630c..51fac1c4d6c 100644
--- a/storage/xtradb/include/trx0sys.h
+++ b/storage/xtradb/include/trx0sys.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0sys.ic b/storage/xtradb/include/trx0sys.ic
index 17c94105cee..82e42c6760d 100644
--- a/storage/xtradb/include/trx0sys.ic
+++ b/storage/xtradb/include/trx0sys.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0trx.h b/storage/xtradb/include/trx0trx.h
index c3844cce84e..f089363e33b 100644
--- a/storage/xtradb/include/trx0trx.h
+++ b/storage/xtradb/include/trx0trx.h
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0trx.ic b/storage/xtradb/include/trx0trx.ic
index 97dda69f013..d2a27efdb52 100644
--- a/storage/xtradb/include/trx0trx.ic
+++ b/storage/xtradb/include/trx0trx.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0types.h b/storage/xtradb/include/trx0types.h
index 7303892bec4..c082f2c8a33 100644
--- a/storage/xtradb/include/trx0types.h
+++ b/storage/xtradb/include/trx0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0undo.ic b/storage/xtradb/include/trx0undo.ic
index a12d38116b6..b534ec3c762 100644
--- a/storage/xtradb/include/trx0undo.ic
+++ b/storage/xtradb/include/trx0undo.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/trx0xa.h b/storage/xtradb/include/trx0xa.h
index 97c24c899a7..247f1b95d63 100644
--- a/storage/xtradb/include/trx0xa.h
+++ b/storage/xtradb/include/trx0xa.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i
index cbeacfe2239..e98bd68155f 100644
--- a/storage/xtradb/include/univ.i
+++ b/storage/xtradb/include/univ.i
@@ -26,7 +26,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/usr0sess.h b/storage/xtradb/include/usr0sess.h
index bcc2f0d1d99..edbedc8ce7b 100644
--- a/storage/xtradb/include/usr0sess.h
+++ b/storage/xtradb/include/usr0sess.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/usr0sess.ic b/storage/xtradb/include/usr0sess.ic
index 1dcca8a3853..4151bff50df 100644
--- a/storage/xtradb/include/usr0sess.ic
+++ b/storage/xtradb/include/usr0sess.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/usr0types.h b/storage/xtradb/include/usr0types.h
index 6c224e6db17..0637e2dc449 100644
--- a/storage/xtradb/include/usr0types.h
+++ b/storage/xtradb/include/usr0types.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0bh.h b/storage/xtradb/include/ut0bh.h
index e89d76a51b3..847f9d103bd 100644
--- a/storage/xtradb/include/ut0bh.h
+++ b/storage/xtradb/include/ut0bh.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0bh.ic b/storage/xtradb/include/ut0bh.ic
index 4d04f9b6f49..91c176b36fa 100644
--- a/storage/xtradb/include/ut0bh.ic
+++ b/storage/xtradb/include/ut0bh.ic
@@ -11,7 +11,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0byte.h b/storage/xtradb/include/ut0byte.h
index 0c23e999268..af36eeba78e 100644
--- a/storage/xtradb/include/ut0byte.h
+++ b/storage/xtradb/include/ut0byte.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0byte.ic b/storage/xtradb/include/ut0byte.ic
index 2892c5429fb..07b7677406c 100644
--- a/storage/xtradb/include/ut0byte.ic
+++ b/storage/xtradb/include/ut0byte.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0dbg.h b/storage/xtradb/include/ut0dbg.h
index 5a854326b7b..0f29cf92379 100644
--- a/storage/xtradb/include/ut0dbg.h
+++ b/storage/xtradb/include/ut0dbg.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0list.h b/storage/xtradb/include/ut0list.h
index 4cfe4b9d8ce..2527449aaf5 100644
--- a/storage/xtradb/include/ut0list.h
+++ b/storage/xtradb/include/ut0list.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0list.ic b/storage/xtradb/include/ut0list.ic
index c8810675ca0..b7fd3139e72 100644
--- a/storage/xtradb/include/ut0list.ic
+++ b/storage/xtradb/include/ut0list.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0lst.h b/storage/xtradb/include/ut0lst.h
index 2b5f5c7a705..dec29ddef40 100644
--- a/storage/xtradb/include/ut0lst.h
+++ b/storage/xtradb/include/ut0lst.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0mem.h b/storage/xtradb/include/ut0mem.h
index 16c31c2c36c..f7a33204ea1 100644
--- a/storage/xtradb/include/ut0mem.h
+++ b/storage/xtradb/include/ut0mem.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0mem.ic b/storage/xtradb/include/ut0mem.ic
index de701bd50e3..cce414ce540 100644
--- a/storage/xtradb/include/ut0mem.ic
+++ b/storage/xtradb/include/ut0mem.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0rbt.h b/storage/xtradb/include/ut0rbt.h
index 0540e1ee386..df8b991f43b 100644
--- a/storage/xtradb/include/ut0rbt.h
+++ b/storage/xtradb/include/ut0rbt.h
@@ -18,7 +18,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 /******************************************************************//**
diff --git a/storage/xtradb/include/ut0rnd.h b/storage/xtradb/include/ut0rnd.h
index bed2c668c60..26446713f99 100644
--- a/storage/xtradb/include/ut0rnd.h
+++ b/storage/xtradb/include/ut0rnd.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0rnd.ic b/storage/xtradb/include/ut0rnd.ic
index 30bd32726fa..1a3990d5c0c 100644
--- a/storage/xtradb/include/ut0rnd.ic
+++ b/storage/xtradb/include/ut0rnd.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0sort.h b/storage/xtradb/include/ut0sort.h
index 8cc73e65b2a..9ee709bacdb 100644
--- a/storage/xtradb/include/ut0sort.h
+++ b/storage/xtradb/include/ut0sort.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0ut.h b/storage/xtradb/include/ut0ut.h
index 37f1c6064b6..1f5b1998c13 100644
--- a/storage/xtradb/include/ut0ut.h
+++ b/storage/xtradb/include/ut0ut.h
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0ut.ic b/storage/xtradb/include/ut0ut.ic
index 019b3d216cf..f5baea13cfa 100644
--- a/storage/xtradb/include/ut0ut.ic
+++ b/storage/xtradb/include/ut0ut.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0vec.h b/storage/xtradb/include/ut0vec.h
index 316ae87c2cb..6a55c10df21 100644
--- a/storage/xtradb/include/ut0vec.h
+++ b/storage/xtradb/include/ut0vec.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0vec.ic b/storage/xtradb/include/ut0vec.ic
index fce41362d3a..04a432ae104 100644
--- a/storage/xtradb/include/ut0vec.ic
+++ b/storage/xtradb/include/ut0vec.ic
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/include/ut0wqueue.h b/storage/xtradb/include/ut0wqueue.h
index aedcc2b435d..630c5e842c5 100644
--- a/storage/xtradb/include/ut0wqueue.h
+++ b/storage/xtradb/include/ut0wqueue.h
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/lock/lock0iter.c b/storage/xtradb/lock/lock0iter.c
index 506ec02875a..a73b1ed4564 100644
--- a/storage/xtradb/lock/lock0iter.c
+++ b/storage/xtradb/lock/lock0iter.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/lock/lock0lock.c b/storage/xtradb/lock/lock0lock.c
index d1be28c7f30..ecf2b5b7446 100644
--- a/storage/xtradb/lock/lock0lock.c
+++ b/storage/xtradb/lock/lock0lock.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/log/log0online.c b/storage/xtradb/log/log0online.c
index c6e8c7c5198..eecf3f69fd7 100644
--- a/storage/xtradb/log/log0online.c
+++ b/storage/xtradb/log/log0online.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
-Street, Fifth Floor, Boston, MA 02110-1301, USA
+Street, Fifth Floor, Boston, MA 02110-1335  USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/log/log0recv.c b/storage/xtradb/log/log0recv.c
index 6fdc3aff7cc..0b4e7a9ab4c 100644
--- a/storage/xtradb/log/log0recv.c
+++ b/storage/xtradb/log/log0recv.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/mach/mach0data.c b/storage/xtradb/mach/mach0data.c
index 9669516244d..376c8ec6130 100644
--- a/storage/xtradb/mach/mach0data.c
+++ b/storage/xtradb/mach/mach0data.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/mem/mem0dbg.c b/storage/xtradb/mem/mem0dbg.c
index 007610c01b7..8776aca3c20 100644
--- a/storage/xtradb/mem/mem0dbg.c
+++ b/storage/xtradb/mem/mem0dbg.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/mem/mem0mem.c b/storage/xtradb/mem/mem0mem.c
index 924231470aa..7d8e13617a8 100644
--- a/storage/xtradb/mem/mem0mem.c
+++ b/storage/xtradb/mem/mem0mem.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/mem/mem0pool.c b/storage/xtradb/mem/mem0pool.c
index 709367266c6..eaaa19653ee 100644
--- a/storage/xtradb/mem/mem0pool.c
+++ b/storage/xtradb/mem/mem0pool.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/mtr/mtr0log.c b/storage/xtradb/mtr/mtr0log.c
index 091fabf732c..065b31d9ed2 100644
--- a/storage/xtradb/mtr/mtr0log.c
+++ b/storage/xtradb/mtr/mtr0log.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/os/os0file.c b/storage/xtradb/os/os0file.c
index e48f65956bb..89f624f589f 100644
--- a/storage/xtradb/os/os0file.c
+++ b/storage/xtradb/os/os0file.c
@@ -22,7 +22,7 @@ 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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
 
 ***********************************************************************/
 
diff --git a/storage/xtradb/os/os0proc.c b/storage/xtradb/os/os0proc.c
index 7b52dd2a28f..4a5fb5e982c 100644
--- a/storage/xtradb/os/os0proc.c
+++ b/storage/xtradb/os/os0proc.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/os/os0stacktrace.c b/storage/xtradb/os/os0stacktrace.c
index c4c428e0db3..960324ff09d 100644
--- a/storage/xtradb/os/os0stacktrace.c
+++ b/storage/xtradb/os/os0stacktrace.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/os/os0sync.c b/storage/xtradb/os/os0sync.c
index 57c70a5497f..381cb169d20 100644
--- a/storage/xtradb/os/os0sync.c
+++ b/storage/xtradb/os/os0sync.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/os/os0thread.c b/storage/xtradb/os/os0thread.c
index 68a8c973558..3b7b88900db 100644
--- a/storage/xtradb/os/os0thread.c
+++ b/storage/xtradb/os/os0thread.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/page/page0zip.c b/storage/xtradb/page/page0zip.c
index 7482323c9b5..04a1af94bfc 100644
--- a/storage/xtradb/page/page0zip.c
+++ b/storage/xtradb/page/page0zip.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/pars/lexyy.c b/storage/xtradb/pars/lexyy.c
index b4a7289a4cb..b18c25e5f93 100644
--- a/storage/xtradb/pars/lexyy.c
+++ b/storage/xtradb/pars/lexyy.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/pars/make_bison.sh b/storage/xtradb/pars/make_bison.sh
index 6587b6b9f1a..c162a5836e6 100644
--- a/storage/xtradb/pars/make_bison.sh
+++ b/storage/xtradb/pars/make_bison.sh
@@ -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
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 #
 # generate parser files from bison input files.
 
diff --git a/storage/xtradb/pars/make_flex.sh b/storage/xtradb/pars/make_flex.sh
index a8d35f8cca4..4808edc99dc 100644
--- a/storage/xtradb/pars/make_flex.sh
+++ b/storage/xtradb/pars/make_flex.sh
@@ -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
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 #
 # generate lexer files from flex input files.
 
diff --git a/storage/xtradb/pars/pars0grm.c b/storage/xtradb/pars/pars0grm.c
index da19ccd1136..c901b6e0617 100644
--- a/storage/xtradb/pars/pars0grm.c
+++ b/storage/xtradb/pars/pars0grm.c
@@ -19,7 +19,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/pars/pars0grm.y b/storage/xtradb/pars/pars0grm.y
index 5b4549d6d37..8701d7217e3 100644
--- a/storage/xtradb/pars/pars0grm.y
+++ b/storage/xtradb/pars/pars0grm.y
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/pars/pars0lex.l b/storage/xtradb/pars/pars0lex.l
index a79f7a9e0ca..aba8ae477c2 100644
--- a/storage/xtradb/pars/pars0lex.l
+++ b/storage/xtradb/pars/pars0lex.l
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/pars/pars0opt.c b/storage/xtradb/pars/pars0opt.c
index 7f98e95ac3f..d871550e3a2 100644
--- a/storage/xtradb/pars/pars0opt.c
+++ b/storage/xtradb/pars/pars0opt.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/pars/pars0pars.c b/storage/xtradb/pars/pars0pars.c
index 343a1130d0c..eeedc5bc4d1 100644
--- a/storage/xtradb/pars/pars0pars.c
+++ b/storage/xtradb/pars/pars0pars.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/pars/pars0sym.c b/storage/xtradb/pars/pars0sym.c
index 783598fdd1e..7428ea9f4b4 100644
--- a/storage/xtradb/pars/pars0sym.c
+++ b/storage/xtradb/pars/pars0sym.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/que/que0que.c b/storage/xtradb/que/que0que.c
index a9d76ce4706..61650a11620 100644
--- a/storage/xtradb/que/que0que.c
+++ b/storage/xtradb/que/que0que.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/read/read0read.c b/storage/xtradb/read/read0read.c
index 9efb268da79..9e623ce7d13 100644
--- a/storage/xtradb/read/read0read.c
+++ b/storage/xtradb/read/read0read.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/rem/rem0cmp.c b/storage/xtradb/rem/rem0cmp.c
index a49a42e8c3f..5fefb1a5b72 100644
--- a/storage/xtradb/rem/rem0cmp.c
+++ b/storage/xtradb/rem/rem0cmp.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/rem/rem0rec.c b/storage/xtradb/rem/rem0rec.c
index a7126f526e8..e163059a7da 100644
--- a/storage/xtradb/rem/rem0rec.c
+++ b/storage/xtradb/rem/rem0rec.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/row/row0ext.c b/storage/xtradb/row/row0ext.c
index aa3b14e06f2..e1b16d32278 100644
--- a/storage/xtradb/row/row0ext.c
+++ b/storage/xtradb/row/row0ext.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/row/row0merge.c b/storage/xtradb/row/row0merge.c
index 0d0b0e402d3..3699f580a3a 100644
--- a/storage/xtradb/row/row0merge.c
+++ b/storage/xtradb/row/row0merge.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/row/row0sel.c b/storage/xtradb/row/row0sel.c
index 4ace5632cb7..b8a6f6e0e15 100644
--- a/storage/xtradb/row/row0sel.c
+++ b/storage/xtradb/row/row0sel.c
@@ -20,7 +20,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/row/row0uins.c b/storage/xtradb/row/row0uins.c
index 57c8c512698..f06cf730daf 100644
--- a/storage/xtradb/row/row0uins.c
+++ b/storage/xtradb/row/row0uins.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/row/row0umod.c b/storage/xtradb/row/row0umod.c
index 44509d67c7b..dbc5603ef3b 100644
--- a/storage/xtradb/row/row0umod.c
+++ b/storage/xtradb/row/row0umod.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/row/row0undo.c b/storage/xtradb/row/row0undo.c
index 5a0a99570c4..1fff1417cdd 100644
--- a/storage/xtradb/row/row0undo.c
+++ b/storage/xtradb/row/row0undo.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/row/row0vers.c b/storage/xtradb/row/row0vers.c
index 1535273d54f..0130b23509a 100644
--- a/storage/xtradb/row/row0vers.c
+++ b/storage/xtradb/row/row0vers.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c
index 9e003784c6e..dec797be6a2 100644
--- a/storage/xtradb/srv/srv0srv.c
+++ b/storage/xtradb/srv/srv0srv.c
@@ -28,7 +28,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/srv/srv0start.c b/storage/xtradb/srv/srv0start.c
index 331382d2438..eae9dc864e9 100644
--- a/storage/xtradb/srv/srv0start.c
+++ b/storage/xtradb/srv/srv0start.c
@@ -27,7 +27,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/sync/sync0arr.c b/storage/xtradb/sync/sync0arr.c
index 3bf53696148..28afe2264b0 100644
--- a/storage/xtradb/sync/sync0arr.c
+++ b/storage/xtradb/sync/sync0arr.c
@@ -20,7 +20,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/trx/trx0i_s.c b/storage/xtradb/trx/trx0i_s.c
index 8b3a83585cc..6fbcf8bcdb8 100644
--- a/storage/xtradb/trx/trx0i_s.c
+++ b/storage/xtradb/trx/trx0i_s.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/trx/trx0purge.c b/storage/xtradb/trx/trx0purge.c
index 428ff10bfdf..6075607c9f4 100644
--- a/storage/xtradb/trx/trx0purge.c
+++ b/storage/xtradb/trx/trx0purge.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/trx/trx0roll.c b/storage/xtradb/trx/trx0roll.c
index e715780f165..49342239474 100644
--- a/storage/xtradb/trx/trx0roll.c
+++ b/storage/xtradb/trx/trx0roll.c
@@ -14,7 +14,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/trx/trx0rseg.c b/storage/xtradb/trx/trx0rseg.c
index ed3c27326d4..db9f751810a 100644
--- a/storage/xtradb/trx/trx0rseg.c
+++ b/storage/xtradb/trx/trx0rseg.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/trx/trx0trx.c b/storage/xtradb/trx/trx0trx.c
index da9de9f004b..4ab12398a5d 100644
--- a/storage/xtradb/trx/trx0trx.c
+++ b/storage/xtradb/trx/trx0trx.c
@@ -13,7 +13,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/usr/usr0sess.c b/storage/xtradb/usr/usr0sess.c
index eed377ec09e..83896a480b2 100644
--- a/storage/xtradb/usr/usr0sess.c
+++ b/storage/xtradb/usr/usr0sess.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/ut/ut0bh.c b/storage/xtradb/ut/ut0bh.c
index 6d1f881917b..2f68d78c034 100644
--- a/storage/xtradb/ut/ut0bh.c
+++ b/storage/xtradb/ut/ut0bh.c
@@ -17,7 +17,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/ut/ut0byte.c b/storage/xtradb/ut/ut0byte.c
index 3d84df52818..1015af93930 100644
--- a/storage/xtradb/ut/ut0byte.c
+++ b/storage/xtradb/ut/ut0byte.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/ut/ut0dbg.c b/storage/xtradb/ut/ut0dbg.c
index 8c77723bd73..ff0eb4e3365 100644
--- a/storage/xtradb/ut/ut0dbg.c
+++ b/storage/xtradb/ut/ut0dbg.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/ut/ut0list.c b/storage/xtradb/ut/ut0list.c
index e8f1e3a9bff..7663115fa6d 100644
--- a/storage/xtradb/ut/ut0list.c
+++ b/storage/xtradb/ut/ut0list.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/ut/ut0mem.c b/storage/xtradb/ut/ut0mem.c
index 944c1f1e049..5e0ce7c765e 100644
--- a/storage/xtradb/ut/ut0mem.c
+++ b/storage/xtradb/ut/ut0mem.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/ut/ut0rbt.c b/storage/xtradb/ut/ut0rbt.c
index 34a2c04468b..1883471d4d9 100644
--- a/storage/xtradb/ut/ut0rbt.c
+++ b/storage/xtradb/ut/ut0rbt.c
@@ -18,7 +18,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 /********************************************************************//**
diff --git a/storage/xtradb/ut/ut0rnd.c b/storage/xtradb/ut/ut0rnd.c
index feaee0d0864..36e1ecfc941 100644
--- a/storage/xtradb/ut/ut0rnd.c
+++ b/storage/xtradb/ut/ut0rnd.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/ut/ut0vec.c b/storage/xtradb/ut/ut0vec.c
index b2f8683bec8..4fecad8136f 100644
--- a/storage/xtradb/ut/ut0vec.c
+++ b/storage/xtradb/ut/ut0vec.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/storage/xtradb/ut/ut0wqueue.c b/storage/xtradb/ut/ut0wqueue.c
index e6885b206eb..08b246476bb 100644
--- a/storage/xtradb/ut/ut0wqueue.c
+++ b/storage/xtradb/ut/ut0wqueue.c
@@ -12,7 +12,7 @@ FOR A PARTICULAR PURPOSE. See the 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
+51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 *****************************************************************************/
 
diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt
index 3e0c0612c57..6646d48e2dc 100644
--- a/strings/CMakeLists.txt
+++ b/strings/CMakeLists.txt
@@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c
index 7dfc76e5417..b0c2ae71a45 100644
--- a/strings/conf_to_src.c
+++ b/strings/conf_to_src.c
@@ -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 "strings_def.h"
 #include 
@@ -268,7 +268,7 @@ fprint_copyright(FILE *file)
 "\n"
 "   You should have received a copy of the GNU General Public License\n"
 "   along with this program; if not, write to the Free Software\n"
-"   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */\n"
+"   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335  USA */\n"
 "\n");
 }
 
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index 7c7d8c7b2f5..502a0bd55e1 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.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 */
 
 /*
  * This file is basicly usa7 character sets with some extra functions
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index 77b7e0e18c3..4813607690a 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 /* This file is for binary pseudo charset, created by bar@mysql.com */
 
diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c
index b7847e4509e..27f1a2ef160 100644
--- a/strings/ctype-cp932.c
+++ b/strings/ctype-cp932.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 */
 
 /* This file is for cp932 charaset (Windows Japanese),
    and created based on ctype-sjis.c file  */
diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index 36fc6b36f0c..7030e6d41a5 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.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 */
 
 /* File strings/ctype-czech.c for MySQL.
 
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index 3caa1977c0b..5ead0fef66a 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.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 */
 
 /* 
  * This file is for Korean EUC charset, and created by powerm90@tinc.co.kr.
diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c
index 73698290b06..49dbaaf3138 100644
--- a/strings/ctype-eucjpms.c
+++ b/strings/ctype-eucjpms.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 /* This file is for Japanese EUC charset, and created based on
 ctype-ujis.c file.
diff --git a/strings/ctype-extra.c b/strings/ctype-extra.c
index e0499c6f2e3..da112646aea 100644
--- a/strings/ctype-extra.c
+++ b/strings/ctype-extra.c
@@ -20,7 +20,7 @@
 
    You should have 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 "strings_def.h"
 #include 
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index b27ea67059d..a2d9e6edb08 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.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 */
 
 /* This file is for Chinese EUC character sets (GB2312), and created by Miles Tsai (net-bull@126.com).
  */
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index 8b37de4a5e7..d3a53475ccc 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.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 */
 
 /* This file is for Chinese character sets GBK, created by Wei He 
    (hewei@mail.ied.ac.cn)
diff --git a/strings/ctype-latin1.c b/strings/ctype-latin1.c
index 80ae11c82c2..8bfc81c83df 100644
--- a/strings/ctype-latin1.c
+++ b/strings/ctype-latin1.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 */
 
 #include "strings_def.h"
 #include 
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c
index 519e93471ea..cf0515a31c9 100644
--- a/strings/ctype-mb.c
+++ b/strings/ctype-mb.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 */
 
 #include "strings_def.h"
 #include 
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index 4556ed75f7e..5c9790966d8 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.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 */
 
 #include "strings_def.h"
 #include 
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 50756799a56..dc6b234cf5c 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.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 */
 
 /* This file is for Shift JIS charset, and created by tommy@valley.ne.jp.
  */
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index 6bc71bcade3..b0a23abeca4 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 /* 
    UCA (Unicode Collation Algorithm) support. 
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index ca6f53f3f8d..d4145b1a9e5 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 /* UCS2 support. Written by Alexander Barkov  */
 
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 46d4819b46e..c2b3c248034 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 /* This file is for Japanese EUC charset, and created by tommy@valley.ne.jp.
  */
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 7d39c9127c3..c6a57ceafa6 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 /* UTF8 according RFC 2279 */
 /* Written by Alexander Barkov  */
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c
index 5e33d9ccbd6..a85320cd55c 100644
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.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 */
 
 /*
    Shared, independent copyright: (C) 2001 Jan Pazdziora.
diff --git a/strings/ctype.c b/strings/ctype.c
index df22d0f19e5..b99f87819e3 100644
--- a/strings/ctype.c
+++ b/strings/ctype.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 */
 
 #include "strings_def.h"
 #include 
diff --git a/strings/decimal.c b/strings/decimal.c
index 05546aa77a3..5b82ad2b3b2 100644
--- a/strings/decimal.c
+++ b/strings/decimal.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 */
 
 /*
 =======================================================================
diff --git a/strings/do_ctype.c b/strings/do_ctype.c
index 55e319a2295..e9430deee42 100644
--- a/strings/do_ctype.c
+++ b/strings/do_ctype.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 */
 
 /* Prints case-convert and sort-convert tabell on stdout. This is used to
    make _ctype.c easyer */
diff --git a/strings/dtoa.c b/strings/dtoa.c
index 5f50e10c9bf..ef2f072d59b 100644
--- a/strings/dtoa.c
+++ b/strings/dtoa.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 */
 
 /****************************************************************
 
diff --git a/strings/dump_map.c b/strings/dump_map.c
index debc44d6f5f..fa713920e7b 100644
--- a/strings/dump_map.c
+++ b/strings/dump_map.c
@@ -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 
 #include 
diff --git a/strings/my_strchr.c b/strings/my_strchr.c
index 0305ef89542..3ff7c32f482 100644
--- a/strings/my_strchr.c
+++ b/strings/my_strchr.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 */
 
 #include "strings_def.h"
 #include 
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c
index 3ac4156da22..18b92a1ef92 100644
--- a/strings/my_vsnprintf.c
+++ b/strings/my_vsnprintf.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 */
 
 #include "strings_def.h"
 #include 
diff --git a/strings/str_alloc.c b/strings/str_alloc.c
index 17139e7b773..330e597b6f5 100644
--- a/strings/str_alloc.c
+++ b/strings/str_alloc.c
@@ -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 "strings_def.h"
 
diff --git a/strings/strmake.c b/strings/strmake.c
index 951a589e360..a5e1dafb185 100644
--- a/strings/strmake.c
+++ b/strings/strmake.c
@@ -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   : strmake.c
     Author : Michael Widenius
diff --git a/strings/t_ctype.h b/strings/t_ctype.h
index a4fdd267c3f..a6d2783fe93 100644
--- a/strings/t_ctype.h
+++ b/strings/t_ctype.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 */
 
 /*
   Copyright (C) 1998, 1999 by Pruet Boonma, all rights reserved.
diff --git a/strings/uca-dump.c b/strings/uca-dump.c
index d5c20854636..59de9df39fd 100644
--- a/strings/uca-dump.c
+++ b/strings/uca-dump.c
@@ -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 
 #include 
diff --git a/strings/uctypedump.c b/strings/uctypedump.c
index ed3c64969d5..30ae33afee1 100644
--- a/strings/uctypedump.c
+++ b/strings/uctypedump.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 */
 
 #include "strings_def.h"
 #include 
diff --git a/strings/utr11-dump.c b/strings/utr11-dump.c
index 0806b3ba0cd..695f6b20047 100644
--- a/strings/utr11-dump.c
+++ b/strings/utr11-dump.c
@@ -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 
 #include 
diff --git a/strings/xml.c b/strings/xml.c
index 531fdc83eaa..80e94e596be 100644
--- a/strings/xml.c
+++ b/strings/xml.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 */
 
 #include "strings_def.h"
 #include "my_xml.h"
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index 5e9fd081a09..bcbcff31ed8 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/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(WIN32)
   SET(localstatedir "C:\\\\mysql\\\\data\\\\")
diff --git a/support-files/MacOSX/Description.plist.sh b/support-files/MacOSX/Description.plist.sh
index 1acae093db2..9af3eddf47a 100644
--- a/support-files/MacOSX/Description.plist.sh
+++ b/support-files/MacOSX/Description.plist.sh
@@ -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
 -->
 
 
diff --git a/support-files/MacOSX/Info.plist.sh b/support-files/MacOSX/Info.plist.sh
index 4cc1957a3ea..c2033e42070 100644
--- a/support-files/MacOSX/Info.plist.sh
+++ b/support-files/MacOSX/Info.plist.sh
@@ -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
 -->
 
 
diff --git a/support-files/MacOSX/MySQLCOM b/support-files/MacOSX/MySQLCOM
index 4de6485ae7c..ca5e444fddc 100755
--- a/support-files/MacOSX/MySQLCOM
+++ b/support-files/MacOSX/MySQLCOM
@@ -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
 
 #
 # /Library/StartupItems/MySQLCOM/MySQLCOM
diff --git a/support-files/MacOSX/StartupItem.Description.plist b/support-files/MacOSX/StartupItem.Description.plist
index e8d720ae5f1..1374ca94142 100644
--- a/support-files/MacOSX/StartupItem.Description.plist
+++ b/support-files/MacOSX/StartupItem.Description.plist
@@ -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
 -->
 
 
diff --git a/support-files/MacOSX/StartupItem.Info.plist b/support-files/MacOSX/StartupItem.Info.plist
index 9891668e283..947c81c732a 100644
--- a/support-files/MacOSX/StartupItem.Info.plist
+++ b/support-files/MacOSX/StartupItem.Info.plist
@@ -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
 -->
 
 
diff --git a/support-files/MacOSX/StartupItem.postinstall b/support-files/MacOSX/StartupItem.postinstall
index b3814db5ddf..d67abc9d944 100755
--- a/support-files/MacOSX/StartupItem.postinstall
+++ b/support-files/MacOSX/StartupItem.postinstall
@@ -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
 
 #
 # postinstall script for the MySQL Startup Item Installation package
diff --git a/support-files/MacOSX/StartupParameters.plist.sh b/support-files/MacOSX/StartupParameters.plist.sh
index 66cc93fd842..f92385a8d33 100644
--- a/support-files/MacOSX/StartupParameters.plist.sh
+++ b/support-files/MacOSX/StartupParameters.plist.sh
@@ -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
 -->
 
 
diff --git a/support-files/MacOSX/mwar-wrapper b/support-files/MacOSX/mwar-wrapper
index 8d424df11b7..79ec570bfad 100755
--- a/support-files/MacOSX/mwar-wrapper
+++ b/support-files/MacOSX/mwar-wrapper
@@ -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
 
 # This script can only create a library, not take it apart
 # again to AR files
diff --git a/support-files/MacOSX/mwcc-wrapper b/support-files/MacOSX/mwcc-wrapper
index 6de7a321833..6a3e5394c84 100755
--- a/support-files/MacOSX/mwcc-wrapper
+++ b/support-files/MacOSX/mwcc-wrapper
@@ -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
 
 if [ -z "$CWINSTALL" ] ; then
     echo "ERROR: You need to source 'mwvars' to set CWINSTALL and other variables"
diff --git a/support-files/MacOSX/postflight.sh b/support-files/MacOSX/postflight.sh
index 00ba30dffc4..752eddc4241 100644
--- a/support-files/MacOSX/postflight.sh
+++ b/support-files/MacOSX/postflight.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 #
 # postflight - this script will be executed after the MySQL PKG
diff --git a/support-files/MacOSX/preflight.sh b/support-files/MacOSX/preflight.sh
index 52f18a54967..ce466d5b481 100644
--- a/support-files/MacOSX/preflight.sh
+++ b/support-files/MacOSX/preflight.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# MA 02110-1335  USA
 
 #
 # preflight - this script will be executed before the MySQL PKG
diff --git a/support-files/MySQL-shared-compat.spec.sh b/support-files/MySQL-shared-compat.spec.sh
index 46935d83d17..00405535ac9 100644
--- a/support-files/MySQL-shared-compat.spec.sh
+++ b/support-files/MySQL-shared-compat.spec.sh
@@ -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
+# Franklin Street, Fifth Floor, Boston, MA 02110-1335  USA
 
 # For 5.0 and up, this is needed because of "libndbclient".
 %define _unpackaged_files_terminate_build 0
diff --git a/support-files/SELinux/CMakeLists.txt b/support-files/SELinux/CMakeLists.txt
index 996d56d6c05..59e4dec560f 100644
--- a/support-files/SELinux/CMakeLists.txt
+++ b/support-files/SELinux/CMakeLists.txt
@@ -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
 
 FIND_PROGRAM(CHECKMODULE checkmodule)
 FIND_PROGRAM(SEMODULE_PACKAGE semodule_package)
diff --git a/support-files/SELinux/rhel4-mysql.fc b/support-files/SELinux/rhel4-mysql.fc
index aa0fced4bbc..313eb2caae7 100644
--- a/support-files/SELinux/rhel4-mysql.fc
+++ b/support-files/SELinux/rhel4-mysql.fc
@@ -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
 
 # MySQL Database Server
 
diff --git a/support-files/SELinux/rhel4-mysql.te b/support-files/SELinux/rhel4-mysql.te
index d2609244640..65b8bcc17a4 100644
--- a/support-files/SELinux/rhel4-mysql.te
+++ b/support-files/SELinux/rhel4-mysql.te
@@ -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
 
 policy_module(mysql,1.0.0)
 
diff --git a/support-files/config.huge.ini.sh b/support-files/config.huge.ini.sh
index f98074828a7..1464fa80b18 100644
--- a/support-files/config.huge.ini.sh
+++ b/support-files/config.huge.ini.sh
@@ -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
 #
 ######################################################
 # MySQL NDB Cluster Huge Sample Configuration File   #
diff --git a/support-files/config.medium.ini.sh b/support-files/config.medium.ini.sh
index 1de7f64912e..eb40a5a8231 100644
--- a/support-files/config.medium.ini.sh
+++ b/support-files/config.medium.ini.sh
@@ -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
 #
 # MySQL NDB Cluster Medium Sample Configuration File
 #
diff --git a/support-files/config.small.ini.sh b/support-files/config.small.ini.sh
index 0af60e5dc91..c316dbd5b6d 100644
--- a/support-files/config.small.ini.sh
+++ b/support-files/config.small.ini.sh
@@ -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
 #
 # MySQL NDB Cluster Small Sample Configuration File
 #
diff --git a/support-files/dtrace/locktime.d b/support-files/dtrace/locktime.d
index 610da8fbffb..398a7262b89 100644
--- a/support-files/dtrace/locktime.d
+++ b/support-files/dtrace/locktime.d
@@ -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
 #
 # Shows the time that an individual lock is applied to a database and table
 # Shows the time to achieve the lock, and the time the table was locked
diff --git a/support-files/dtrace/query-execandqc.d b/support-files/dtrace/query-execandqc.d
index 27dd5983fb0..feb93785133 100644
--- a/support-files/dtrace/query-execandqc.d
+++ b/support-files/dtrace/query-execandqc.d
@@ -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
 #
 # Show query execution times, indicating whether the query-cache was used
 
diff --git a/support-files/dtrace/query-filesort-time.d b/support-files/dtrace/query-filesort-time.d
index 0705f6ec556..3bffd078d24 100644
--- a/support-files/dtrace/query-filesort-time.d
+++ b/support-files/dtrace/query-filesort-time.d
@@ -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
 #
 # Show the time taken for a query, including the time taken to 
 # sort the results using filesort 
diff --git a/support-files/dtrace/query-network-time.d b/support-files/dtrace/query-network-time.d
index 1b425284873..bf3c05e564d 100644
--- a/support-files/dtrace/query-network-time.d
+++ b/support-files/dtrace/query-network-time.d
@@ -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
 #
 # Show the time taken to execute a query, include the bytes and time taken
 # to transfer the information over the network to/from the client
diff --git a/support-files/dtrace/query-parse-time.d b/support-files/dtrace/query-parse-time.d
index 211152afdd2..7564068a4ff 100644
--- a/support-files/dtrace/query-parse-time.d
+++ b/support-files/dtrace/query-parse-time.d
@@ -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
 #
 # Shows time take to actually parse the query statement
 
diff --git a/support-files/dtrace/query-rowops.d b/support-files/dtrace/query-rowops.d
index 04748955f6c..2c93f21b918 100644
--- a/support-files/dtrace/query-rowops.d
+++ b/support-files/dtrace/query-rowops.d
@@ -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
 #
 # Calculates the time (and operations) for accessing data from individual
 # rows for each query
diff --git a/support-files/dtrace/query-time.d b/support-files/dtrace/query-time.d
index 98e4b129838..553a12b2169 100644
--- a/support-files/dtrace/query-time.d
+++ b/support-files/dtrace/query-time.d
@@ -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
 #
 # Shows basic query execution time, who execute the query, and on what database
 
diff --git a/support-files/dtrace/statement-time.d b/support-files/dtrace/statement-time.d
index 10ef57039ad..9776e827eb1 100644
--- a/support-files/dtrace/statement-time.d
+++ b/support-files/dtrace/statement-time.d
@@ -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
 #
 # Creates a report on each query executed at the individual statement
 # level, showing rows matched, updated, and total query time
diff --git a/support-files/dtrace/statement-type-aggregate.d b/support-files/dtrace/statement-type-aggregate.d
index 784ee4aee9b..9d34c766279 100644
--- a/support-files/dtrace/statement-type-aggregate.d
+++ b/support-files/dtrace/statement-type-aggregate.d
@@ -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
 #
 # Creates an aggregate report of the time spent perform queries of the four main
 # types (select, insert, update, delete)
diff --git a/support-files/mysql.m4 b/support-files/mysql.m4
index 371700a9c08..0a7034f61e8 100644
--- a/support-files/mysql.m4
+++ b/support-files/mysql.m4
@@ -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
+# Franklin Street, Fifth Floor, Boston, MA 02110-1335  USA
 
 AC_DEFUN([_MYSQL_CONFIG],[
   AC_ARG_WITH([mysql-config],
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 5af4783f919..49e31257404 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -12,7 +12,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; see the file COPYING. If not, write to the
 # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
-# MA  02110-1301  USA.
+# MA  02110-1335  USA.
 
 ##############################################################################
 # Some common macro definitions
diff --git a/support-files/ndb-config-2-node.ini.sh b/support-files/ndb-config-2-node.ini.sh
index cf3bbfc436e..338efffd336 100644
--- a/support-files/ndb-config-2-node.ini.sh
+++ b/support-files/ndb-config-2-node.ini.sh
@@ -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
 #
 # Example Ndbcluster storage engine config file.
 #
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index dc775020954..8b3f9230c5d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -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
 
 ADD_DEFINITIONS("-DMYSQL_CLIENT")
 
diff --git a/tests/big_record.pl b/tests/big_record.pl
index 0d5766e5f5d..cb1f8998468 100755
--- a/tests/big_record.pl
+++ b/tests/big_record.pl
@@ -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
 
 # This is a test with stores big records in a blob.
 # Note that for the default test the mysql server should have been
diff --git a/tests/bug25714.c b/tests/bug25714.c
index 7e6be13624b..5321419679b 100644
--- a/tests/bug25714.c
+++ b/tests/bug25714.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 */
 
 #include 
 #include 
diff --git a/tests/connect_test.c b/tests/connect_test.c
index f30d0f2edba..121ff2aa1a8 100644
--- a/tests/connect_test.c
+++ b/tests/connect_test.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 */
 
 #include 
 #include 
diff --git a/tests/deadlock_test.c b/tests/deadlock_test.c
index 811aa9b58c6..b4deef84593 100644
--- a/tests/deadlock_test.c
+++ b/tests/deadlock_test.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 */
 
 #include 
 #include 
diff --git a/tests/drop_test.pl b/tests/drop_test.pl
index 362b6d7b8b5..329f65eb65d 100755
--- a/tests/drop_test.pl
+++ b/tests/drop_test.pl
@@ -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
 
 #
 # This is a test with uses processes to insert, select and drop tables.
diff --git a/tests/export.pl b/tests/export.pl
index d7825574c8c..f99798ecac8 100755
--- a/tests/export.pl
+++ b/tests/export.pl
@@ -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
 
 # This is a test with uses two processes to a database.
 # The other inserts records in two tables, the other does a lot of joins
diff --git a/tests/fork2_test.pl b/tests/fork2_test.pl
index f8e15403da1..356055733fa 100755
--- a/tests/fork2_test.pl
+++ b/tests/fork2_test.pl
@@ -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
 
 # This is a test with uses 5 processes to insert, update and select from
 # two tables.
diff --git a/tests/fork_big.pl b/tests/fork_big.pl
index 6e78e779d11..a294ac96e5b 100755
--- a/tests/fork_big.pl
+++ b/tests/fork_big.pl
@@ -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
 
 #
 # This is a test with uses many processes to test a MySQL server.
diff --git a/tests/fork_big2.pl b/tests/fork_big2.pl
index 0f1d65be8f9..c844d290834 100644
--- a/tests/fork_big2.pl
+++ b/tests/fork_big2.pl
@@ -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
 
 #
 # This is a test with uses many processes to test a MySQL server.
diff --git a/tests/grant.pl b/tests/grant.pl
index 23a7d2110fb..cd651643316 100755
--- a/tests/grant.pl
+++ b/tests/grant.pl
@@ -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
 
 #
 # Testing of grants.
diff --git a/tests/index_corrupt.pl b/tests/index_corrupt.pl
index 3623315c968..6b04ce8a59c 100755
--- a/tests/index_corrupt.pl
+++ b/tests/index_corrupt.pl
@@ -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
 
 #
 # This is a test for a key cache bug (bug #10167)
diff --git a/tests/insert_and_repair.pl b/tests/insert_and_repair.pl
index d8799321af1..18091c92718 100755
--- a/tests/insert_and_repair.pl
+++ b/tests/insert_and_repair.pl
@@ -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
 
 #
 # This is a test of insert and repair/check.
diff --git a/tests/insert_test.c b/tests/insert_test.c
index f09766088aa..f2e6b61f11d 100644
--- a/tests/insert_test.c
+++ b/tests/insert_test.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 */
 
 #include 
 #include 
diff --git a/tests/list_test.c b/tests/list_test.c
index 2e8cd3654a3..42d4f962b19 100644
--- a/tests/list_test.c
+++ b/tests/list_test.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 */
 
 #ifdef __WIN__
 #include 
diff --git a/tests/lock_test.pl b/tests/lock_test.pl
index 97531df99ca..98c4ad6377d 100755
--- a/tests/lock_test.pl
+++ b/tests/lock_test.pl
@@ -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
 
 # This is a test with uses two processes to a database.
 # The other inserts records in two tables, the other does a lot of joins
diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c
index 90a1ea77a50..eb4a241dffe 100644
--- a/tests/mysql_client_fw.c
+++ b/tests/mysql_client_fw.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  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 #include 
 #include 
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index f62545daa21..3758c4f1ff7 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.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 */
 
 /***************************************************************************
  This is a test sample to test the new features in MySQL client-server
diff --git a/tests/pmail.pl b/tests/pmail.pl
index 39f51a4e401..359256c25b3 100755
--- a/tests/pmail.pl
+++ b/tests/pmail.pl
@@ -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
 
 #                                  
 # Prints mails to standard output  
diff --git a/tests/rename_test.pl b/tests/rename_test.pl
index 24d4f9e1a2e..d7097df1e4e 100755
--- a/tests/rename_test.pl
+++ b/tests/rename_test.pl
@@ -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
 
 #
 # This is a test with uses processes to insert, select and drop tables.
diff --git a/tests/select_test.c b/tests/select_test.c
index 9a144c59292..648a86135a8 100644
--- a/tests/select_test.c
+++ b/tests/select_test.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 */
 
 #if defined(_WIN32) || defined(_WIN64)
 #include 
diff --git a/tests/showdb_test.c b/tests/showdb_test.c
index 555a8511e61..267e32d51d7 100644
--- a/tests/showdb_test.c
+++ b/tests/showdb_test.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 */
 
 
 #ifdef __WIN__
diff --git a/tests/ssl_test.c b/tests/ssl_test.c
index 2cd4b4b868b..6102fc7fd4e 100644
--- a/tests/ssl_test.c
+++ b/tests/ssl_test.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 */
 
 
 #ifdef __WIN__
diff --git a/tests/table_types.pl b/tests/table_types.pl
index 53f59a4429d..c633a153098 100755
--- a/tests/table_types.pl
+++ b/tests/table_types.pl
@@ -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
 
 use DBI;
 use Benchmark;
diff --git a/tests/test_delayed_insert.pl b/tests/test_delayed_insert.pl
index 6d535374991..cb5b86a228d 100755
--- a/tests/test_delayed_insert.pl
+++ b/tests/test_delayed_insert.pl
@@ -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
 
 # This is a test for INSERT DELAYED
 #
diff --git a/tests/thread_test.c b/tests/thread_test.c
index bf0fb8ea2c0..c73690a6e51 100644
--- a/tests/thread_test.c
+++ b/tests/thread_test.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include 
 
diff --git a/tests/truncate.pl b/tests/truncate.pl
index 41bb79b8237..98791a15b2c 100755
--- a/tests/truncate.pl
+++ b/tests/truncate.pl
@@ -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
 
 #
 # This is a test with uses many processes to test a MySQL server.
diff --git a/unittest/examples/CMakeLists.txt b/unittest/examples/CMakeLists.txt
index 86c4a5bea9e..cba7db5bd69 100644
--- a/unittest/examples/CMakeLists.txt
+++ b/unittest/examples/CMakeLists.txt
@@ -11,6 +11,6 @@
 # 
 # You should have 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
 
 MY_ADD_TESTS(simple skip todo skip_all no_plan)
diff --git a/unittest/examples/core-t.c b/unittest/examples/core-t.c
index 5f49e1cb1d9..12d9fe5c418 100644
--- a/unittest/examples/core-t.c
+++ b/unittest/examples/core-t.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 */
 
 #include 
 
diff --git a/unittest/examples/no_plan-t.c b/unittest/examples/no_plan-t.c
index b795b2ca655..80a56970cf5 100644
--- a/unittest/examples/no_plan-t.c
+++ b/unittest/examples/no_plan-t.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 St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335  USA */
 
 #include 
 
diff --git a/unittest/examples/simple-t.c b/unittest/examples/simple-t.c
index b3ead293289..ea64696c30c 100644
--- a/unittest/examples/simple-t.c
+++ b/unittest/examples/simple-t.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 */
 
 #include 
 
diff --git a/unittest/examples/skip-t.c b/unittest/examples/skip-t.c
index 4b1115e50f3..a8ca43f6e2c 100644
--- a/unittest/examples/skip-t.c
+++ b/unittest/examples/skip-t.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 */
 
 #include 
 #include 
diff --git a/unittest/examples/skip_all-t.c b/unittest/examples/skip_all-t.c
index 9d31e0c3af8..cfe6432b267 100644
--- a/unittest/examples/skip_all-t.c
+++ b/unittest/examples/skip_all-t.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 */
 
 #include 
 
diff --git a/unittest/examples/todo-t.c b/unittest/examples/todo-t.c
index e1be2e8eacd..91720b30f02 100644
--- a/unittest/examples/todo-t.c
+++ b/unittest/examples/todo-t.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 */
 
 #include 
 
diff --git a/unittest/my_decimal/CMakeLists.txt b/unittest/my_decimal/CMakeLists.txt
index 85d203e8f47..d8f74b87494 100644
--- a/unittest/my_decimal/CMakeLists.txt
+++ b/unittest/my_decimal/CMakeLists.txt
@@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/sql
diff --git a/unittest/my_decimal/my_decimal-t.cc b/unittest/my_decimal/my_decimal-t.cc
index 92c4bdee8e4..b14c679432e 100644
--- a/unittest/my_decimal/my_decimal-t.cc
+++ b/unittest/my_decimal/my_decimal-t.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_config.h"
 #include "config.h"
diff --git a/unittest/mysys/CMakeLists.txt b/unittest/mysys/CMakeLists.txt
index 95f54acf419..de7efeaaaec 100644
--- a/unittest/mysys/CMakeLists.txt
+++ b/unittest/mysys/CMakeLists.txt
@@ -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
 
 MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
              LINK_LIBRARIES mysys)
diff --git a/unittest/mysys/base64-t.c b/unittest/mysys/base64-t.c
index f4496f570f9..54fb672266a 100644
--- a/unittest/mysys/base64-t.c
+++ b/unittest/mysys/base64-t.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 */
 
 #include 
 #include 
diff --git a/unittest/mysys/bitmap-t.c b/unittest/mysys/bitmap-t.c
index 0666f4eaa15..383cad74d26 100644
--- a/unittest/mysys/bitmap-t.c
+++ b/unittest/mysys/bitmap-t.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
 
    This test was copied from the unit test inside the
    mysys/my_bitmap.c file and adapted by Mats Kindahl to use the mytap
diff --git a/unittest/mysys/dynstring-t.c b/unittest/mysys/dynstring-t.c
index fed8488da2c..774811f0182 100644
--- a/unittest/mysys/dynstring-t.c
+++ b/unittest/mysys/dynstring-t.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 //#include 
 #include 
diff --git a/unittest/mysys/lf-t.c b/unittest/mysys/lf-t.c
index c1c89f60864..3a63be39e38 100644
--- a/unittest/mysys/lf-t.c
+++ b/unittest/mysys/lf-t.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /**
   @file
diff --git a/unittest/mysys/my_atomic-t.c b/unittest/mysys/my_atomic-t.c
index 5eb988e2e15..7be846e03a5 100644
--- a/unittest/mysys/my_atomic-t.c
+++ b/unittest/mysys/my_atomic-t.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include "thr_template.c"
 
diff --git a/unittest/mysys/my_delete-t.c b/unittest/mysys/my_delete-t.c
index 7d15f09c787..7bc6cf89de5 100644
--- a/unittest/mysys/my_delete-t.c
+++ b/unittest/mysys/my_delete-t.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include 
 #include 
diff --git a/unittest/mysys/my_getopt-t.c b/unittest/mysys/my_getopt-t.c
index afdb5e8b3b8..2b66711be42 100644
--- a/unittest/mysys/my_getopt-t.c
+++ b/unittest/mysys/my_getopt-t.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 St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335  USA */
 
 #include 
 #include 
diff --git a/unittest/mysys/my_malloc-t.c b/unittest/mysys/my_malloc-t.c
index 52d73434150..d20ef052380 100644
--- a/unittest/mysys/my_malloc-t.c
+++ b/unittest/mysys/my_malloc-t.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include 
 #include 
diff --git a/unittest/mysys/my_rdtsc-t.c b/unittest/mysys/my_rdtsc-t.c
index 76a74a6fc09..81005e9e30c 100644
--- a/unittest/mysys/my_rdtsc-t.c
+++ b/unittest/mysys/my_rdtsc-t.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 */
 
 /*
   rdtsc3 -- multi-platform timer code
diff --git a/unittest/mysys/my_vsnprintf-t.c b/unittest/mysys/my_vsnprintf-t.c
index 06f6878826a..57de8c06df9 100644
--- a/unittest/mysys/my_vsnprintf-t.c
+++ b/unittest/mysys/my_vsnprintf-t.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include 
 #include 
diff --git a/unittest/mysys/thr_template.c b/unittest/mysys/thr_template.c
index 0e06bf6e731..2a4585f3f89 100644
--- a/unittest/mysys/thr_template.c
+++ b/unittest/mysys/thr_template.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 */
 
 #include 
 #include 
diff --git a/unittest/mytap/CMakeLists.txt b/unittest/mytap/CMakeLists.txt
index 063c69eb925..189ea5a1c00 100644
--- a/unittest/mytap/CMakeLists.txt
+++ b/unittest/mytap/CMakeLists.txt
@@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 ADD_LIBRARY(mytap tap.c)
diff --git a/unittest/mytap/t/basic-t.c b/unittest/mytap/t/basic-t.c
index 9a909baba96..6878383888d 100644
--- a/unittest/mytap/t/basic-t.c
+++ b/unittest/mytap/t/basic-t.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 */
 
 #include "my_config.h"
 
diff --git a/unittest/mytap/tap.c b/unittest/mytap/tap.c
index 7bfc6dba8f5..65608e0de05 100644
--- a/unittest/mytap/tap.c
+++ b/unittest/mytap/tap.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
 
    Library for providing TAP support for testing C and C++ was written
    by Mats Kindahl .
diff --git a/unittest/mytap/tap.h b/unittest/mytap/tap.h
index 834392c5fae..9b79b7714e8 100644
--- a/unittest/mytap/tap.h
+++ b/unittest/mytap/tap.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
 
    Library for providing TAP support for testing C and C++ was written
    by Mats Kindahl .
diff --git a/unittest/sql/CMakeLists.txt b/unittest/sql/CMakeLists.txt
index f80f2a5ae70..b73817a0e27 100644
--- a/unittest/sql/CMakeLists.txt
+++ b/unittest/sql/CMakeLists.txt
@@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
                     ${CMAKE_SOURCE_DIR}/include
diff --git a/unittest/sql/explain_filename-t.cc b/unittest/sql/explain_filename-t.cc
index 4f09f65f0a7..95bedbd41da 100644
--- a/unittest/sql/explain_filename-t.cc
+++ b/unittest/sql/explain_filename-t.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
 */
 
 /** Unit test case for the function explain_filename(). */
diff --git a/unittest/strings/strings-t.c b/unittest/strings/strings-t.c
index 6baef0417a8..3b5b6d5d255 100644
--- a/unittest/strings/strings-t.c
+++ b/unittest/strings/strings-t.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 St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335  USA */
 
 #include 
 #include 
diff --git a/unittest/unit.pl b/unittest/unit.pl
index fe45ece4233..fb9a16fbe49 100644
--- a/unittest/unit.pl
+++ b/unittest/unit.pl
@@ -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
 
 use File::Find;
 use Getopt::Long;
diff --git a/vio/CMakeLists.txt b/vio/CMakeLists.txt
index b83518cd749..af5ecd89b33 100644
--- a/vio/CMakeLists.txt
+++ b/vio/CMakeLists.txt
@@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
 ${SSL_INCLUDE_DIRS})
diff --git a/vio/test-ssl.c b/vio/test-ssl.c
index c99f5071055..dc116e7e43c 100644
--- a/vio/test-ssl.c
+++ b/vio/test-ssl.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include 
 #if defined(HAVE_OPENSSL)
diff --git a/vio/test-sslclient.c b/vio/test-sslclient.c
index 93fdb063754..487c7b92bfb 100644
--- a/vio/test-sslclient.c
+++ b/vio/test-sslclient.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include 
 #ifdef HAVE_OPENSSL
diff --git a/vio/test-sslserver.c b/vio/test-sslserver.c
index c81dc03dc58..8d63fd16f33 100644
--- a/vio/test-sslserver.c
+++ b/vio/test-sslserver.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include 
 #ifdef HAVE_OPENSSL
diff --git a/vio/vio.c b/vio/vio.c
index bdb21077f44..c8b90cdb3c9 100644
--- a/vio/vio.c
+++ b/vio/vio.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 */
 
 /*
   Note that we can't have assertion on file descriptors;  The reason for
diff --git a/vio/vio_priv.h b/vio/vio_priv.h
index 61a8ab150a9..a25f55797be 100644
--- a/vio/vio_priv.h
+++ b/vio/vio_priv.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 */
 
 /* Structures and functions private to the vio package */
 
diff --git a/vio/viosocket.c b/vio/viosocket.c
index baefa1c6d06..d8e7287956d 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -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 */
+   02110-1335  USA */
 
 /*
   Note that we can't have assertion on file descriptors;  The reason for
diff --git a/vio/viossl.c b/vio/viossl.c
index 5181f496768..18a622ccb40 100644
--- a/vio/viossl.c
+++ b/vio/viossl.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /*
   Note that we can't have assertion on file descriptors;  The reason for
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index 2040c3432b8..de75ee13037 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.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 */
 
 #include "vio_priv.h"
 
diff --git a/vio/viotest-ssl.c b/vio/viotest-ssl.c
index 51d171d6923..36d67b9f85f 100644
--- a/vio/viotest-ssl.c
+++ b/vio/viotest-ssl.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 St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include 
 #ifdef HAVE_OPENSSL
diff --git a/vio/viotest-sslconnect.cc b/vio/viotest-sslconnect.cc
index 18e558159fa..dee3e318aef 100644
--- a/vio/viotest-sslconnect.cc
+++ b/vio/viotest-sslconnect.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 */
 
 /* 
 **  Virtual I/O library
diff --git a/vio/viotest.cc b/vio/viotest.cc
index b1c11a85cf2..cfb74cf3a61 100644
--- a/vio/viotest.cc
+++ b/vio/viotest.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 */
 
 /* 
 **  Virtual I/O library
diff --git a/win/create_def_file.js b/win/create_def_file.js
index 461f4766a1d..461ab0270f7 100644
--- a/win/create_def_file.js
+++ b/win/create_def_file.js
@@ -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
 
 /*
   This script extracts names and types of globally defined symbols from
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt
index d33516044f6..6a2900bfe7a 100644
--- a/win/packaging/CMakeLists.txt
+++ b/win/packaging/CMakeLists.txt
@@ -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
 
 IF(NOT WIN32)
   RETURN()
diff --git a/win/packaging/ca/CMakeLists.txt b/win/packaging/ca/CMakeLists.txt
index 04d5408b9c9..1a24ee9a082 100644
--- a/win/packaging/ca/CMakeLists.txt
+++ b/win/packaging/ca/CMakeLists.txt
@@ -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_DIRECTORIES(${WIX_DIR}/../SDK/${WIX_MSVC_SUFFIX}/inc)
 SET(WIXCA_SOURCES CustomAction.cpp CustomAction.def)
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
index 0c224e7ce22..5d58f9a42b6 100644
--- a/zlib/CMakeLists.txt
+++ b/zlib/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
 
 cmake_minimum_required(VERSION 2.4.4)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)