List:Commits« Previous MessageNext Message »
From:Alexander Nozdrin Date:October 1 2010 7:42pm
Subject:bzr commit into mysql-5.5-bugteam branch (alexander.nozdrin:3210) Bug#57094
View as plain text  
#At file:///home/alik/MySQL/bzr/00/bug57094/mysql-5.5-bugteam-bug57094/ based on revid:alexander.nozdrin@stripped

 3210 Alexander Nozdrin	2010-10-01
      Patch for Bug#57094 (Copyright notice incorrect?).
      
      Part II: change copyright notice of *.h, *.c and *.cc files.

    modified:
      client/client_priv.h
      client/completion_hash.cc
      client/completion_hash.h
      client/echo.c
      client/get_password.c
      client/my_readline.h
      client/readline.cc
      client/sql_string.cc
      client/sql_string.h
      cmake/stack_direction.c
      extra/charset2html.c
      extra/comp_err.c
      extra/innochecksum.c
      extra/my_print_defaults.c
      extra/mysql_waitpid.c
      extra/perror.c
      extra/replace.c
      extra/resolve_stack_dump.c
      extra/resolveip.c
      include/atomic/gcc_builtins.h
      include/atomic/generic-msvc.h
      include/atomic/nolock.h
      include/atomic/rwlock.h
      include/atomic/solaris.h
      include/atomic/x86-gcc.h
      include/base64.h
      include/decimal.h
      include/errmsg.h
      include/ft_global.h
      include/hash.h
      include/heap.h
      include/keycache.h
      include/lf.h
      include/m_ctype.h
      include/m_string.h
      include/my_aes.h
      include/my_alarm.h
      include/my_alloc.h
      include/my_atomic.h
      include/my_attribute.h
      include/my_base.h
      include/my_bitmap.h
      include/my_dbug.h
      include/my_dir.h
      include/my_getopt.h
      include/my_global.h
      include/my_handler.h
      include/my_libwrap.h
      include/my_list.h
      include/my_md5.h
      include/my_net.h
      include/my_no_pthread.h
      include/my_nosys.h
      include/my_pthread.h
      include/my_rdtsc.h
      include/my_stacktrace.h
      include/my_sys.h
      include/my_time.h
      include/my_tree.h
      include/my_uctype.h
      include/my_user.h
      include/my_xml.h
      include/myisam.h
      include/myisammrg.h
      include/myisampack.h
      include/mysql.h
      include/mysql/plugin.h
      include/mysql/plugin_audit.h
      include/mysql/plugin_ftparser.h
      include/mysql/service_my_snprintf.h
      include/mysql/service_thd_alloc.h
      include/mysql/services.h
      include/mysql_com.h
      include/mysql_embed.h
      include/mysql_time.h
      include/mysql_version.h.in
      include/mysys_err.h
      include/password.h
      include/queues.h
      include/rijndael.h
      include/service_versions.h
      include/sha1.h
      include/sha2.h
      include/sql_common.h
      include/sslopt-case.h
      include/sslopt-longopts.h
      include/sslopt-vars.h
      include/t_ctype.h
      include/thr_alarm.h
      include/thr_lock.h
      include/typelib.h
      include/violite.h
      libmysql/client_settings.h
      libmysql/conf_to_src.c
      libmysql/errmsg.c
      libmysql/get_password.c
      libmysql/libmysql.c
      libmysqld/emb_qcache.cc
      libmysqld/emb_qcache.h
      libmysqld/embedded_priv.h
      libmysqld/libmysqld.c
      libservices/my_snprintf_service.c
      libservices/thd_alloc_service.c
      mysql-test/lib/My/SafeProcess/safe_kill_win.cc
      mysql-test/lib/My/SafeProcess/safe_process.cc
      mysql-test/lib/My/SafeProcess/safe_process_win.cc
      mysys/array.c
      mysys/base64.c
      mysys/charset-def.c
      mysys/charset.c
      mysys/checksum.c
      mysys/default.c
      mysys/errors.c
      mysys/hash.c
      mysys/lf_alloc-pin.c
      mysys/lf_dynarray.c
      mysys/lf_hash.c
      mysys/list.c
      mysys/md5.c
      mysys/mf_arr_appstr.c
      mysys/mf_brkhant.c
      mysys/mf_cache.c
      mysys/mf_dirname.c
      mysys/mf_fn_ext.c
      mysys/mf_format.c
      mysys/mf_getdate.c
      mysys/mf_iocache.c
      mysys/mf_iocache2.c
      mysys/mf_keycache.c
      mysys/mf_keycaches.c
      mysys/mf_loadpath.c
      mysys/mf_pack.c
      mysys/mf_path.c
      mysys/mf_qsort.c
      mysys/mf_qsort2.c
      mysys/mf_radix.c
      mysys/mf_same.c
      mysys/mf_sort.c
      mysys/mf_soundex.c
      mysys/mf_tempdir.c
      mysys/mf_tempfile.c
      mysys/mf_unixpath.c
      mysys/mf_wcomp.c
      mysys/mulalloc.c
      mysys/my_access.c
      mysys/my_aes.c
      mysys/my_alarm.c
      mysys/my_alloc.c
      mysys/my_atomic.c
      mysys/my_bit.c
      mysys/my_bitmap.c
      mysys/my_chsize.c
      mysys/my_compress.c
      mysys/my_conio.c
      mysys/my_copy.c
      mysys/my_crc32.c
      mysys/my_create.c
      mysys/my_delete.c
      mysys/my_div.c
      mysys/my_error.c
      mysys/my_file.c
      mysys/my_fopen.c
      mysys/my_fstream.c
      mysys/my_gethostbyname.c
      mysys/my_gethwaddr.c
      mysys/my_getncpus.c
      mysys/my_getopt.c
      mysys/my_getpagesize.c
      mysys/my_getsystime.c
      mysys/my_getwd.c
      mysys/my_handler.c
      mysys/my_init.c
      mysys/my_largepage.c
      mysys/my_lib.c
      mysys/my_libwrap.c
      mysys/my_lock.c
      mysys/my_lockmem.c
      mysys/my_memmem.c
      mysys/my_mess.c
      mysys/my_mkdir.c
      mysys/my_mmap.c
      mysys/my_new.cc
      mysys/my_once.c
      mysys/my_open.c
      mysys/my_port.c
      mysys/my_pread.c
      mysys/my_pthread.c
      mysys/my_quick.c
      mysys/my_rdtsc.c
      mysys/my_read.c
      mysys/my_redel.c
      mysys/my_rename.c
      mysys/my_seek.c
      mysys/my_sleep.c
      mysys/my_static.c
      mysys/my_static.h
      mysys/my_symlink.c
      mysys/my_symlink2.c
      mysys/my_sync.c
      mysys/my_thr_init.c
      mysys/my_wincond.c
      mysys/my_windac.c
      mysys/my_winerr.c
      mysys/my_winfile.c
      mysys/my_winthread.c
      mysys/my_write.c
      mysys/mysys_priv.h
      mysys/ptr_cmp.c
      mysys/queues.c
      mysys/rijndael.c
      mysys/sha1.c
      mysys/stacktrace.c
      mysys/string.c
      mysys/test_charset.c
      mysys/test_dir.c
      mysys/test_xml.c
      mysys/testhash.c
      mysys/thr_alarm.c
      mysys/thr_lock.c
      mysys/thr_mutex.c
      mysys/thr_rwlock.c
      mysys/tree.c
      mysys/typelib.c
      plugin/audit_null/audit_null.c
      plugin/daemon_example/daemon_example.cc
      plugin/fulltext/plugin_example.c
      plugin/semisync/semisync.cc
      plugin/semisync/semisync.h
      plugin/semisync/semisync_master.cc
      plugin/semisync/semisync_master.h
      plugin/semisync/semisync_master_plugin.cc
      plugin/semisync/semisync_slave.cc
      plugin/semisync/semisync_slave.h
      plugin/semisync/semisync_slave_plugin.cc
      scripts/comp_sql.c
      sql-common/client.c
      sql-common/my_time.c
      sql-common/my_user.c
      sql-common/pack.c
      sql/authors.h
      sql/client_settings.h
      sql/contributors.h
      sql/custom_conf.h
      sql/debug_sync.cc
      sql/debug_sync.h
      sql/derror.cc
      sql/derror.h
      sql/des_key_file.cc
      sql/des_key_file.h
      sql/discover.cc
      sql/discover.h
      sql/event_data_objects.cc
      sql/event_data_objects.h
      sql/event_db_repository.cc
      sql/event_db_repository.h
      sql/event_parse_data.cc
      sql/event_parse_data.h
      sql/event_queue.cc
      sql/event_queue.h
      sql/event_scheduler.h
      sql/field_conv.cc
      sql/filesort.cc
      sql/filesort.h
      sql/frm_crypt.cc
      sql/frm_crypt.h
      sql/gen_lex_hash.cc
      sql/gstream.cc
      sql/gstream.h
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      sql/ha_ndbcluster_cond.cc
      sql/ha_ndbcluster_cond.h
      sql/ha_ndbcluster_tables.h
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/hash_filo.cc
      sql/hash_filo.h
      sql/hostname.cc
      sql/hostname.h
      sql/init.cc
      sql/init.h
      sql/item_buff.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_geofunc.cc
      sql/item_geofunc.h
      sql/item_row.cc
      sql/item_row.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/item_xmlfunc.cc
      sql/item_xmlfunc.h
      sql/key.cc
      sql/key.h
      sql/keycaches.cc
      sql/keycaches.h
      sql/lex.h
      sql/lex_symbol.h
      sql/lock.cc
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.h
      sql/main.cc
      sql/mdl.cc
      sql/mdl.h
      sql/mf_iocache.cc
      sql/my_decimal.cc
      sql/my_decimal.h
      sql/mysqld.h
      sql/mysqld_suffix.h
      sql/net_serv.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/parse_file.cc
      sql/parse_file.h
      sql/partition_element.h
      sql/partition_info.h
      sql/password.c
      sql/procedure.cc
      sql/procedure.h
      sql/protocol.h
      sql/records.cc
      sql/records.h
      sql/repl_failsafe.cc
      sql/repl_failsafe.h
      sql/replication.h
      sql/rpl_filter.cc
      sql/rpl_filter.h
      sql/rpl_handler.cc
      sql/rpl_handler.h
      sql/rpl_injector.cc
      sql/rpl_injector.h
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_record.cc
      sql/rpl_record.h
      sql/rpl_record_old.h
      sql/rpl_reporting.cc
      sql/rpl_reporting.h
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_tblmap.cc
      sql/rpl_tblmap.h
      sql/rpl_utility.cc
      sql/rpl_utility.h
      sql/scheduler.cc
      sql/scheduler.h
      sql/set_var.cc
      sql/set_var.h
      sql/sha2.cc
      sql/slave.cc
      sql/slave.h
      sql/sp.cc
      sql/sp.h
      sql/sp_cache.cc
      sql/sp_cache.h
      sql/sp_head.cc
      sql/sp_head.h
      sql/sp_pcontext.cc
      sql/sp_pcontext.h
      sql/sp_rcontext.cc
      sql/sp_rcontext.h
      sql/spatial.cc
      sql/spatial.h
      sql/sql_acl.cc
      sql/sql_acl.h
      sql/sql_analyse.cc
      sql/sql_analyse.h
      sql/sql_array.h
      sql/sql_audit.cc
      sql/sql_audit.h
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_binlog.cc
      sql/sql_binlog.h
      sql/sql_bitmap.h
      sql/sql_builtin.cc.in
      sql/sql_cache.cc
      sql/sql_cache.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_client.cc
      sql/sql_connect.cc
      sql/sql_connect.h
      sql/sql_const.h
      sql/sql_crypt.cc
      sql/sql_crypt.h
      sql/sql_cursor.cc
      sql/sql_cursor.h
      sql/sql_db.cc
      sql/sql_db.h
      sql/sql_delete.cc
      sql/sql_delete.h
      sql/sql_derived.cc
      sql/sql_derived.h
      sql/sql_do.cc
      sql/sql_do.h
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_handler.cc
      sql/sql_handler.h
      sql/sql_help.cc
      sql/sql_help.h
      sql/sql_insert.cc
      sql/sql_insert.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_list.cc
      sql/sql_list.h
      sql/sql_load.h
      sql/sql_locale.cc
      sql/sql_locale.h
      sql/sql_manager.cc
      sql/sql_manager.h
      sql/sql_parse.cc
      sql/sql_parse.h
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_plist.h
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_plugin_services.h
      sql/sql_prepare.cc
      sql/sql_prepare.h
      sql/sql_priv.h
      sql/sql_profile.h
      sql/sql_rename.cc
      sql/sql_rename.h
      sql/sql_repl.cc
      sql/sql_repl.h
      sql/sql_select.h
      sql/sql_servers.cc
      sql/sql_servers.h
      sql/sql_show.h
      sql/sql_signal.cc
      sql/sql_signal.h
      sql/sql_sort.h
      sql/sql_state.c
      sql/sql_string.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_tablespace.cc
      sql/sql_tablespace.h
      sql/sql_test.cc
      sql/sql_test.h
      sql/sql_time.cc
      sql/sql_time.h
      sql/sql_trigger.cc
      sql/sql_trigger.h
      sql/sql_udf.cc
      sql/sql_udf.h
      sql/sql_union.cc
      sql/sql_union.h
      sql/sql_update.cc
      sql/sql_update.h
      sql/sql_view.cc
      sql/sql_view.h
      sql/strfunc.cc
      sql/strfunc.h
      sql/structs.h
      sql/sys_vars.h
      sql/sys_vars_shared.h
      sql/table.cc
      sql/table.h
      sql/thr_malloc.cc
      sql/thr_malloc.h
      sql/transaction.cc
      sql/transaction.h
      sql/tzfile.h
      sql/tztime.cc
      sql/tztime.h
      sql/udf_example.c
      sql/uniques.cc
      sql/unireg.cc
      sql/unireg.h
      storage/archive/archive_test.c
      storage/archive/ha_archive.cc
      storage/archive/ha_archive.h
      storage/blackhole/ha_blackhole.cc
      storage/blackhole/ha_blackhole.h
      storage/csv/ha_tina.cc
      storage/csv/ha_tina.h
      storage/csv/transparent_file.cc
      storage/csv/transparent_file.h
      storage/example/ha_example.cc
      storage/federated/ha_federated.h
      storage/heap/_check.c
      storage/heap/_rectest.c
      storage/heap/ha_heap.cc
      storage/heap/ha_heap.h
      storage/heap/heapdef.h
      storage/heap/hp_block.c
      storage/heap/hp_clear.c
      storage/heap/hp_close.c
      storage/heap/hp_create.c
      storage/heap/hp_delete.c
      storage/heap/hp_extra.c
      storage/heap/hp_hash.c
      storage/heap/hp_info.c
      storage/heap/hp_open.c
      storage/heap/hp_panic.c
      storage/heap/hp_rename.c
      storage/heap/hp_rfirst.c
      storage/heap/hp_rkey.c
      storage/heap/hp_rlast.c
      storage/heap/hp_rnext.c
      storage/heap/hp_rprev.c
      storage/heap/hp_rrnd.c
      storage/heap/hp_rsame.c
      storage/heap/hp_scan.c
      storage/heap/hp_static.c
      storage/heap/hp_test1.c
      storage/heap/hp_test2.c
      storage/heap/hp_update.c
      storage/heap/hp_write.c
      storage/myisam/ft_boolean_search.c
      storage/myisam/ft_nlq_search.c
      storage/myisam/ft_parser.c
      storage/myisam/ft_static.c
      storage/myisam/ft_stopwords.c
      storage/myisam/ft_update.c
      storage/myisam/ftdefs.h
      storage/myisam/fulltext.h
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_cache.c
      storage/myisam/mi_changed.c
      storage/myisam/mi_check.c
      storage/myisam/mi_checksum.c
      storage/myisam/mi_close.c
      storage/myisam/mi_create.c
      storage/myisam/mi_dbug.c
      storage/myisam/mi_delete.c
      storage/myisam/mi_delete_all.c
      storage/myisam/mi_delete_table.c
      storage/myisam/mi_dynrec.c
      storage/myisam/mi_extra.c
      storage/myisam/mi_extrafunc.h
      storage/myisam/mi_info.c
      storage/myisam/mi_key.c
      storage/myisam/mi_keycache.c
      storage/myisam/mi_locking.c
      storage/myisam/mi_log.c
      storage/myisam/mi_open.c
      storage/myisam/mi_packrec.c
      storage/myisam/mi_page.c
      storage/myisam/mi_panic.c
      storage/myisam/mi_preload.c
      storage/myisam/mi_range.c
      storage/myisam/mi_rename.c
      storage/myisam/mi_rfirst.c
      storage/myisam/mi_rkey.c
      storage/myisam/mi_rlast.c
      storage/myisam/mi_rnext.c
      storage/myisam/mi_rnext_same.c
      storage/myisam/mi_rprev.c
      storage/myisam/mi_rrnd.c
      storage/myisam/mi_rsame.c
      storage/myisam/mi_rsamepos.c
      storage/myisam/mi_scan.c
      storage/myisam/mi_search.c
      storage/myisam/mi_static.c
      storage/myisam/mi_statrec.c
      storage/myisam/mi_test1.c
      storage/myisam/mi_test2.c
      storage/myisam/mi_test3.c
      storage/myisam/mi_unique.c
      storage/myisam/mi_update.c
      storage/myisam/mi_write.c
      storage/myisam/myisam_ftdump.c
      storage/myisam/myisamchk.c
      storage/myisam/myisamdef.h
      storage/myisam/myisamlog.c
      storage/myisam/myisampack.c
      storage/myisam/rt_index.c
      storage/myisam/rt_index.h
      storage/myisam/rt_key.c
      storage/myisam/rt_key.h
      storage/myisam/rt_mbr.c
      storage/myisam/rt_mbr.h
      storage/myisam/rt_split.c
      storage/myisam/rt_test.c
      storage/myisam/sort.c
      storage/myisam/sp_defs.h
      storage/myisam/sp_key.c
      storage/myisam/sp_test.c
      storage/myisammrg/ha_myisammrg.h
      storage/myisammrg/myrg_close.c
      storage/myisammrg/myrg_create.c
      storage/myisammrg/myrg_def.h
      storage/myisammrg/myrg_delete.c
      storage/myisammrg/myrg_extra.c
      storage/myisammrg/myrg_info.c
      storage/myisammrg/myrg_locking.c
      storage/myisammrg/myrg_open.c
      storage/myisammrg/myrg_panic.c
      storage/myisammrg/myrg_queue.c
      storage/myisammrg/myrg_range.c
      storage/myisammrg/myrg_records.c
      storage/myisammrg/myrg_rfirst.c
      storage/myisammrg/myrg_rkey.c
      storage/myisammrg/myrg_rlast.c
      storage/myisammrg/myrg_rnext.c
      storage/myisammrg/myrg_rnext_same.c
      storage/myisammrg/myrg_rprev.c
      storage/myisammrg/myrg_rrnd.c
      storage/myisammrg/myrg_rsame.c
      storage/myisammrg/myrg_static.c
      storage/myisammrg/myrg_update.c
      storage/myisammrg/myrg_write.c
      strings/bchange.c
      strings/bfill.c
      strings/bmove.c
      strings/bmove_upp.c
      strings/conf_to_src.c
      strings/ctype-big5.c
      strings/ctype-bin.c
      strings/ctype-cp932.c
      strings/ctype-czech.c
      strings/ctype-euc_kr.c
      strings/ctype-eucjpms.c
      strings/ctype-extra.c
      strings/ctype-gb2312.c
      strings/ctype-gbk.c
      strings/ctype-latin1.c
      strings/ctype-mb.c
      strings/ctype-simple.c
      strings/ctype-sjis.c
      strings/ctype-tis620.c
      strings/ctype-uca.c
      strings/ctype-ucs2.c
      strings/ctype-ujis.c
      strings/ctype-utf8.c
      strings/ctype-win1250ch.c
      strings/ctype.c
      strings/decimal.c
      strings/do_ctype.c
      strings/dtoa.c
      strings/dump_map.c
      strings/int2str.c
      strings/is_prefix.c
      strings/llstr.c
      strings/longlong2str.c
      strings/longlong2str_asm.c
      strings/my_strchr.c
      strings/my_strtoll10.c
      strings/my_vsnprintf.c
      strings/str2int.c
      strings/str_alloc.c
      strings/str_test.c
      strings/strappend.c
      strings/strcend.c
      strings/strcont.c
      strings/strend.c
      strings/strfill.c
      strings/strmake.c
      strings/strmov.c
      strings/strnlen.c
      strings/strnmov.c
      strings/strstr.c
      strings/strto.c
      strings/strtol.c
      strings/strtoll.c
      strings/strtoul.c
      strings/strtoull.c
      strings/strxmov.c
      strings/strxnmov.c
      strings/t_ctype.h
      strings/uca-dump.c
      strings/uctypedump.c
      strings/utr11-dump.c
      strings/xml.c
      tests/bug25714.c
      tests/connect_test.c
      tests/deadlock_test.c
      tests/insert_test.c
      tests/list_test.c
      tests/mysql_client_test.c
      tests/select_test.c
      tests/showdb_test.c
      tests/ssl_test.c
      tests/thread_test.c
      unittest/examples/core-t.c
      unittest/examples/simple-t.c
      unittest/examples/skip-t.c
      unittest/examples/skip_all-t.c
      unittest/examples/todo-t.c
      unittest/mysys/base64-t.c
      unittest/mysys/bitmap-t.c
      unittest/mysys/lf-t.c
      unittest/mysys/my_atomic-t.c
      unittest/mysys/my_rdtsc-t.c
      unittest/mysys/my_vsnprintf-t.c
      unittest/mysys/thr_template.c
      unittest/mytap/t/basic-t.c
      vio/test-ssl.c
      vio/test-sslclient.c
      vio/test-sslserver.c
      vio/vio.c
      vio/vio_priv.h
      vio/viosocket.c
      vio/viossl.c
      vio/viosslfactories.c
      vio/viotest-ssl.c
=== modified file 'client/client_priv.h'
--- a/client/client_priv.h	2010-07-15 11:13:30 +0000
+++ b/client/client_priv.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2006 MySQL AB, 2009 Sun Microsystems, Inc
+/* Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'client/completion_hash.cc'
--- a/client/completion_hash.cc	2010-07-08 21:20:08 +0000
+++ b/client/completion_hash.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'client/completion_hash.h'
--- a/client/completion_hash.h	2006-12-31 00:02:27 +0000
+++ b/client/completion_hash.h	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
 
-   This library is distributed in the hope that it will be useful,
+   This program 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
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef _HASH_
 #define _HASH_

=== modified file 'client/echo.c'
--- a/client/echo.c	2007-03-20 17:31:49 +0000
+++ b/client/echo.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'client/get_password.c'
--- a/client/get_password.c	2008-02-19 17:45:11 +0000
+++ b/client/get_password.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'client/my_readline.h'
--- a/client/my_readline.h	2009-09-23 21:32:31 +0000
+++ b/client/my_readline.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef CLIENT_MY_READLINE_INCLUDED
 #define CLIENT_MY_READLINE_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'client/readline.cc'
--- a/client/readline.cc	2010-07-08 21:20:08 +0000
+++ b/client/readline.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'client/sql_string.cc'
--- a/client/sql_string.cc	2010-08-25 15:57:53 +0000
+++ b/client/sql_string.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'client/sql_string.h'
--- a/client/sql_string.h	2010-07-08 21:20:08 +0000
+++ b/client/sql_string.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef CLIENT_SQL_STRING_INCLUDED
 #define CLIENT_SQL_STRING_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'cmake/stack_direction.c'
--- a/cmake/stack_direction.c	2009-11-09 11:32:48 +0000
+++ b/cmake/stack_direction.c	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2009 Sun Microsystems, Inc
- 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+/* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
 
- This program 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.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
 
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* Check stack direction (0-down, 1-up) */
 int f(int *a) 

=== modified file 'extra/charset2html.c'
--- a/extra/charset2html.c	2008-03-29 14:15:06 +0000
+++ b/extra/charset2html.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,8 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
- */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   Written by Alexander Barkov to check what 

=== modified file 'extra/comp_err.c'
--- a/extra/comp_err.c	2010-07-20 19:30:10 +0000
+++ b/extra/comp_err.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/innochecksum.c'
--- a/extra/innochecksum.c	2009-05-05 18:07:26 +0000
+++ b/extra/innochecksum.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB & Innobase Oy
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   InnoDB offline file checksum utility.  85% of the code in this file

=== modified file 'extra/my_print_defaults.c'
--- a/extra/my_print_defaults.c	2010-07-15 11:13:30 +0000
+++ b/extra/my_print_defaults.c	2010-10-01 19:42:12 +0000
@@ -1,5 +1,5 @@
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/mysql_waitpid.c'
--- a/extra/mysql_waitpid.c	2010-07-15 11:13:30 +0000
+++ b/extra/mysql_waitpid.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/perror.c'
--- a/extra/perror.c	2010-07-15 11:13:30 +0000
+++ b/extra/perror.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/replace.c'
--- a/extra/replace.c	2010-07-23 20:16:29 +0000
+++ b/extra/replace.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/resolve_stack_dump.c'
--- a/extra/resolve_stack_dump.c	2010-07-23 20:15:07 +0000
+++ b/extra/resolve_stack_dump.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'extra/resolveip.c'
--- a/extra/resolveip.c	2010-07-15 11:13:30 +0000
+++ b/extra/resolveip.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/atomic/gcc_builtins.h'
--- a/include/atomic/gcc_builtins.h	2010-07-23 12:37:10 +0000
+++ b/include/atomic/gcc_builtins.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef ATOMIC_GCC_BUILTINS_INCLUDED
 #define ATOMIC_GCC_BUILTINS_INCLUDED
 
-/* Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/atomic/generic-msvc.h'
--- a/include/atomic/generic-msvc.h	2009-12-15 23:33:15 +0000
+++ b/include/atomic/generic-msvc.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/atomic/nolock.h'
--- a/include/atomic/nolock.h	2010-07-23 12:37:10 +0000
+++ b/include/atomic/nolock.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef ATOMIC_NOLOCK_INCLUDED
 #define ATOMIC_NOLOCK_INCLUDED
 
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/atomic/rwlock.h'
--- a/include/atomic/rwlock.h	2009-11-27 17:11:05 +0000
+++ b/include/atomic/rwlock.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef ATOMIC_RWLOCK_INCLUDED
 #define ATOMIC_RWLOCK_INCLUDED
 
-/* Copyright (C) 2006 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/atomic/solaris.h'
--- a/include/atomic/solaris.h	2010-07-27 13:25:11 +0000
+++ b/include/atomic/solaris.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc
+/* Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/atomic/x86-gcc.h'
--- a/include/atomic/x86-gcc.h	2010-09-17 20:34:15 +0000
+++ b/include/atomic/x86-gcc.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef ATOMIC_X86_GCC_INCLUDED
 #define ATOMIC_X86_GCC_INCLUDED
 
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/base64.h'
--- a/include/base64.h	2006-12-23 19:20:40 +0000
+++ b/include/base64.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/decimal.h'
--- a/include/decimal.h	2007-05-24 10:24:36 +0000
+++ b/include/decimal.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/errmsg.h'
--- a/include/errmsg.h	2009-10-28 07:55:44 +0000
+++ b/include/errmsg.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef ERRMSG_INCLUDED
 #define ERRMSG_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/ft_global.h'
--- a/include/ft_global.h	2009-12-22 09:35:56 +0000
+++ b/include/ft_global.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/hash.h'
--- a/include/hash.h	2010-07-08 21:20:08 +0000
+++ b/include/hash.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/heap.h'
--- a/include/heap.h	2010-06-11 15:28:18 +0000
+++ b/include/heap.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB, 2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/keycache.h'
--- a/include/keycache.h	2010-03-31 14:05:33 +0000
+++ b/include/keycache.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB, 2009 Sun Microsystems, Inc
+/* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/lf.h'
--- a/include/lf.h	2010-07-23 20:13:36 +0000
+++ b/include/lf.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/m_ctype.h'
--- a/include/m_ctype.h	2010-09-28 15:15:58 +0000
+++ b/include/m_ctype.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/m_string.h'
--- a/include/m_string.h	2010-07-23 20:17:55 +0000
+++ b/include/m_string.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_aes.h'
--- a/include/my_aes.h	2009-09-23 21:32:31 +0000
+++ b/include/my_aes.h	2010-10-01 19:42:12 +0000
@@ -1,20 +1,20 @@
 #ifndef MY_AES_INCLUDED
 #define MY_AES_INCLUDED
 
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 /* Header file for my_aes.c */

=== modified file 'include/my_alarm.h'
--- a/include/my_alarm.h	2010-07-01 08:06:41 +0000
+++ b/include/my_alarm.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_alloc.h'
--- a/include/my_alloc.h	2010-06-05 19:39:03 +0000
+++ b/include/my_alloc.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_atomic.h'
--- a/include/my_atomic.h	2010-07-23 20:18:36 +0000
+++ b/include/my_atomic.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef MY_ATOMIC_INCLUDED
 #define MY_ATOMIC_INCLUDED
 
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_attribute.h'
--- a/include/my_attribute.h	2010-07-23 20:16:29 +0000
+++ b/include/my_attribute.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_base.h'
--- a/include/my_base.h	2010-05-31 15:29:54 +0000
+++ b/include/my_base.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_bitmap.h'
--- a/include/my_bitmap.h	2010-07-23 20:09:27 +0000
+++ b/include/my_bitmap.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_dbug.h'
--- a/include/my_dbug.h	2010-07-15 11:16:06 +0000
+++ b/include/my_dbug.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_dir.h'
--- a/include/my_dir.h	2010-04-06 12:11:07 +0000
+++ b/include/my_dir.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_getopt.h'
--- a/include/my_getopt.h	2010-06-11 01:30:49 +0000
+++ b/include/my_getopt.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2004 MySQL AB
+/* Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_global.h'
--- a/include/my_global.h	2010-07-23 20:18:36 +0000
+++ b/include/my_global.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_handler.h'
--- a/include/my_handler.h	2010-03-31 14:05:33 +0000
+++ b/include/my_handler.h	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002-2006 MySQL AB
+/* Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
 
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
 
-   This library is distributed in the hope that it will be useful,
+   This program 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
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef _my_handler_h
 #define _my_handler_h

=== modified file 'include/my_libwrap.h'
--- a/include/my_libwrap.h	2009-09-23 21:32:31 +0000
+++ b/include/my_libwrap.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef MY_LIBWRAP_INCLUDED
 #define MY_LIBWRAP_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_list.h'
--- a/include/my_list.h	2010-07-08 21:20:08 +0000
+++ b/include/my_list.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_md5.h'
--- a/include/my_md5.h	2009-09-23 21:32:31 +0000
+++ b/include/my_md5.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef MY_MD5_INCLUDED
 #define MY_MD5_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_net.h'
--- a/include/my_net.h	2010-07-23 20:14:35 +0000
+++ b/include/my_net.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_no_pthread.h'
--- a/include/my_no_pthread.h	2009-12-16 18:02:21 +0000
+++ b/include/my_no_pthread.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef MY_NO_PTHREAD_INCLUDED
 #define MY_NO_PTHREAD_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_nosys.h'
--- a/include/my_nosys.h	2010-07-23 20:15:07 +0000
+++ b/include/my_nosys.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_pthread.h'
--- a/include/my_pthread.h	2010-08-10 21:12:01 +0000
+++ b/include/my_pthread.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_rdtsc.h'
--- a/include/my_rdtsc.h	2009-11-24 23:36:31 +0000
+++ b/include/my_rdtsc.h	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2008, 2009 Sun Microsystems, Inc
+/* Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   rdtsc3 -- multi-platform timer code

=== modified file 'include/my_stacktrace.h'
--- a/include/my_stacktrace.h	2010-07-15 11:13:30 +0000
+++ b/include/my_stacktrace.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_sys.h'
--- a/include/my_sys.h	2010-07-23 20:15:07 +0000
+++ b/include/my_sys.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_time.h'
--- a/include/my_time.h	2010-07-15 11:28:41 +0000
+++ b/include/my_time.h	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2004-2005 MySQL AB
+/* Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   This is a private header of sql-common library, containing

=== modified file 'include/my_tree.h'
--- a/include/my_tree.h	2010-03-31 14:05:33 +0000
+++ b/include/my_tree.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/my_uctype.h'
--- a/include/my_uctype.h	2009-09-23 21:32:31 +0000
+++ b/include/my_uctype.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef MY_UCTYPE_INCLUDED
 #define MY_UCTYPE_INCLUDED
 
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   Unicode ctype data

=== modified file 'include/my_user.h'
--- a/include/my_user.h	2007-05-10 09:59:39 +0000
+++ b/include/my_user.h	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   This is a header for libraries containing functions used in both server and

=== modified file 'include/my_xml.h'
--- a/include/my_xml.h	2007-05-10 09:59:39 +0000
+++ b/include/my_xml.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 #ifndef _my_xml_h

=== modified file 'include/myisam.h'
--- a/include/myisam.h	2010-08-05 12:34:19 +0000
+++ b/include/myisam.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/myisammrg.h'
--- a/include/myisammrg.h	2009-12-05 01:26:15 +0000
+++ b/include/myisammrg.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/myisampack.h'
--- a/include/myisampack.h	2009-09-23 21:32:31 +0000
+++ b/include/myisampack.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef MYISAMPACK_INCLUDED
 #define MYISAMPACK_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/mysql.h'
--- a/include/mysql.h	2010-09-07 07:49:47 +0000
+++ b/include/mysql.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/mysql/plugin.h'
--- a/include/mysql/plugin.h	2010-08-30 14:07:40 +0000
+++ b/include/mysql/plugin.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/mysql/plugin_audit.h'
--- a/include/mysql/plugin_audit.h	2010-04-15 09:05:17 +0000
+++ b/include/mysql/plugin_audit.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/mysql/plugin_ftparser.h'
--- a/include/mysql/plugin_ftparser.h	2009-12-15 19:52:47 +0000
+++ b/include/mysql/plugin_ftparser.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/mysql/service_my_snprintf.h'
--- a/include/mysql/service_my_snprintf.h	2010-09-15 11:33:22 +0000
+++ b/include/mysql/service_my_snprintf.h	2010-10-01 19:42:12 +0000
@@ -1,5 +1,5 @@
 #ifndef MYSQL_SERVICE_MY_SNPRINTF_INCLUDED
-/* Copyright (C) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/mysql/service_thd_alloc.h'
--- a/include/mysql/service_thd_alloc.h	2010-07-20 19:34:20 +0000
+++ b/include/mysql/service_thd_alloc.h	2010-10-01 19:42:12 +0000
@@ -1,5 +1,5 @@
 #ifndef MYSQL_SERVICE_THD_ALLOC_INCLUDED
-/* Copyright (C) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/mysql/services.h'
--- a/include/mysql/services.h	2010-06-07 14:01:39 +0000
+++ b/include/mysql/services.h	2010-10-01 19:42:12 +0000
@@ -1,5 +1,5 @@
 #ifndef MYSQL_SERVICES_INCLUDED
-/* Copyright (C) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/mysql_com.h'
--- a/include/mysql_com.h	2010-08-05 12:53:09 +0000
+++ b/include/mysql_com.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/mysql_embed.h'
--- a/include/mysql_embed.h	2010-07-23 20:15:07 +0000
+++ b/include/mysql_embed.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef MYSQL_EMBED_INCLUDED
 #define MYSQL_EMBED_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/mysql_time.h'
--- a/include/mysql_time.h	2006-12-31 00:02:27 +0000
+++ b/include/mysql_time.h	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef _mysql_time_h_
 #define _mysql_time_h_

=== modified file 'include/mysql_version.h.in'
--- a/include/mysql_version.h.in	2007-09-13 14:19:46 +0000
+++ b/include/mysql_version.h.in	2010-10-01 19:42:12 +0000
@@ -1,5 +1,17 @@
-/* Copyright Abandoned 1996, 1999, 2001 MySQL AB
-   This file is public domain and comes with NO WARRANTY of any kind */
+/* Copyright (c) 1996, 2001, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* Version numbers for protocol & mysqld */
 

=== modified file 'include/mysys_err.h'
--- a/include/mysys_err.h	2010-07-20 19:30:10 +0000
+++ b/include/mysys_err.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/password.h'
--- a/include/password.h	2010-03-31 14:05:33 +0000
+++ b/include/password.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef PASSWORD_INCLUDED
 #define PASSWORD_INCLUDED

=== modified file 'include/queues.h'
--- a/include/queues.h	2010-03-31 14:05:33 +0000
+++ b/include/queues.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/rijndael.h'
--- a/include/rijndael.h	2009-09-23 21:32:31 +0000
+++ b/include/rijndael.h	2010-10-01 19:42:12 +0000
@@ -1,20 +1,20 @@
 #ifndef RIJNDAEL_INCLUDED
 #define RIJNDAEL_INCLUDED
 
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 /*

=== modified file 'include/service_versions.h'
--- a/include/service_versions.h	2010-06-07 14:01:39 +0000
+++ b/include/service_versions.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/sha1.h'
--- a/include/sha1.h	2009-09-23 21:32:31 +0000
+++ b/include/sha1.h	2010-10-01 19:42:12 +0000
@@ -1,20 +1,20 @@
 #ifndef SHA1_INCLUDED
 #define SHA1_INCLUDED
 
-/* Copyright (C) 2002, 2006 MySQL AB
+/* Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
  This is the header file for code which implements the Secure

=== modified file 'include/sha2.h'
--- a/include/sha2.h	2010-04-13 16:10:51 +0000
+++ b/include/sha2.h	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef included_sha2_h
 #define included_sha2_h

=== modified file 'include/sql_common.h'
--- a/include/sql_common.h	2009-09-23 21:32:31 +0000
+++ b/include/sql_common.h	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
 #ifndef SQL_COMMON_INCLUDED
 #define SQL_COMMON_INCLUDED
 
-/* Copyright (C) 2003-2004, 2006 MySQL AB
-   
+/* Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'include/sslopt-case.h'
--- a/include/sslopt-case.h	2010-04-13 15:04:45 +0000
+++ b/include/sslopt-case.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SSLOPT_CASE_INCLUDED
 #define SSLOPT_CASE_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/sslopt-longopts.h'
--- a/include/sslopt-longopts.h	2010-06-11 01:30:49 +0000
+++ b/include/sslopt-longopts.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SSLOPT_LONGOPTS_INCLUDED
 #define SSLOPT_LONGOPTS_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/sslopt-vars.h'
--- a/include/sslopt-vars.h	2010-04-13 15:04:45 +0000
+++ b/include/sslopt-vars.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SSLOPT_VARS_INCLUDED
 #define SSLOPT_VARS_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/t_ctype.h'
--- a/include/t_ctype.h	2006-12-23 19:17:15 +0000
+++ b/include/t_ctype.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/thr_alarm.h'
--- a/include/thr_alarm.h	2009-11-09 11:32:48 +0000
+++ b/include/thr_alarm.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/thr_lock.h'
--- a/include/thr_lock.h	2010-08-16 12:50:27 +0000
+++ b/include/thr_lock.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/typelib.h'
--- a/include/typelib.h	2010-07-05 16:20:46 +0000
+++ b/include/typelib.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'include/violite.h'
--- a/include/violite.h	2010-06-07 14:01:39 +0000
+++ b/include/violite.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'libmysql/client_settings.h'
--- a/libmysql/client_settings.h	2010-01-12 16:48:28 +0000
+++ b/libmysql/client_settings.h	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2003-2005 MySQL AB
-   
+/* Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'libmysql/conf_to_src.c'
--- a/libmysql/conf_to_src.c	2004-08-18 17:57:55 +0000
+++ b/libmysql/conf_to_src.c	2010-10-01 19:42:12 +0000
@@ -1,12 +1,8 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation.
-
-   There are special exceptions to the terms and conditions of the GPL as it
-   is applied to this software. View the full text of the exception in file
-   EXCEPTIONS-CLIENT in the directory of this software distribution.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

=== modified file 'libmysql/errmsg.c'
--- a/libmysql/errmsg.c	2010-07-23 20:16:29 +0000
+++ b/libmysql/errmsg.c	2010-10-01 19:42:12 +0000
@@ -1,12 +1,8 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation.
-
-   There are special exceptions to the terms and conditions of the GPL as it
-   is applied to this software. View the full text of the exception in file
-   EXCEPTIONS-CLIENT in the directory of this software distribution.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

=== modified file 'libmysql/get_password.c'
--- a/libmysql/get_password.c	2010-07-15 11:13:30 +0000
+++ b/libmysql/get_password.c	2010-10-01 19:42:12 +0000
@@ -1,12 +1,8 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation.
-
-   There are special exceptions to the terms and conditions of the GPL as it
-   is applied to this software. View the full text of the exception in file
-   EXCEPTIONS-CLIENT in the directory of this software distribution.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c	2010-09-09 12:36:57 +0000
+++ b/libmysql/libmysql.c	2010-10-01 19:42:12 +0000
@@ -1,12 +1,8 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation.
-
-   There are special exceptions to the terms and conditions of the GPL as it
-   is applied to this software. View the full text of the exception in file
-   EXCEPTIONS-CLIENT in the directory of this software distribution.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

=== modified file 'libmysqld/emb_qcache.cc'
--- a/libmysqld/emb_qcache.cc	2010-03-31 14:05:33 +0000
+++ b/libmysqld/emb_qcache.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'libmysqld/emb_qcache.h'
--- a/libmysqld/emb_qcache.h	2010-03-31 14:05:33 +0000
+++ b/libmysqld/emb_qcache.h	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2003, 2005 MySQL AB
-   
+/* Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'libmysqld/embedded_priv.h'
--- a/libmysqld/embedded_priv.h	2006-12-31 00:32:21 +0000
+++ b/libmysqld/embedded_priv.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2004, 2006 MySQL AB
+/* Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'libmysqld/libmysqld.c'
--- a/libmysqld/libmysqld.c	2010-07-15 11:16:06 +0000
+++ b/libmysqld/libmysqld.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'libservices/my_snprintf_service.c'
--- a/libservices/my_snprintf_service.c	2009-11-02 20:05:42 +0000
+++ b/libservices/my_snprintf_service.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'libservices/thd_alloc_service.c'
--- a/libservices/thd_alloc_service.c	2009-11-02 20:05:42 +0000
+++ b/libservices/thd_alloc_service.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysql-test/lib/My/SafeProcess/safe_kill_win.cc'
--- a/mysql-test/lib/My/SafeProcess/safe_kill_win.cc	2010-07-03 23:17:03 +0000
+++ b/mysql-test/lib/My/SafeProcess/safe_kill_win.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysql-test/lib/My/SafeProcess/safe_process.cc'
--- a/mysql-test/lib/My/SafeProcess/safe_process.cc	2010-07-02 18:30:47 +0000
+++ b/mysql-test/lib/My/SafeProcess/safe_process.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysql-test/lib/My/SafeProcess/safe_process_win.cc'
--- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc	2010-07-03 23:17:03 +0000
+++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/array.c'
--- a/mysys/array.c	2010-07-08 21:20:08 +0000
+++ b/mysys/array.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/base64.c'
--- a/mysys/base64.c	2009-03-20 14:27:53 +0000
+++ b/mysys/base64.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/charset-def.c'
--- a/mysys/charset-def.c	2010-02-24 09:15:34 +0000
+++ b/mysys/charset-def.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/charset.c'
--- a/mysys/charset.c	2010-07-08 21:20:08 +0000
+++ b/mysys/charset.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/checksum.c'
--- a/mysys/checksum.c	2010-07-23 20:09:27 +0000
+++ b/mysys/checksum.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/default.c'
--- a/mysys/default.c	2010-07-23 20:17:55 +0000
+++ b/mysys/default.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/errors.c'
--- a/mysys/errors.c	2010-07-20 19:30:10 +0000
+++ b/mysys/errors.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/hash.c'
--- a/mysys/hash.c	2010-07-08 21:20:08 +0000
+++ b/mysys/hash.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/lf_alloc-pin.c'
--- a/mysys/lf_alloc-pin.c	2010-07-23 20:13:36 +0000
+++ b/mysys/lf_alloc-pin.c	2010-10-01 19:42:12 +0000
@@ -1,5 +1,5 @@
 /* QQ: TODO multi-pinbox */
-/* Copyright (C) 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/lf_dynarray.c'
--- a/mysys/lf_dynarray.c	2010-07-08 21:20:08 +0000
+++ b/mysys/lf_dynarray.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/lf_hash.c'
--- a/mysys/lf_hash.c	2010-07-23 20:13:36 +0000
+++ b/mysys/lf_hash.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/list.c'
--- a/mysys/list.c	2010-07-08 21:20:08 +0000
+++ b/mysys/list.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/md5.c'
--- a/mysys/md5.c	2009-03-09 18:57:03 +0000
+++ b/mysys/md5.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_arr_appstr.c'
--- a/mysys/mf_arr_appstr.c	2007-11-07 22:23:50 +0000
+++ b/mysys/mf_arr_appstr.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_brkhant.c'
--- a/mysys/mf_brkhant.c	2006-12-23 19:17:15 +0000
+++ b/mysys/mf_brkhant.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_cache.c'
--- a/mysys/mf_cache.c	2010-07-08 21:20:08 +0000
+++ b/mysys/mf_cache.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_dirname.c'
--- a/mysys/mf_dirname.c	2010-07-15 11:26:38 +0000
+++ b/mysys/mf_dirname.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_fn_ext.c'
--- a/mysys/mf_fn_ext.c	2010-07-15 11:26:38 +0000
+++ b/mysys/mf_fn_ext.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_format.c'
--- a/mysys/mf_format.c	2009-04-19 01:21:33 +0000
+++ b/mysys/mf_format.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_getdate.c'
--- a/mysys/mf_getdate.c	2009-05-13 15:48:00 +0000
+++ b/mysys/mf_getdate.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_iocache.c'
--- a/mysys/mf_iocache.c	2010-07-29 12:32:11 +0000
+++ b/mysys/mf_iocache.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_iocache2.c'
--- a/mysys/mf_iocache2.c	2010-07-23 20:16:29 +0000
+++ b/mysys/mf_iocache2.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_keycache.c'
--- a/mysys/mf_keycache.c	2010-07-23 20:15:41 +0000
+++ b/mysys/mf_keycache.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_keycaches.c'
--- a/mysys/mf_keycaches.c	2010-07-08 21:20:08 +0000
+++ b/mysys/mf_keycaches.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_loadpath.c'
--- a/mysys/mf_loadpath.c	2010-07-02 19:38:04 +0000
+++ b/mysys/mf_loadpath.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_pack.c'
--- a/mysys/mf_pack.c	2010-07-15 13:47:50 +0000
+++ b/mysys/mf_pack.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_path.c'
--- a/mysys/mf_path.c	2010-07-15 11:13:30 +0000
+++ b/mysys/mf_path.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_qsort.c'
--- a/mysys/mf_qsort.c	2007-10-17 16:08:58 +0000
+++ b/mysys/mf_qsort.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_qsort2.c'
--- a/mysys/mf_qsort2.c	2006-12-23 19:17:15 +0000
+++ b/mysys/mf_qsort2.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_radix.c'
--- a/mysys/mf_radix.c	2007-05-10 09:59:39 +0000
+++ b/mysys/mf_radix.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_same.c'
--- a/mysys/mf_same.c	2007-05-10 09:59:39 +0000
+++ b/mysys/mf_same.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_sort.c'
--- a/mysys/mf_sort.c	2010-07-08 21:20:08 +0000
+++ b/mysys/mf_sort.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_soundex.c'
--- a/mysys/mf_soundex.c	2007-05-10 09:59:39 +0000
+++ b/mysys/mf_soundex.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_tempdir.c'
--- a/mysys/mf_tempdir.c	2010-07-15 11:13:30 +0000
+++ b/mysys/mf_tempdir.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_tempfile.c'
--- a/mysys/mf_tempfile.c	2010-07-15 11:17:56 +0000
+++ b/mysys/mf_tempfile.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_unixpath.c'
--- a/mysys/mf_unixpath.c	2010-07-15 11:16:06 +0000
+++ b/mysys/mf_unixpath.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mf_wcomp.c'
--- a/mysys/mf_wcomp.c	2006-12-23 19:17:15 +0000
+++ b/mysys/mf_wcomp.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mulalloc.c'
--- a/mysys/mulalloc.c	2007-05-10 09:59:39 +0000
+++ b/mysys/mulalloc.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_access.c'
--- a/mysys/my_access.c	2006-12-23 19:20:40 +0000
+++ b/mysys/my_access.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_aes.c'
--- a/mysys/my_aes.c	2006-12-31 00:02:27 +0000
+++ b/mysys/my_aes.c	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 /*

=== modified file 'mysys/my_alarm.c'
--- a/mysys/my_alarm.c	2006-12-23 19:17:15 +0000
+++ b/mysys/my_alarm.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_alloc.c'
--- a/mysys/my_alloc.c	2010-07-08 21:20:08 +0000
+++ b/mysys/my_alloc.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_atomic.c'
--- a/mysys/my_atomic.c	2010-07-23 20:18:36 +0000
+++ b/mysys/my_atomic.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_bit.c'
--- a/mysys/my_bit.c	2010-07-23 20:18:36 +0000
+++ b/mysys/my_bit.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_bitmap.c'
--- a/mysys/my_bitmap.c	2010-07-23 20:09:27 +0000
+++ b/mysys/my_bitmap.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_chsize.c'
--- a/mysys/my_chsize.c	2009-09-11 20:26:35 +0000
+++ b/mysys/my_chsize.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_compress.c'
--- a/mysys/my_compress.c	2010-07-08 21:20:08 +0000
+++ b/mysys/my_compress.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_conio.c'
--- a/mysys/my_conio.c	2009-02-13 16:41:47 +0000
+++ b/mysys/my_conio.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_copy.c'
--- a/mysys/my_copy.c	2010-07-20 19:30:10 +0000
+++ b/mysys/my_copy.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_crc32.c'
--- a/mysys/my_crc32.c	2006-12-23 19:17:15 +0000
+++ b/mysys/my_crc32.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_create.c'
--- a/mysys/my_create.c	2009-11-09 11:32:48 +0000
+++ b/mysys/my_create.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_delete.c'
--- a/mysys/my_delete.c	2010-06-25 15:32:59 +0000
+++ b/mysys/my_delete.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_div.c'
--- a/mysys/my_div.c	2007-05-10 09:59:39 +0000
+++ b/mysys/my_div.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_error.c'
--- a/mysys/my_error.c	2010-07-08 21:20:08 +0000
+++ b/mysys/my_error.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_file.c'
--- a/mysys/my_file.c	2010-07-08 21:20:08 +0000
+++ b/mysys/my_file.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_fopen.c'
--- a/mysys/my_fopen.c	2010-07-08 21:20:08 +0000
+++ b/mysys/my_fopen.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_fstream.c'
--- a/mysys/my_fstream.c	2009-11-24 13:54:59 +0000
+++ b/mysys/my_fstream.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_gethostbyname.c'
--- a/mysys/my_gethostbyname.c	2009-12-10 03:19:51 +0000
+++ b/mysys/my_gethostbyname.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002, 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* Thread safe version of gethostbyname_r() */
 

=== modified file 'mysys/my_gethwaddr.c'
--- a/mysys/my_gethwaddr.c	2010-09-09 12:51:50 +0000
+++ b/mysys/my_gethwaddr.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_getncpus.c'
--- a/mysys/my_getncpus.c	2009-11-18 00:11:32 +0000
+++ b/mysys/my_getncpus.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c	2010-09-28 15:15:58 +0000
+++ b/mysys/my_getopt.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_getpagesize.c'
--- a/mysys/my_getpagesize.c	2006-12-23 19:17:15 +0000
+++ b/mysys/my_getpagesize.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_getsystime.c'
--- a/mysys/my_getsystime.c	2010-07-15 11:13:30 +0000
+++ b/mysys/my_getsystime.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_getwd.c'
--- a/mysys/my_getwd.c	2010-07-15 11:26:38 +0000
+++ b/mysys/my_getwd.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_handler.c'
--- a/mysys/my_handler.c	2010-07-23 20:16:29 +0000
+++ b/mysys/my_handler.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002-2006 MySQL AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_global.h>
 #include <m_ctype.h>

=== modified file 'mysys/my_init.c'
--- a/mysys/my_init.c	2010-08-16 12:50:27 +0000
+++ b/mysys/my_init.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_largepage.c'
--- a/mysys/my_largepage.c	2010-07-08 21:20:08 +0000
+++ b/mysys/my_largepage.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_lib.c'
--- a/mysys/my_lib.c	2010-07-15 11:26:38 +0000
+++ b/mysys/my_lib.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_libwrap.c'
--- a/mysys/my_libwrap.c	2006-12-23 19:17:15 +0000
+++ b/mysys/my_libwrap.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_lock.c'
--- a/mysys/my_lock.c	2010-07-15 11:26:38 +0000
+++ b/mysys/my_lock.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_lockmem.c'
--- a/mysys/my_lockmem.c	2010-07-08 21:20:08 +0000
+++ b/mysys/my_lockmem.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_memmem.c'
--- a/mysys/my_memmem.c	2007-05-10 09:59:39 +0000
+++ b/mysys/my_memmem.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_mess.c'
--- a/mysys/my_mess.c	2010-07-15 11:13:30 +0000
+++ b/mysys/my_mess.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_mkdir.c'
--- a/mysys/my_mkdir.c	2006-12-23 19:20:40 +0000
+++ b/mysys/my_mkdir.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_mmap.c'
--- a/mysys/my_mmap.c	2010-06-25 15:32:59 +0000
+++ b/mysys/my_mmap.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_new.cc'
--- a/mysys/my_new.cc	2009-03-19 20:20:15 +0000
+++ b/mysys/my_new.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_once.c'
--- a/mysys/my_once.c	2010-07-08 21:20:08 +0000
+++ b/mysys/my_once.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_open.c'
--- a/mysys/my_open.c	2010-07-08 21:20:08 +0000
+++ b/mysys/my_open.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_port.c'
--- a/mysys/my_port.c	2006-12-31 00:02:27 +0000
+++ b/mysys/my_port.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002 MySQL AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* 
    Small functions to make code portable

=== modified file 'mysys/my_pread.c'
--- a/mysys/my_pread.c	2009-12-10 03:19:51 +0000
+++ b/mysys/my_pread.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_pthread.c'
--- a/mysys/my_pthread.c	2010-07-23 20:17:55 +0000
+++ b/mysys/my_pthread.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_quick.c'
--- a/mysys/my_quick.c	2009-09-11 20:26:35 +0000
+++ b/mysys/my_quick.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_rdtsc.c'
--- a/mysys/my_rdtsc.c	2010-07-15 11:13:30 +0000
+++ b/mysys/my_rdtsc.c	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2008-2010 Sun Microsystems, Inc
+/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   rdtsc3 -- multi-platform timer code

=== modified file 'mysys/my_read.c'
--- a/mysys/my_read.c	2009-09-11 20:26:35 +0000
+++ b/mysys/my_read.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_redel.c'
--- a/mysys/my_redel.c	2010-07-20 19:30:10 +0000
+++ b/mysys/my_redel.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_rename.c'
--- a/mysys/my_rename.c	2010-07-15 11:13:30 +0000
+++ b/mysys/my_rename.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_seek.c'
--- a/mysys/my_seek.c	2009-09-11 20:26:35 +0000
+++ b/mysys/my_seek.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_sleep.c'
--- a/mysys/my_sleep.c	2010-07-15 11:13:30 +0000
+++ b/mysys/my_sleep.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_static.c'
--- a/mysys/my_static.c	2010-07-23 20:14:35 +0000
+++ b/mysys/my_static.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_static.h'
--- a/mysys/my_static.h	2010-07-23 20:14:35 +0000
+++ b/mysys/my_static.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef MYSYS_MY_STATIC_INCLUDED
 #define MYSYS_MY_STATIC_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_symlink.c'
--- a/mysys/my_symlink.c	2009-10-27 13:20:34 +0000
+++ b/mysys/my_symlink.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_symlink2.c'
--- a/mysys/my_symlink2.c	2009-05-15 12:57:51 +0000
+++ b/mysys/my_symlink2.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_sync.c'
--- a/mysys/my_sync.c	2010-09-09 13:55:37 +0000
+++ b/mysys/my_sync.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_thr_init.c'
--- a/mysys/my_thr_init.c	2010-08-23 01:41:42 +0000
+++ b/mysys/my_thr_init.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_wincond.c'
--- a/mysys/my_wincond.c	2009-11-23 17:08:37 +0000
+++ b/mysys/my_wincond.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_windac.c'
--- a/mysys/my_windac.c	2010-07-08 21:20:08 +0000
+++ b/mysys/my_windac.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_winerr.c'
--- a/mysys/my_winerr.c	2009-09-11 20:26:35 +0000
+++ b/mysys/my_winerr.c	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program 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.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   Convert Windows API error (GetLastError() to Posix equivalent (errno)

=== modified file 'mysys/my_winfile.c'
--- a/mysys/my_winfile.c	2009-12-10 03:19:51 +0000
+++ b/mysys/my_winfile.c	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2008 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program 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.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   The purpose of this file is to provide implementation of file IO routines on 

=== modified file 'mysys/my_winthread.c'
--- a/mysys/my_winthread.c	2009-12-19 13:11:48 +0000
+++ b/mysys/my_winthread.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/my_write.c'
--- a/mysys/my_write.c	2009-09-11 20:26:35 +0000
+++ b/mysys/my_write.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/mysys_priv.h'
--- a/mysys/mysys_priv.h	2010-01-11 16:46:16 +0000
+++ b/mysys/mysys_priv.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/ptr_cmp.c'
--- a/mysys/ptr_cmp.c	2009-11-20 19:01:43 +0000
+++ b/mysys/ptr_cmp.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/queues.c'
--- a/mysys/queues.c	2010-07-08 21:20:08 +0000
+++ b/mysys/queues.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/rijndael.c'
--- a/mysys/rijndael.c	2010-07-23 20:09:27 +0000
+++ b/mysys/rijndael.c	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2002, 2004 MySQL AB
+/* Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 /*

=== modified file 'mysys/sha1.c'
--- a/mysys/sha1.c	2007-01-22 12:10:46 +0000
+++ b/mysys/sha1.c	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2002, 2004, 2006 MySQL AB
+/* Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   Original Source from: http://www.faqs.org/rfcs/rfc3174.html

=== modified file 'mysys/stacktrace.c'
--- a/mysys/stacktrace.c	2010-08-03 03:49:14 +0000
+++ b/mysys/stacktrace.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/string.c'
--- a/mysys/string.c	2010-07-08 21:20:08 +0000
+++ b/mysys/string.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/test_charset.c'
--- a/mysys/test_charset.c	2010-07-23 20:09:27 +0000
+++ b/mysys/test_charset.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/test_dir.c'
--- a/mysys/test_dir.c	2006-12-23 19:20:40 +0000
+++ b/mysys/test_dir.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/test_xml.c'
--- a/mysys/test_xml.c	2006-12-23 19:17:15 +0000
+++ b/mysys/test_xml.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/testhash.c'
--- a/mysys/testhash.c	2010-07-08 21:20:08 +0000
+++ b/mysys/testhash.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/thr_alarm.c'
--- a/mysys/thr_alarm.c	2010-07-23 20:09:27 +0000
+++ b/mysys/thr_alarm.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/thr_lock.c'
--- a/mysys/thr_lock.c	2010-08-30 14:07:40 +0000
+++ b/mysys/thr_lock.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/thr_mutex.c'
--- a/mysys/thr_mutex.c	2009-12-10 03:19:51 +0000
+++ b/mysys/thr_mutex.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/thr_rwlock.c'
--- a/mysys/thr_rwlock.c	2010-08-12 13:50:23 +0000
+++ b/mysys/thr_rwlock.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/tree.c'
--- a/mysys/tree.c	2010-07-08 21:20:08 +0000
+++ b/mysys/tree.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'mysys/typelib.c'
--- a/mysys/typelib.c	2010-03-13 21:17:47 +0000
+++ b/mysys/typelib.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'plugin/audit_null/audit_null.c'
--- a/plugin/audit_null/audit_null.c	2010-08-12 15:19:57 +0000
+++ b/plugin/audit_null/audit_null.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2007 MySQL AB
+/* Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <stdio.h>
 #include <mysql/plugin.h>

=== modified file 'plugin/daemon_example/daemon_example.cc'
--- a/plugin/daemon_example/daemon_example.cc	2010-07-08 21:20:08 +0000
+++ b/plugin/daemon_example/daemon_example.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_global.h>
 #include <sql_priv.h>

=== modified file 'plugin/fulltext/plugin_example.c'
--- a/plugin/fulltext/plugin_example.c	2007-04-26 19:26:04 +0000
+++ b/plugin/fulltext/plugin_example.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <stdlib.h>
 #include <ctype.h>

=== modified file 'plugin/semisync/semisync.cc'
--- a/plugin/semisync/semisync.cc	2009-09-26 04:49:49 +0000
+++ b/plugin/semisync/semisync.cc	2010-10-01 19:42:12 +0000
@@ -1,5 +1,4 @@
-/* Copyright (C) 2007 Google Inc.
-   Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 #include "semisync.h"

=== modified file 'plugin/semisync/semisync.h'
--- a/plugin/semisync/semisync.h	2010-03-31 14:05:33 +0000
+++ b/plugin/semisync/semisync.h	2010-10-01 19:42:12 +0000
@@ -1,5 +1,4 @@
-/* Copyright (C) 2007 Google Inc.
-   Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 #ifndef SEMISYNC_H

=== modified file 'plugin/semisync/semisync_master.cc'
--- a/plugin/semisync/semisync_master.cc	2010-06-02 12:57:39 +0000
+++ b/plugin/semisync/semisync_master.cc	2010-10-01 19:42:12 +0000
@@ -1,5 +1,4 @@
-/* Copyright (C) 2007 Google Inc.
-   Copyright (C) 2008 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 #include "semisync_master.h"

=== modified file 'plugin/semisync/semisync_master.h'
--- a/plugin/semisync/semisync_master.h	2010-07-08 21:20:08 +0000
+++ b/plugin/semisync/semisync_master.h	2010-10-01 19:42:12 +0000
@@ -1,6 +1,4 @@
-/* Copyright (C) 2007 Google Inc.
-   Copyright (C) 2008 MySQL AB
-   Copyright (C) 2009 Sun Microsystems, Inc
+/* Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 #ifndef SEMISYNC_MASTER_H

=== modified file 'plugin/semisync/semisync_master_plugin.cc'
--- a/plugin/semisync/semisync_master_plugin.cc	2010-05-31 15:29:54 +0000
+++ b/plugin/semisync/semisync_master_plugin.cc	2010-10-01 19:42:12 +0000
@@ -1,5 +1,4 @@
-/* Copyright (C) 2007 Google Inc.
-   Copyright (C) 2008 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 #include "semisync_master.h"

=== modified file 'plugin/semisync/semisync_slave.cc'
--- a/plugin/semisync/semisync_slave.cc	2009-10-12 13:21:13 +0000
+++ b/plugin/semisync/semisync_slave.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 #include "semisync_slave.h"

=== modified file 'plugin/semisync/semisync_slave.h'
--- a/plugin/semisync/semisync_slave.h	2009-10-12 13:21:13 +0000
+++ b/plugin/semisync/semisync_slave.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 #ifndef SEMISYNC_SLAVE_H

=== modified file 'plugin/semisync/semisync_slave_plugin.cc'
--- a/plugin/semisync/semisync_slave_plugin.cc	2010-05-31 15:29:54 +0000
+++ b/plugin/semisync/semisync_slave_plugin.cc	2010-10-01 19:42:12 +0000
@@ -1,5 +1,4 @@
-/* Copyright (C) 2007 Google Inc.
-   Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 #include "semisync_slave.h"

=== modified file 'scripts/comp_sql.c'
--- a/scripts/comp_sql.c	2007-04-23 12:01:48 +0000
+++ b/scripts/comp_sql.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql-common/client.c'
--- a/sql-common/client.c	2010-07-15 11:16:06 +0000
+++ b/sql-common/client.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql-common/my_time.c'
--- a/sql-common/my_time.c	2010-07-09 12:28:51 +0000
+++ b/sql-common/my_time.c	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2004-2006 MySQL AB
+/* Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_time.h>
 #include <m_string.h>

=== modified file 'sql-common/my_user.c'
--- a/sql-common/my_user.c	2009-02-13 16:41:47 +0000
+++ b/sql-common/my_user.c	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_user.h>
 #include <m_string.h>

=== modified file 'sql-common/pack.c'
--- a/sql-common/pack.c	2007-08-13 13:11:25 +0000
+++ b/sql-common/pack.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/authors.h'
--- a/sql/authors.h	2010-08-16 12:50:27 +0000
+++ b/sql/authors.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef AUTHORS_INCLUDED
 #define AUTHORS_INCLUDED
 
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* Structure of the name list */
 

=== modified file 'sql/client_settings.h'
--- a/sql/client_settings.h	2009-11-25 10:53:23 +0000
+++ b/sql/client_settings.h	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2003 MySQL AB
-   
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'sql/contributors.h'
--- a/sql/contributors.h	2009-09-23 21:32:31 +0000
+++ b/sql/contributors.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef CONTRIBUTORS_INCLUDED
 #define CONTRIBUTORS_INCLUDED
 
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* Structure of the name list */
 

=== modified file 'sql/custom_conf.h'
--- a/sql/custom_conf.h	2006-12-31 00:02:27 +0000
+++ b/sql/custom_conf.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/debug_sync.cc'
--- a/sql/debug_sync.cc	2010-07-08 21:20:08 +0000
+++ b/sql/debug_sync.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 MySQL AB, 2008 - 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/debug_sync.h'
--- a/sql/debug_sync.h	2010-03-19 09:06:40 +0000
+++ b/sql/debug_sync.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef DEBUG_SYNC_INCLUDED
 #define DEBUG_SYNC_INCLUDED
 
-/* Copyright (C) 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/derror.cc'
--- a/sql/derror.cc	2010-09-02 18:37:04 +0000
+++ b/sql/derror.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/derror.h'
--- a/sql/derror.h	2010-03-31 14:05:33 +0000
+++ b/sql/derror.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef DERROR_INCLUDED
 #define DERROR_INCLUDED

=== modified file 'sql/des_key_file.cc'
--- a/sql/des_key_file.cc	2010-03-31 14:05:33 +0000
+++ b/sql/des_key_file.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/des_key_file.h'
--- a/sql/des_key_file.h	2010-03-31 14:05:33 +0000
+++ b/sql/des_key_file.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef DES_KEY_FILE_INCLUDED
 #define DES_KEY_FILE_INCLUDED

=== modified file 'sql/discover.cc'
--- a/sql/discover.cc	2010-03-31 14:05:33 +0000
+++ b/sql/discover.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/discover.h'
--- a/sql/discover.h	2010-03-31 14:05:33 +0000
+++ b/sql/discover.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef DISCOVER_INCLUDED
 #define DISCOVER_INCLUDED

=== modified file 'sql/event_data_objects.cc'
--- a/sql/event_data_objects.cc	2010-07-27 10:25:53 +0000
+++ b/sql/event_data_objects.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/event_data_objects.h'
--- a/sql/event_data_objects.h	2010-03-31 14:05:33 +0000
+++ b/sql/event_data_objects.h	2010-10-01 19:42:12 +0000
@@ -1,6 +1,6 @@
 #ifndef _EVENT_DATA_OBJECTS_H_
 #define _EVENT_DATA_OBJECTS_H_
-/* Copyright (C) 2004-2006 MySQL AB
+/* Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/event_db_repository.cc'
--- a/sql/event_db_repository.cc	2010-08-13 08:02:37 +0000
+++ b/sql/event_db_repository.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2004-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/event_db_repository.h'
--- a/sql/event_db_repository.h	2010-07-27 10:25:53 +0000
+++ b/sql/event_db_repository.h	2010-10-01 19:42:12 +0000
@@ -1,6 +1,6 @@
 #ifndef _EVENT_DB_REPOSITORY_H_
 #define _EVENT_DB_REPOSITORY_H_
-/* Copyright (C) 2004-2006 MySQL AB
+/* Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/event_parse_data.cc'
--- a/sql/event_parse_data.cc	2010-03-31 14:05:33 +0000
+++ b/sql/event_parse_data.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/event_parse_data.h'
--- a/sql/event_parse_data.h	2010-03-31 14:05:33 +0000
+++ b/sql/event_parse_data.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/event_queue.cc'
--- a/sql/event_queue.cc	2010-03-31 14:05:33 +0000
+++ b/sql/event_queue.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/event_queue.h'
--- a/sql/event_queue.h	2010-03-31 14:05:33 +0000
+++ b/sql/event_queue.h	2010-10-01 19:42:12 +0000
@@ -1,6 +1,6 @@
 #ifndef _EVENT_QUEUE_H_
 #define _EVENT_QUEUE_H_
-/* Copyright (C) 2004-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/event_scheduler.h'
--- a/sql/event_scheduler.h	2010-03-31 14:05:33 +0000
+++ b/sql/event_scheduler.h	2010-10-01 19:42:12 +0000
@@ -1,6 +1,6 @@
 #ifndef _EVENT_SCHEDULER_H_
 #define _EVENT_SCHEDULER_H_
-/* Copyright (C) 2004-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/field_conv.cc'
--- a/sql/field_conv.cc	2010-07-23 20:17:55 +0000
+++ b/sql/field_conv.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/filesort.cc'
--- a/sql/filesort.cc	2010-07-23 20:17:55 +0000
+++ b/sql/filesort.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/filesort.h'
--- a/sql/filesort.h	2010-03-31 14:05:33 +0000
+++ b/sql/filesort.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef FILESORT_INCLUDED
 #define FILESORT_INCLUDED

=== modified file 'sql/frm_crypt.cc'
--- a/sql/frm_crypt.cc	2010-03-31 14:05:33 +0000
+++ b/sql/frm_crypt.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/frm_crypt.h'
--- a/sql/frm_crypt.h	2010-03-31 14:05:33 +0000
+++ b/sql/frm_crypt.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef FRM_CRYPT_INCLUDED
 #define FRM_CRYPT_INCLUDED

=== modified file 'sql/gen_lex_hash.cc'
--- a/sql/gen_lex_hash.cc	2010-07-25 17:30:18 +0000
+++ b/sql/gen_lex_hash.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/gstream.cc'
--- a/sql/gstream.cc	2010-03-31 14:05:33 +0000
+++ b/sql/gstream.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/gstream.h'
--- a/sql/gstream.h	2010-07-08 21:20:08 +0000
+++ b/sql/gstream.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef GSTREAM_INCLUDED
 #define GSTREAM_INCLUDED
 
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-08-12 13:50:23 +0000
+++ b/sql/ha_ndbcluster.cc	2010-10-01 19:42:12 +0000
@@ -1,18 +1,17 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /**
   @file

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2010-05-24 12:51:59 +0000
+++ b/sql/ha_ndbcluster.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef HA_NDBCLUSTER_INCLUDED
 #define HA_NDBCLUSTER_INCLUDED
 
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2010-08-12 13:50:23 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2010-10-01 19:42:12 +0000
@@ -1,18 +1,17 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "sql_priv.h"
 #include "unireg.h"         // REQUIRED: for other includes

=== modified file 'sql/ha_ndbcluster_binlog.h'
--- a/sql/ha_ndbcluster_binlog.h	2010-08-09 18:33:47 +0000
+++ b/sql/ha_ndbcluster_binlog.h	2010-10-01 19:42:12 +0000
@@ -1,21 +1,20 @@
 #ifndef HA_NDBCLUSTER_BINLOG_INCLUDED
 #define HA_NDBCLUSTER_BINLOG_INCLUDED
 
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "sql_class.h"                      /* THD */
 

=== modified file 'sql/ha_ndbcluster_cond.cc'
--- a/sql/ha_ndbcluster_cond.cc	2010-08-14 09:11:33 +0000
+++ b/sql/ha_ndbcluster_cond.cc	2010-10-01 19:42:12 +0000
@@ -1,18 +1,17 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   This file defines the NDB Cluster handler engine_condition_pushdown

=== modified file 'sql/ha_ndbcluster_cond.h'
--- a/sql/ha_ndbcluster_cond.h	2010-03-31 14:05:33 +0000
+++ b/sql/ha_ndbcluster_cond.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef HA_NDBCLUSTER_COND_INCLUDED
 #define HA_NDBCLUSTER_COND_INCLUDED
 
-/* Copyright (C) 2000-2007 MySQL AB
+/* Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/ha_ndbcluster_tables.h'
--- a/sql/ha_ndbcluster_tables.h	2009-09-23 21:32:31 +0000
+++ b/sql/ha_ndbcluster_tables.h	2010-10-01 19:42:12 +0000
@@ -1,21 +1,20 @@
 #ifndef HA_NDBCLUSTER_TABLES_INCLUDED
 #define HA_NDBCLUSTER_TABLES_INCLUDED
 
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #define NDB_REP_DB      "mysql"
 #define OLD_NDB_REP_DB  "cluster"

=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2010-09-13 13:56:56 +0000
+++ b/sql/ha_partition.cc	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright 2005-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   This handler was developed by Mikael Ronstrom for version 5.1 of MySQL.

=== modified file 'sql/ha_partition.h'
--- a/sql/ha_partition.h	2010-09-13 13:56:56 +0000
+++ b/sql/ha_partition.h	2010-10-01 19:42:12 +0000
@@ -1,20 +1,20 @@
 #ifndef HA_PARTITION_INCLUDED
 #define HA_PARTITION_INCLUDED
 
-/* Copyright 2005-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifdef __GNUC__
 #pragma interface				/* gcc class implementation */

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2010-08-09 18:33:47 +0000
+++ b/sql/handler.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/handler.h'
--- a/sql/handler.h	2010-08-18 11:55:37 +0000
+++ b/sql/handler.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef HANDLER_INCLUDED
 #define HANDLER_INCLUDED
 
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/hash_filo.cc'
--- a/sql/hash_filo.cc	2010-03-31 14:05:33 +0000
+++ b/sql/hash_filo.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/hash_filo.h'
--- a/sql/hash_filo.h	2010-03-31 14:05:33 +0000
+++ b/sql/hash_filo.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003, 2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/hostname.cc'
--- a/sql/hostname.cc	2010-07-23 20:17:55 +0000
+++ b/sql/hostname.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/hostname.h'
--- a/sql/hostname.h	2010-03-31 14:05:33 +0000
+++ b/sql/hostname.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef HOSTNAME_INCLUDED
 #define HOSTNAME_INCLUDED

=== modified file 'sql/init.cc'
--- a/sql/init.cc	2010-05-28 22:53:26 +0000
+++ b/sql/init.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/init.h'
--- a/sql/init.h	2010-03-31 14:05:33 +0000
+++ b/sql/init.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef INIT_INCLUDED
 #define INIT_INCLUDED

=== modified file 'sql/item_buff.cc'
--- a/sql/item_buff.cc	2010-07-30 13:56:57 +0000
+++ b/sql/item_buff.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_func.cc'
--- a/sql/item_func.cc	2010-08-25 10:22:34 +0000
+++ b/sql/item_func.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_func.h'
--- a/sql/item_func.h	2010-05-05 10:34:20 +0000
+++ b/sql/item_func.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_FUNC_INCLUDED
 #define ITEM_FUNC_INCLUDED
 
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_geofunc.cc'
--- a/sql/item_geofunc.cc	2010-07-23 20:13:36 +0000
+++ b/sql/item_geofunc.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2006 MySQL AB
+/* Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_geofunc.h'
--- a/sql/item_geofunc.h	2010-02-11 04:17:25 +0000
+++ b/sql/item_geofunc.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_GEOFUNC_INCLUDED
 #define ITEM_GEOFUNC_INCLUDED
 
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_row.cc'
--- a/sql/item_row.cc	2010-03-31 14:05:33 +0000
+++ b/sql/item_row.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_row.h'
--- a/sql/item_row.h	2010-03-20 20:23:42 +0000
+++ b/sql/item_row.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_ROW_INCLUDED
 #define ITEM_ROW_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_strfunc.cc'
--- a/sql/item_strfunc.cc	2010-08-20 11:14:11 +0000
+++ b/sql/item_strfunc.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_strfunc.h'
--- a/sql/item_strfunc.h	2010-08-20 11:14:11 +0000
+++ b/sql/item_strfunc.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_STRFUNC_INCLUDED
 #define ITEM_STRFUNC_INCLUDED
 
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_subselect.cc'
--- a/sql/item_subselect.cc	2010-09-09 15:00:33 +0000
+++ b/sql/item_subselect.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_subselect.h'
--- a/sql/item_subselect.h	2010-07-23 20:16:29 +0000
+++ b/sql/item_subselect.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_SUBSELECT_INCLUDED
 #define ITEM_SUBSELECT_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_timefunc.cc'
--- a/sql/item_timefunc.cc	2010-09-07 06:45:00 +0000
+++ b/sql/item_timefunc.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_timefunc.h'
--- a/sql/item_timefunc.h	2010-09-09 12:02:02 +0000
+++ b/sql/item_timefunc.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_TIMEFUNC_INCLUDED
 #define ITEM_TIMEFUNC_INCLUDED
 
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/item_xmlfunc.cc'
--- a/sql/item_xmlfunc.cc	2010-03-31 14:05:33 +0000
+++ b/sql/item_xmlfunc.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifdef __GNUC__
 #pragma implementation

=== modified file 'sql/item_xmlfunc.h'
--- a/sql/item_xmlfunc.h	2009-09-23 21:32:31 +0000
+++ b/sql/item_xmlfunc.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_XMLFUNC_INCLUDED
 #define ITEM_XMLFUNC_INCLUDED
 
-/* Copyright (C) 2000-2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/key.cc'
--- a/sql/key.cc	2010-05-27 16:01:43 +0000
+++ b/sql/key.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/key.h'
--- a/sql/key.h	2010-03-31 14:05:33 +0000
+++ b/sql/key.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef KEY_INCLUDED
 #define KEY_INCLUDED

=== modified file 'sql/keycaches.cc'
--- a/sql/keycaches.cc	2010-07-08 21:20:08 +0000
+++ b/sql/keycaches.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/keycaches.h'
--- a/sql/keycaches.h	2010-03-31 14:05:33 +0000
+++ b/sql/keycaches.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef KEYCACHES_INCLUDED
 #define KEYCACHES_INCLUDED
 
-/* Copyright (C) 2002-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/lex.h'
--- a/sql/lex.h	2010-02-20 09:40:21 +0000
+++ b/sql/lex.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef LEX_INCLUDED
 #define LEX_INCLUDED
 
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/lex_symbol.h'
--- a/sql/lex_symbol.h	2007-03-14 21:36:11 +0000
+++ b/sql/lex_symbol.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/lock.cc'
--- a/sql/lock.cc	2010-08-12 13:50:23 +0000
+++ b/sql/lock.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/log.cc'
--- a/sql/log.cc	2010-09-28 15:15:58 +0000
+++ b/sql/log.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/log.h'
--- a/sql/log.h	2010-09-06 17:18:44 +0000
+++ b/sql/log.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2010-08-23 22:31:12 +0000
+++ b/sql/log_event.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/log_event.h'
--- a/sql/log_event.h	2010-07-15 13:47:50 +0000
+++ b/sql/log_event.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/log_event_old.h'
--- a/sql/log_event_old.h	2007-12-05 19:00:14 +0000
+++ b/sql/log_event_old.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2007 MySQL AB. All rights reserved.
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/main.cc'
--- a/sql/main.cc	2009-12-11 14:51:39 +0000
+++ b/sql/main.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/mdl.cc'
--- a/sql/mdl.cc	2010-09-06 17:29:02 +0000
+++ b/sql/mdl.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2008 MySQL AB
+/* Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/mdl.h'
--- a/sql/mdl.h	2010-09-06 17:29:02 +0000
+++ b/sql/mdl.h	2010-10-01 19:42:12 +0000
@@ -1,6 +1,6 @@
 #ifndef MDL_H
 #define MDL_H
-/* Copyright (C) 2007-2008 MySQL AB
+/* Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/mf_iocache.cc'
--- a/sql/mf_iocache.cc	2010-03-31 14:05:33 +0000
+++ b/sql/mf_iocache.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/my_decimal.cc'
--- a/sql/my_decimal.cc	2010-07-09 12:28:51 +0000
+++ b/sql/my_decimal.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/my_decimal.h'
--- a/sql/my_decimal.h	2010-03-31 14:05:33 +0000
+++ b/sql/my_decimal.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/mysqld.h'
--- a/sql/mysqld.h	2010-08-30 14:07:40 +0000
+++ b/sql/mysqld.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef MYSQLD_INCLUDED
 #define MYSQLD_INCLUDED

=== modified file 'sql/mysqld_suffix.h'
--- a/sql/mysqld_suffix.h	2009-09-23 21:32:31 +0000
+++ b/sql/mysqld_suffix.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef MYSQLD_SUFFIX_INCLUDED
 #define MYSQLD_SUFFIX_INCLUDED
 
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/net_serv.cc'
--- a/sql/net_serv.cc	2010-09-16 10:38:13 +0000
+++ b/sql/net_serv.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2010-09-16 12:20:35 +0000
+++ b/sql/opt_range.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/opt_range.h'
--- a/sql/opt_range.h	2010-07-19 09:21:24 +0000
+++ b/sql/opt_range.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/parse_file.cc'
--- a/sql/parse_file.cc	2010-03-31 14:05:33 +0000
+++ b/sql/parse_file.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/parse_file.h'
--- a/sql/parse_file.h	2010-03-31 14:05:33 +0000
+++ b/sql/parse_file.h	2010-10-01 19:42:12 +0000
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/partition_element.h'
--- a/sql/partition_element.h	2010-03-31 14:05:33 +0000
+++ b/sql/partition_element.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef PARTITION_ELEMENT_INCLUDED
 #define PARTITION_ELEMENT_INCLUDED
 
-/* Copyright 2005-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "my_base.h"                            /* ha_rows */
 #include "handler.h"                            /* UNDEF_NODEGROUP */

=== modified file 'sql/partition_info.h'
--- a/sql/partition_info.h	2010-03-30 20:52:45 +0000
+++ b/sql/partition_info.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef PARTITION_INFO_INCLUDED
 #define PARTITION_INFO_INCLUDED
 
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */

=== modified file 'sql/password.c'
--- a/sql/password.c	2010-03-31 14:05:33 +0000
+++ b/sql/password.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/procedure.cc'
--- a/sql/procedure.cc	2010-03-31 14:05:33 +0000
+++ b/sql/procedure.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004-2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/procedure.h'
--- a/sql/procedure.h	2010-03-31 14:05:33 +0000
+++ b/sql/procedure.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef PROCEDURE_INCLUDED
 #define PROCEDURE_INCLUDED
 
-/* Copyright (C) 2000-2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/protocol.h'
--- a/sql/protocol.h	2010-03-31 14:05:33 +0000
+++ b/sql/protocol.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef PROTOCOL_INCLUDED
 #define PROTOCOL_INCLUDED
 
-/* Copyright (C) 2002-2006 MySQL AB
+/* Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/records.cc'
--- a/sql/records.cc	2010-07-08 21:20:08 +0000
+++ b/sql/records.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/records.h'
--- a/sql/records.h	2010-06-22 20:32:29 +0000
+++ b/sql/records.h	2010-10-01 19:42:12 +0000
@@ -1,6 +1,6 @@
 #ifndef SQL_RECORDS_H
 #define SQL_RECORDS_H 
-/* Copyright (C) 2008 Sun/MySQL
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/repl_failsafe.cc'
--- a/sql/repl_failsafe.cc	2010-07-23 20:13:36 +0000
+++ b/sql/repl_failsafe.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2006 MySQL AB & Sasha, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/repl_failsafe.h'
--- a/sql/repl_failsafe.h	2010-07-23 20:13:36 +0000
+++ b/sql/repl_failsafe.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef REPL_FAILSAFE_INCLUDED
 #define REPL_FAILSAFE_INCLUDED
 
-/* Copyright (C) 2001-2005 MySQL AB & Sasha, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/replication.h'
--- a/sql/replication.h	2010-03-31 14:05:33 +0000
+++ b/sql/replication.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_filter.cc'
--- a/sql/rpl_filter.cc	2010-07-08 21:20:08 +0000
+++ b/sql/rpl_filter.cc	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2000-2003 MySQL AB
-   
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'sql/rpl_filter.h'
--- a/sql/rpl_filter.h	2010-04-12 13:17:37 +0000
+++ b/sql/rpl_filter.h	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2000-2003 MySQL AB
-   
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'sql/rpl_handler.cc'
--- a/sql/rpl_handler.cc	2010-07-15 19:29:25 +0000
+++ b/sql/rpl_handler.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_handler.h'
--- a/sql/rpl_handler.h	2010-03-31 14:05:33 +0000
+++ b/sql/rpl_handler.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_injector.cc'
--- a/sql/rpl_injector.cc	2010-07-08 21:20:08 +0000
+++ b/sql/rpl_injector.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "sql_priv.h" 
 #include "unireg.h"                             // REQUIRED by later includes

=== modified file 'sql/rpl_injector.h'
--- a/sql/rpl_injector.h	2010-03-31 14:05:33 +0000
+++ b/sql/rpl_injector.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef INJECTOR_H
 #define INJECTOR_H

=== modified file 'sql/rpl_mi.cc'
--- a/sql/rpl_mi.cc	2010-07-15 13:47:50 +0000
+++ b/sql/rpl_mi.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_mi.h'
--- a/sql/rpl_mi.h	2010-06-28 22:30:32 +0000
+++ b/sql/rpl_mi.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_record.cc'
--- a/sql/rpl_record.cc	2010-07-24 13:31:48 +0000
+++ b/sql/rpl_record.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2007 MySQL AB. All rights reserved.
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_record.h'
--- a/sql/rpl_record.h	2010-03-31 14:05:33 +0000
+++ b/sql/rpl_record.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2007 MySQL AB. All rights reserved.
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_record_old.h'
--- a/sql/rpl_record_old.h	2010-03-31 14:05:33 +0000
+++ b/sql/rpl_record_old.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2007 MySQL AB. All rights reserved.
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_reporting.cc'
--- a/sql/rpl_reporting.cc	2010-03-31 14:05:33 +0000
+++ b/sql/rpl_reporting.cc	2010-10-01 19:42:12 +0000
@@ -1,5 +1,5 @@
 
-/* Copyright (C) 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_reporting.h'
--- a/sql/rpl_reporting.h	2010-03-31 14:05:33 +0000
+++ b/sql/rpl_reporting.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef RPL_REPORTING_H
 #define RPL_REPORTING_H

=== modified file 'sql/rpl_rli.cc'
--- a/sql/rpl_rli.cc	2010-07-27 10:25:53 +0000
+++ b/sql/rpl_rli.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_rli.h'
--- a/sql/rpl_rli.h	2010-03-31 14:05:33 +0000
+++ b/sql/rpl_rli.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_tblmap.cc'
--- a/sql/rpl_tblmap.cc	2010-03-31 14:05:33 +0000
+++ b/sql/rpl_tblmap.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_tblmap.h'
--- a/sql/rpl_tblmap.h	2010-03-31 14:05:33 +0000
+++ b/sql/rpl_tblmap.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/rpl_utility.cc'
--- a/sql/rpl_utility.cc	2010-07-15 13:47:50 +0000
+++ b/sql/rpl_utility.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "rpl_utility.h"
 

=== modified file 'sql/rpl_utility.h'
--- a/sql/rpl_utility.h	2010-05-31 15:29:54 +0000
+++ b/sql/rpl_utility.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef RPL_UTILITY_H
 #define RPL_UTILITY_H

=== modified file 'sql/scheduler.cc'
--- a/sql/scheduler.cc	2010-06-15 07:44:26 +0000
+++ b/sql/scheduler.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/scheduler.h'
--- a/sql/scheduler.h	2010-06-07 14:01:39 +0000
+++ b/sql/scheduler.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SCHEDULER_INCLUDED
 #define SCHEDULER_INCLUDED
 
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2010-09-02 18:37:04 +0000
+++ b/sql/set_var.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/set_var.h'
--- a/sql/set_var.h	2010-09-09 12:37:09 +0000
+++ b/sql/set_var.h	2010-10-01 19:42:12 +0000
@@ -1,6 +1,6 @@
 #ifndef SET_VAR_INCLUDED
 #define SET_VAR_INCLUDED
-/* Copyright (C) 2000-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sha2.cc'
--- a/sql/sha2.cc	2010-04-13 15:04:45 +0000
+++ b/sql/sha2.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2010-07-29 12:32:11 +0000
+++ b/sql/slave.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/slave.h'
--- a/sql/slave.h	2010-03-31 14:05:33 +0000
+++ b/sql/slave.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sp.cc'
--- a/sql/sp.cc	2010-08-31 13:49:41 +0000
+++ b/sql/sp.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sp.h'
--- a/sql/sp.h	2010-06-11 01:30:49 +0000
+++ b/sql/sp.h	2010-10-01 19:42:12 +0000
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sp_cache.cc'
--- a/sql/sp_cache.cc	2010-03-31 14:05:33 +0000
+++ b/sql/sp_cache.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sp_cache.h'
--- a/sql/sp_cache.h	2010-03-31 14:05:33 +0000
+++ b/sql/sp_cache.h	2010-10-01 19:42:12 +0000
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sp_head.cc'
--- a/sql/sp_head.cc	2010-08-12 13:55:27 +0000
+++ b/sql/sp_head.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2002-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sp_head.h'
--- a/sql/sp_head.h	2010-08-05 12:53:09 +0000
+++ b/sql/sp_head.h	2010-10-01 19:42:12 +0000
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sp_pcontext.cc'
--- a/sql/sp_pcontext.cc	2010-07-08 21:20:08 +0000
+++ b/sql/sp_pcontext.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sp_pcontext.h'
--- a/sql/sp_pcontext.h	2010-07-30 15:28:36 +0000
+++ b/sql/sp_pcontext.h	2010-10-01 19:42:12 +0000
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sp_rcontext.cc'
--- a/sql/sp_rcontext.cc	2010-07-30 15:28:36 +0000
+++ b/sql/sp_rcontext.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sp_rcontext.h'
--- a/sql/sp_rcontext.h	2010-07-30 15:28:36 +0000
+++ b/sql/sp_rcontext.h	2010-10-01 19:42:12 +0000
@@ -1,5 +1,5 @@
 /* -*- C++ -*- */
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/spatial.cc'
--- a/sql/spatial.cc	2010-09-06 09:54:44 +0000
+++ b/sql/spatial.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/spatial.h'
--- a/sql/spatial.h	2010-07-14 19:42:35 +0000
+++ b/sql/spatial.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2006 MySQL AB
+/* Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2010-07-29 12:32:11 +0000
+++ b/sql/sql_acl.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_acl.h'
--- a/sql/sql_acl.h	2010-04-07 11:58:40 +0000
+++ b/sql/sql_acl.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_ACL_INCLUDED
 #define SQL_ACL_INCLUDED
 
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_analyse.cc'
--- a/sql/sql_analyse.cc	2010-07-09 12:28:51 +0000
+++ b/sql/sql_analyse.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_analyse.h'
--- a/sql/sql_analyse.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_analyse.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_ANALYSE_INCLUDED
 #define SQL_ANALYSE_INCLUDED
 
-/* Copyright (C) 2000-2003, 2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_array.h'
--- a/sql/sql_array.h	2009-09-23 21:32:31 +0000
+++ b/sql/sql_array.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_ARRAY_INCLUDED
 #define SQL_ARRAY_INCLUDED
 
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_audit.cc'
--- a/sql/sql_audit.cc	2010-08-20 09:58:28 +0000
+++ b/sql/sql_audit.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_audit.h'
--- a/sql/sql_audit.h	2010-08-20 09:58:28 +0000
+++ b/sql/sql_audit.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_AUDIT_INCLUDED
 #define SQL_AUDIT_INCLUDED
 
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2010-09-24 16:26:24 +0000
+++ b/sql/sql_base.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_base.h'
--- a/sql/sql_base.h	2010-09-06 17:29:02 +0000
+++ b/sql/sql_base.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_BASE_INCLUDED
 #define SQL_BASE_INCLUDED

=== modified file 'sql/sql_binlog.cc'
--- a/sql/sql_binlog.cc	2010-07-15 13:47:50 +0000
+++ b/sql/sql_binlog.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "sql_priv.h"
 #include "sql_binlog.h"

=== modified file 'sql/sql_binlog.h'
--- a/sql/sql_binlog.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_binlog.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_BINLOG_INCLUDED
 #define SQL_BINLOG_INCLUDED

=== modified file 'sql/sql_bitmap.h'
--- a/sql/sql_bitmap.h	2010-07-15 11:13:30 +0000
+++ b/sql/sql_bitmap.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_builtin.cc.in'
--- a/sql/sql_builtin.cc.in	2009-12-25 15:49:21 +0000
+++ b/sql/sql_builtin.cc.in	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <mysql/plugin.h>
 

=== modified file 'sql/sql_cache.cc'
--- a/sql/sql_cache.cc	2010-09-24 12:12:09 +0000
+++ b/sql/sql_cache.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_cache.h'
--- a/sql/sql_cache.h	2010-04-12 13:17:37 +0000
+++ b/sql/sql_cache.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2010-09-06 13:40:55 +0000
+++ b/sql/sql_class.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2010-08-30 14:07:40 +0000
+++ b/sql/sql_class.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_client.cc'
--- a/sql/sql_client.cc	2010-03-31 14:05:33 +0000
+++ b/sql/sql_client.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_connect.cc'
--- a/sql/sql_connect.cc	2010-08-16 12:50:27 +0000
+++ b/sql/sql_connect.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_connect.h'
--- a/sql/sql_connect.h	2010-06-07 14:01:39 +0000
+++ b/sql/sql_connect.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_CONNECT_INCLUDED
 #define SQL_CONNECT_INCLUDED

=== modified file 'sql/sql_const.h'
--- a/sql/sql_const.h	2010-05-28 22:13:31 +0000
+++ b/sql/sql_const.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /**
   @file

=== modified file 'sql/sql_crypt.cc'
--- a/sql/sql_crypt.cc	2010-03-31 14:05:33 +0000
+++ b/sql/sql_crypt.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003, 2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_crypt.h'
--- a/sql/sql_crypt.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_crypt.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_CRYPT_INCLUDED
 #define SQL_CRYPT_INCLUDED
 
-/* Copyright (C) 2000-2001, 2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_cursor.cc'
--- a/sql/sql_cursor.cc	2010-07-29 12:32:11 +0000
+++ b/sql/sql_cursor.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_cursor.h'
--- a/sql/sql_cursor.h	2010-07-27 12:42:36 +0000
+++ b/sql/sql_cursor.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_db.cc'
--- a/sql/sql_db.cc	2010-07-19 08:27:53 +0000
+++ b/sql/sql_db.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_db.h'
--- a/sql/sql_db.h	2010-07-01 13:53:46 +0000
+++ b/sql/sql_db.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_DB_INCLUDED
 #define SQL_DB_INCLUDED

=== modified file 'sql/sql_delete.cc'
--- a/sql/sql_delete.cc	2010-07-28 11:17:19 +0000
+++ b/sql/sql_delete.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_delete.h'
--- a/sql/sql_delete.h	2010-06-17 13:31:51 +0000
+++ b/sql/sql_delete.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_DELETE_INCLUDED
 #define SQL_DELETE_INCLUDED

=== modified file 'sql/sql_derived.cc'
--- a/sql/sql_derived.cc	2010-06-11 01:30:49 +0000
+++ b/sql/sql_derived.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2003 MySQL AB
+/* Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_derived.h'
--- a/sql/sql_derived.h	2010-04-12 13:17:37 +0000
+++ b/sql/sql_derived.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_DERIVED_INCLUDED
 #define SQL_DERIVED_INCLUDED

=== modified file 'sql/sql_do.cc'
--- a/sql/sql_do.cc	2010-07-27 10:25:53 +0000
+++ b/sql/sql_do.cc	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2000-2006 MySQL AB
-   
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'sql/sql_do.h'
--- a/sql/sql_do.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_do.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_DO_INCLUDED
 #define SQL_DO_INCLUDED

=== modified file 'sql/sql_error.cc'
--- a/sql/sql_error.cc	2010-07-30 15:28:36 +0000
+++ b/sql/sql_error.cc	2010-10-01 19:42:12 +0000
@@ -1,5 +1,4 @@
-/* Copyright (C) 1995-2002 MySQL AB,
-   Copyright (C) 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /**********************************************************************
 This file contains the implementation of error and warnings related

=== modified file 'sql/sql_error.h'
--- a/sql/sql_error.h	2010-07-30 15:28:36 +0000
+++ b/sql/sql_error.h	2010-10-01 19:42:12 +0000
@@ -1,5 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB,
-   Copyright (C) 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_handler.cc'
--- a/sql/sql_handler.cc	2010-08-12 13:50:23 +0000
+++ b/sql/sql_handler.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_handler.h'
--- a/sql/sql_handler.h	2010-06-09 08:39:09 +0000
+++ b/sql/sql_handler.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_HANDLER_INCLUDED
 #define SQL_HANDLER_INCLUDED

=== modified file 'sql/sql_help.cc'
--- a/sql/sql_help.cc	2010-07-01 13:53:46 +0000
+++ b/sql/sql_help.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_help.h'
--- a/sql/sql_help.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_help.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_HELP_INCLUDED
 #define SQL_HELP_INCLUDED

=== modified file 'sql/sql_insert.cc'
--- a/sql/sql_insert.cc	2010-09-01 13:12:42 +0000
+++ b/sql/sql_insert.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_insert.h'
--- a/sql/sql_insert.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_insert.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_INSERT_INCLUDED
 #define SQL_INSERT_INCLUDED

=== modified file 'sql/sql_lex.cc'
--- a/sql/sql_lex.cc	2010-08-20 02:59:58 +0000
+++ b/sql/sql_lex.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h	2010-09-01 13:12:42 +0000
+++ b/sql/sql_lex.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_list.cc'
--- a/sql/sql_list.cc	2010-03-31 14:05:33 +0000
+++ b/sql/sql_list.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003, 2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_list.h'
--- a/sql/sql_list.h	2010-07-15 13:47:50 +0000
+++ b/sql/sql_list.h	2010-10-01 19:42:12 +0000
@@ -1,6 +1,6 @@
 #ifndef INCLUDES_MYSQL_SQL_LIST_H
 #define INCLUDES_MYSQL_SQL_LIST_H
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_load.h'
--- a/sql/sql_load.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_load.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_LOAD_INCLUDED
 #define SQL_LOAD_INCLUDED

=== modified file 'sql/sql_locale.cc'
--- a/sql/sql_locale.cc	2010-07-08 21:20:08 +0000
+++ b/sql/sql_locale.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_locale.h'
--- a/sql/sql_locale.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_locale.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_LOCALE_INCLUDED
 #define SQL_LOCALE_INCLUDED

=== modified file 'sql/sql_manager.cc'
--- a/sql/sql_manager.cc	2010-07-08 21:20:08 +0000
+++ b/sql/sql_manager.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002, 2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_manager.h'
--- a/sql/sql_manager.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_manager.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_MANAGER_INCLUDED
 #define SQL_MANAGER_INCLUDED

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-08-25 10:22:34 +0000
+++ b/sql/sql_parse.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_parse.h'
--- a/sql/sql_parse.h	2010-08-18 11:29:04 +0000
+++ b/sql/sql_parse.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_PARSE_INCLUDED
 #define SQL_PARSE_INCLUDED

=== modified file 'sql/sql_partition.cc'
--- a/sql/sql_partition.cc	2010-08-20 17:15:48 +0000
+++ b/sql/sql_partition.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2005-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_partition.h'
--- a/sql/sql_partition.h	2010-07-29 03:24:35 +0000
+++ b/sql/sql_partition.h	2010-10-01 19:42:12 +0000
@@ -1,20 +1,20 @@
 #ifndef SQL_PARTITION_INCLUDED
 #define SQL_PARTITION_INCLUDED
 
-/* Copyright 2005-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifdef __GNUC__
 #pragma interface				/* gcc class implementation */

=== modified file 'sql/sql_plist.h'
--- a/sql/sql_plist.h	2010-06-07 13:40:52 +0000
+++ b/sql/sql_plist.h	2010-10-01 19:42:12 +0000
@@ -1,6 +1,6 @@
 #ifndef SQL_PLIST_H
 #define SQL_PLIST_H
-/* Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2010-09-21 21:24:29 +0000
+++ b/sql/sql_plugin.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_plugin.h'
--- a/sql/sql_plugin.h	2010-07-08 21:20:08 +0000
+++ b/sql/sql_plugin.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_plugin_services.h'
--- a/sql/sql_plugin_services.h	2010-06-07 14:01:39 +0000
+++ b/sql/sql_plugin_services.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_prepare.cc'
--- a/sql/sql_prepare.cc	2010-08-18 09:35:41 +0000
+++ b/sql/sql_prepare.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2002 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /**
   @file

=== modified file 'sql/sql_prepare.h'
--- a/sql/sql_prepare.h	2009-10-21 20:02:06 +0000
+++ b/sql/sql_prepare.h	2010-10-01 19:42:12 +0000
@@ -1,6 +1,6 @@
 #ifndef SQL_PREPARE_H
 #define SQL_PREPARE_H
-/* Copyright (C) 1995-2008 MySQL AB
+/* Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "sql_error.h"
 

=== modified file 'sql/sql_priv.h'
--- a/sql/sql_priv.h	2010-08-05 12:53:09 +0000
+++ b/sql/sql_priv.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_profile.h'
--- a/sql/sql_profile.h	2010-07-08 21:20:08 +0000
+++ b/sql/sql_profile.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_rename.cc'
--- a/sql/sql_rename.cc	2010-08-10 11:16:44 +0000
+++ b/sql/sql_rename.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_rename.h'
--- a/sql/sql_rename.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_rename.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_RENAME_INCLUDED
 #define SQL_RENAME_INCLUDED

=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc	2010-09-06 17:18:44 +0000
+++ b/sql/sql_repl.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB & Sasha, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_repl.h'
--- a/sql/sql_repl.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_repl.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB & Sasha
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_select.h'
--- a/sql/sql_select.h	2010-08-17 12:12:52 +0000
+++ b/sql/sql_select.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_SELECT_INCLUDED
 #define SQL_SELECT_INCLUDED
 
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_servers.cc'
--- a/sql/sql_servers.cc	2010-08-12 16:44:41 +0000
+++ b/sql/sql_servers.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_servers.h'
--- a/sql/sql_servers.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_servers.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_SERVERS_INCLUDED
 #define SQL_SERVERS_INCLUDED
 
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "my_global.h"                  /* uint */
 #include "slave.h" // for tables_ok(), rpl_filter

=== modified file 'sql/sql_show.h'
--- a/sql/sql_show.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_show.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_SHOW_H
 #define SQL_SHOW_H

=== modified file 'sql/sql_signal.cc'
--- a/sql/sql_signal.cc	2010-07-30 15:28:36 +0000
+++ b/sql/sql_signal.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 Sun Microsystems, Inc
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_signal.h'
--- a/sql/sql_signal.h	2009-09-10 09:18:29 +0000
+++ b/sql/sql_signal.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 Sun Microsystems, Inc
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_sort.h'
--- a/sql/sql_sort.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_sort.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_SORT_INCLUDED
 #define SQL_SORT_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_state.c'
--- a/sql/sql_state.c	2006-12-23 19:17:15 +0000
+++ b/sql/sql_state.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_string.cc'
--- a/sql/sql_string.cc	2010-08-25 15:57:53 +0000
+++ b/sql/sql_string.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_string.h'
--- a/sql/sql_string.h	2010-07-08 21:20:08 +0000
+++ b/sql/sql_string.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_STRING_INCLUDED
 #define SQL_STRING_INCLUDED
 
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2010-09-21 14:47:41 +0000
+++ b/sql/sql_table.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_table.h'
--- a/sql/sql_table.h	2010-08-20 17:15:48 +0000
+++ b/sql/sql_table.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_TABLE_INCLUDED
 #define SQL_TABLE_INCLUDED

=== modified file 'sql/sql_tablespace.cc'
--- a/sql/sql_tablespace.cc	2010-03-31 14:05:33 +0000
+++ b/sql/sql_tablespace.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_tablespace.h'
--- a/sql/sql_tablespace.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_tablespace.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_TABLESPACE_INCLUDED
 #define SQL_TABLESPACE_INCLUDED

=== modified file 'sql/sql_test.cc'
--- a/sql/sql_test.cc	2010-08-04 16:29:13 +0000
+++ b/sql/sql_test.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_test.h'
--- a/sql/sql_test.h	2010-05-31 15:29:54 +0000
+++ b/sql/sql_test.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_TEST_INCLUDED
 #define SQL_TEST_INCLUDED

=== modified file 'sql/sql_time.cc'
--- a/sql/sql_time.cc	2010-03-31 14:05:33 +0000
+++ b/sql/sql_time.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_time.h'
--- a/sql/sql_time.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_time.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_TIME_INCLUDED
 #define SQL_TIME_INCLUDED

=== modified file 'sql/sql_trigger.cc'
--- a/sql/sql_trigger.cc	2010-09-07 09:00:41 +0000
+++ b/sql/sql_trigger.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 #define MYSQL_LEX 1

=== modified file 'sql/sql_trigger.h'
--- a/sql/sql_trigger.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_trigger.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_TRIGGER_INCLUDED
 #define SQL_TRIGGER_INCLUDED
 
-/* Copyright (C) 2004-2005 MySQL AB
+/* Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* Forward declarations */
 

=== modified file 'sql/sql_udf.cc'
--- a/sql/sql_udf.cc	2010-07-27 10:25:53 +0000
+++ b/sql/sql_udf.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_udf.h'
--- a/sql/sql_udf.h	2009-09-23 21:32:31 +0000
+++ b/sql/sql_udf.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_UDF_INCLUDED
 #define SQL_UDF_INCLUDED
 
-/* Copyright (C) 2000-2001, 2003-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_union.cc'
--- a/sql/sql_union.cc	2010-07-27 12:42:36 +0000
+++ b/sql/sql_union.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_union.h'
--- a/sql/sql_union.h	2010-03-31 14:05:33 +0000
+++ b/sql/sql_union.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_UNION_INCLUDED
 #define SQL_UNION_INCLUDED

=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc	2010-08-09 12:11:29 +0000
+++ b/sql/sql_update.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sql_update.h'
--- a/sql/sql_update.h	2010-04-12 13:17:37 +0000
+++ b/sql/sql_update.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef SQL_UPDATE_INCLUDED
 #define SQL_UPDATE_INCLUDED

=== modified file 'sql/sql_view.cc'
--- a/sql/sql_view.cc	2010-08-18 11:55:37 +0000
+++ b/sql/sql_view.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,8 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #define MYSQL_LEX 1
 #include "my_global.h"                          /* NO_EMBEDDED_ACCESS_CHECKS */

=== modified file 'sql/sql_view.h'
--- a/sql/sql_view.h	2010-05-25 20:01:38 +0000
+++ b/sql/sql_view.h	2010-10-01 19:42:12 +0000
@@ -2,7 +2,7 @@
 #define SQL_VIEW_INCLUDED
 
 /* -*- C++ -*- */
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,8 +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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "sql_class.h"     /* Required by sql_lex.h */
 #include "sql_lex.h"       /* enum_view_create_mode, enum_drop_mode */

=== modified file 'sql/strfunc.cc'
--- a/sql/strfunc.cc	2010-03-31 14:05:33 +0000
+++ b/sql/strfunc.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/strfunc.h'
--- a/sql/strfunc.h	2010-03-31 14:05:33 +0000
+++ b/sql/strfunc.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef STRFUNC_INCLUDED
 #define STRFUNC_INCLUDED

=== modified file 'sql/structs.h'
--- a/sql/structs.h	2010-03-31 14:05:33 +0000
+++ b/sql/structs.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef STRUCTS_INCLUDED
 #define STRUCTS_INCLUDED
 
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sys_vars.h'
--- a/sql/sys_vars.h	2010-09-02 18:37:04 +0000
+++ b/sql/sys_vars.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2006 MySQL AB, 2009-2010 Sun Microsystems, Inc.
+/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/sys_vars_shared.h'
--- a/sql/sys_vars_shared.h	2010-03-31 14:05:33 +0000
+++ b/sql/sys_vars_shared.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef SYS_VARS_SHARED_INCLUDED
 #define SYS_VARS_SHARED_INCLUDED
 
-/* Copyright (C) 2002-2006 MySQL AB, 2009-2010 Sun Microsystems, Inc.
+/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/table.cc'
--- a/sql/table.cc	2010-09-06 17:29:02 +0000
+++ b/sql/table.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/table.h'
--- a/sql/table.h	2010-08-25 10:22:34 +0000
+++ b/sql/table.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef TABLE_INCLUDED
 #define TABLE_INCLUDED
 
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/thr_malloc.cc'
--- a/sql/thr_malloc.cc	2010-06-11 13:48:24 +0000
+++ b/sql/thr_malloc.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003-2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/thr_malloc.h'
--- a/sql/thr_malloc.h	2010-05-28 22:13:31 +0000
+++ b/sql/thr_malloc.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifndef THR_MALLOC_INCLUDED
 #define THR_MALLOC_INCLUDED

=== modified file 'sql/transaction.cc'
--- a/sql/transaction.cc	2010-07-27 10:25:53 +0000
+++ b/sql/transaction.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 Sun/MySQL
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/transaction.h'
--- a/sql/transaction.h	2009-12-03 18:37:38 +0000
+++ b/sql/transaction.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 Sun/MySQL
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/tzfile.h'
--- a/sql/tzfile.h	2009-09-23 21:32:31 +0000
+++ b/sql/tzfile.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef TZFILE_INCLUDED
 #define TZFILE_INCLUDED
 
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/tztime.cc'
--- a/sql/tztime.cc	2010-07-27 10:25:53 +0000
+++ b/sql/tztime.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/tztime.h'
--- a/sql/tztime.h	2010-03-31 14:05:33 +0000
+++ b/sql/tztime.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef TZTIME_INCLUDED
 #define TZTIME_INCLUDED
 
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/udf_example.c'
--- a/sql/udf_example.c	2010-07-29 12:32:11 +0000
+++ b/sql/udf_example.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/uniques.cc'
--- a/sql/uniques.cc	2010-07-08 21:20:08 +0000
+++ b/sql/uniques.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 MySQL AB
+/* Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/unireg.cc'
--- a/sql/unireg.cc	2010-07-08 21:20:08 +0000
+++ b/sql/unireg.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/unireg.h'
--- a/sql/unireg.h	2010-07-02 19:38:04 +0000
+++ b/sql/unireg.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef UNIREG_INCLUDED
 #define UNIREG_INCLUDED
 
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/archive/archive_test.c'
--- a/storage/archive/archive_test.c	2007-03-21 05:13:55 +0000
+++ b/storage/archive/archive_test.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "azlib.h"
 #include <string.h>

=== modified file 'storage/archive/ha_archive.cc'
--- a/storage/archive/ha_archive.cc	2010-07-26 15:54:20 +0000
+++ b/storage/archive/ha_archive.cc	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation

=== modified file 'storage/archive/ha_archive.h'
--- a/storage/archive/ha_archive.h	2010-07-26 15:54:20 +0000
+++ b/storage/archive/ha_archive.h	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */

=== modified file 'storage/blackhole/ha_blackhole.cc'
--- a/storage/blackhole/ha_blackhole.cc	2010-07-08 21:20:08 +0000
+++ b/storage/blackhole/ha_blackhole.cc	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright 2005-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 #ifdef USE_PRAGMA_IMPLEMENTATION

=== modified file 'storage/blackhole/ha_blackhole.h'
--- a/storage/blackhole/ha_blackhole.h	2010-03-31 14:05:33 +0000
+++ b/storage/blackhole/ha_blackhole.h	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */

=== modified file 'storage/csv/ha_tina.cc'
--- a/storage/csv/ha_tina.cc	2010-07-29 12:32:11 +0000
+++ b/storage/csv/ha_tina.cc	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   Make sure to look at ha_tina.h for more details.

=== modified file 'storage/csv/ha_tina.h'
--- a/storage/csv/ha_tina.h	2010-07-08 21:20:08 +0000
+++ b/storage/csv/ha_tina.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/csv/transparent_file.cc'
--- a/storage/csv/transparent_file.cc	2010-07-08 21:20:08 +0000
+++ b/storage/csv/transparent_file.cc	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation        // gcc: Class implementation

=== modified file 'storage/csv/transparent_file.h'
--- a/storage/csv/transparent_file.h	2009-03-24 09:02:01 +0000
+++ b/storage/csv/transparent_file.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/example/ha_example.cc'
--- a/storage/example/ha_example.cc	2010-08-05 12:34:19 +0000
+++ b/storage/example/ha_example.cc	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2003 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /**
   @file ha_example.cc

=== modified file 'storage/federated/ha_federated.h'
--- a/storage/federated/ha_federated.h	2010-03-24 15:03:44 +0000
+++ b/storage/federated/ha_federated.h	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   Please read ha_exmple.cc before reading this file.

=== modified file 'storage/heap/_check.c'
--- a/storage/heap/_check.c	2007-05-10 09:59:39 +0000
+++ b/storage/heap/_check.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/_rectest.c'
--- a/storage/heap/_rectest.c	2007-05-10 09:59:39 +0000
+++ b/storage/heap/_rectest.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/ha_heap.cc'
--- a/storage/heap/ha_heap.cc	2010-07-23 20:17:55 +0000
+++ b/storage/heap/ha_heap.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/ha_heap.h'
--- a/storage/heap/ha_heap.h	2010-03-31 14:05:33 +0000
+++ b/storage/heap/ha_heap.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/heapdef.h'
--- a/storage/heap/heapdef.h	2009-12-05 01:26:15 +0000
+++ b/storage/heap/heapdef.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_block.c'
--- a/storage/heap/hp_block.c	2010-07-08 21:20:08 +0000
+++ b/storage/heap/hp_block.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_clear.c'
--- a/storage/heap/hp_clear.c	2009-11-24 13:54:59 +0000
+++ b/storage/heap/hp_clear.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004, 2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_close.c'
--- a/storage/heap/hp_close.c	2010-07-08 21:20:08 +0000
+++ b/storage/heap/hp_close.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_create.c'
--- a/storage/heap/hp_create.c	2010-07-08 21:20:08 +0000
+++ b/storage/heap/hp_create.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_delete.c'
--- a/storage/heap/hp_delete.c	2007-09-13 12:12:46 +0000
+++ b/storage/heap/hp_delete.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004-200 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_extra.c'
--- a/storage/heap/hp_extra.c	2006-12-31 00:32:21 +0000
+++ b/storage/heap/hp_extra.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_hash.c'
--- a/storage/heap/hp_hash.c	2010-07-02 18:30:47 +0000
+++ b/storage/heap/hp_hash.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_info.c'
--- a/storage/heap/hp_info.c	2007-05-10 09:59:39 +0000
+++ b/storage/heap/hp_info.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_open.c'
--- a/storage/heap/hp_open.c	2010-07-15 11:26:38 +0000
+++ b/storage/heap/hp_open.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004, 2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_panic.c'
--- a/storage/heap/hp_panic.c	2009-12-05 01:26:15 +0000
+++ b/storage/heap/hp_panic.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_rename.c'
--- a/storage/heap/hp_rename.c	2010-07-08 21:20:08 +0000
+++ b/storage/heap/hp_rename.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_rfirst.c'
--- a/storage/heap/hp_rfirst.c	2007-09-13 12:12:46 +0000
+++ b/storage/heap/hp_rfirst.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_rkey.c'
--- a/storage/heap/hp_rkey.c	2009-12-22 09:35:56 +0000
+++ b/storage/heap/hp_rkey.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004, 2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_rlast.c'
--- a/storage/heap/hp_rlast.c	2007-05-10 09:59:39 +0000
+++ b/storage/heap/hp_rlast.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_rnext.c'
--- a/storage/heap/hp_rnext.c	2007-09-13 12:12:46 +0000
+++ b/storage/heap/hp_rnext.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_rprev.c'
--- a/storage/heap/hp_rprev.c	2007-05-10 09:59:39 +0000
+++ b/storage/heap/hp_rprev.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_rrnd.c'
--- a/storage/heap/hp_rrnd.c	2007-05-10 09:59:39 +0000
+++ b/storage/heap/hp_rrnd.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004, 2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_rsame.c'
--- a/storage/heap/hp_rsame.c	2007-05-10 09:59:39 +0000
+++ b/storage/heap/hp_rsame.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_scan.c'
--- a/storage/heap/hp_scan.c	2007-05-10 09:59:39 +0000
+++ b/storage/heap/hp_scan.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_static.c'
--- a/storage/heap/hp_static.c	2009-12-05 01:26:15 +0000
+++ b/storage/heap/hp_static.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_test1.c'
--- a/storage/heap/hp_test1.c	2010-06-11 15:28:18 +0000
+++ b/storage/heap/hp_test1.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003, 2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_test2.c'
--- a/storage/heap/hp_test2.c	2010-07-23 20:09:27 +0000
+++ b/storage/heap/hp_test2.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003, 2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_update.c'
--- a/storage/heap/hp_update.c	2008-02-18 22:29:39 +0000
+++ b/storage/heap/hp_update.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004-2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/heap/hp_write.c'
--- a/storage/heap/hp_write.c	2009-09-17 15:25:52 +0000
+++ b/storage/heap/hp_write.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/ft_boolean_search.c'
--- a/storage/myisam/ft_boolean_search.c	2010-07-23 20:16:29 +0000
+++ b/storage/myisam/ft_boolean_search.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2005 MySQL AB
+/* Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/ft_nlq_search.c'
--- a/storage/myisam/ft_nlq_search.c	2010-07-23 20:16:29 +0000
+++ b/storage/myisam/ft_nlq_search.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2005 MySQL AB
+/* Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/ft_parser.c'
--- a/storage/myisam/ft_parser.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/ft_parser.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/ft_static.c'
--- a/storage/myisam/ft_static.c	2009-12-22 09:35:56 +0000
+++ b/storage/myisam/ft_static.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/ft_stopwords.c'
--- a/storage/myisam/ft_stopwords.c	2010-08-19 06:00:43 +0000
+++ b/storage/myisam/ft_stopwords.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/ft_update.c'
--- a/storage/myisam/ft_update.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/ft_update.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004, 2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/ftdefs.h'
--- a/storage/myisam/ftdefs.h	2009-01-26 06:35:15 +0000
+++ b/storage/myisam/ftdefs.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/fulltext.h'
--- a/storage/myisam/fulltext.h	2010-06-10 20:16:43 +0000
+++ b/storage/myisam/fulltext.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/ha_myisam.cc'
--- a/storage/myisam/ha_myisam.cc	2010-07-08 21:20:08 +0000
+++ b/storage/myisam/ha_myisam.cc	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_cache.c'
--- a/storage/myisam/mi_cache.c	2009-12-05 01:26:15 +0000
+++ b/storage/myisam/mi_cache.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_changed.c'
--- a/storage/myisam/mi_changed.c	2009-11-24 13:54:59 +0000
+++ b/storage/myisam/mi_changed.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001 MySQL AB
+/* Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_check.c'
--- a/storage/myisam/mi_check.c	2010-07-23 20:15:07 +0000
+++ b/storage/myisam/mi_check.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_checksum.c'
--- a/storage/myisam/mi_checksum.c	2007-10-11 15:07:40 +0000
+++ b/storage/myisam/mi_checksum.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003-2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_close.c'
--- a/storage/myisam/mi_close.c	2010-07-08 21:20:08 +0000
+++ b/storage/myisam/mi_close.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_create.c'
--- a/storage/myisam/mi_create.c	2010-07-23 20:15:07 +0000
+++ b/storage/myisam/mi_create.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_dbug.c'
--- a/storage/myisam/mi_dbug.c	2010-06-07 12:05:34 +0000
+++ b/storage/myisam/mi_dbug.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_delete.c'
--- a/storage/myisam/mi_delete.c	2009-11-24 13:54:59 +0000
+++ b/storage/myisam/mi_delete.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_delete_all.c'
--- a/storage/myisam/mi_delete_all.c	2010-04-03 08:37:53 +0000
+++ b/storage/myisam/mi_delete_all.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003, 2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_delete_table.c'
--- a/storage/myisam/mi_delete_table.c	2010-07-23 20:15:07 +0000
+++ b/storage/myisam/mi_delete_table.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2004, 2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_dynrec.c'
--- a/storage/myisam/mi_dynrec.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/mi_dynrec.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_extra.c'
--- a/storage/myisam/mi_extra.c	2010-04-03 08:37:53 +0000
+++ b/storage/myisam/mi_extra.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_extrafunc.h'
--- a/storage/myisam/mi_extrafunc.h	2009-11-25 12:25:01 +0000
+++ b/storage/myisam/mi_extrafunc.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_info.c'
--- a/storage/myisam/mi_info.c	2009-12-05 01:26:15 +0000
+++ b/storage/myisam/mi_info.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003-2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_key.c'
--- a/storage/myisam/mi_key.c	2010-08-26 12:36:33 +0000
+++ b/storage/myisam/mi_key.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_keycache.c'
--- a/storage/myisam/mi_keycache.c	2009-12-05 01:26:15 +0000
+++ b/storage/myisam/mi_keycache.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_locking.c'
--- a/storage/myisam/mi_locking.c	2010-07-20 19:30:10 +0000
+++ b/storage/myisam/mi_locking.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_log.c'
--- a/storage/myisam/mi_log.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/mi_log.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_open.c'
--- a/storage/myisam/mi_open.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/mi_open.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_packrec.c'
--- a/storage/myisam/mi_packrec.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/mi_packrec.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_page.c'
--- a/storage/myisam/mi_page.c	2010-07-02 19:38:04 +0000
+++ b/storage/myisam/mi_page.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004, 2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_panic.c'
--- a/storage/myisam/mi_panic.c	2009-12-05 01:26:15 +0000
+++ b/storage/myisam/mi_panic.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_preload.c'
--- a/storage/myisam/mi_preload.c	2010-07-08 21:20:08 +0000
+++ b/storage/myisam/mi_preload.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_range.c'
--- a/storage/myisam/mi_range.c	2010-09-24 22:19:30 +0000
+++ b/storage/myisam/mi_range.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004, 2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_rename.c'
--- a/storage/myisam/mi_rename.c	2010-07-23 20:15:07 +0000
+++ b/storage/myisam/mi_rename.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_rfirst.c'
--- a/storage/myisam/mi_rfirst.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisam/mi_rfirst.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001 MySQL AB
+/* Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_rkey.c'
--- a/storage/myisam/mi_rkey.c	2009-12-05 01:26:15 +0000
+++ b/storage/myisam/mi_rkey.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_rlast.c'
--- a/storage/myisam/mi_rlast.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisam/mi_rlast.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001 MySQL AB
+/* Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_rnext.c'
--- a/storage/myisam/mi_rnext.c	2010-04-02 15:17:43 +0000
+++ b/storage/myisam/mi_rnext.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_rnext_same.c'
--- a/storage/myisam/mi_rnext_same.c	2009-12-05 01:26:15 +0000
+++ b/storage/myisam/mi_rnext_same.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_rprev.c'
--- a/storage/myisam/mi_rprev.c	2009-12-05 01:26:15 +0000
+++ b/storage/myisam/mi_rprev.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_rrnd.c'
--- a/storage/myisam/mi_rrnd.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisam/mi_rrnd.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_rsame.c'
--- a/storage/myisam/mi_rsame.c	2009-12-05 01:26:15 +0000
+++ b/storage/myisam/mi_rsame.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_rsamepos.c'
--- a/storage/myisam/mi_rsamepos.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisam/mi_rsamepos.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_scan.c'
--- a/storage/myisam/mi_scan.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisam/mi_scan.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001 MySQL AB
+/* Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_search.c'
--- a/storage/myisam/mi_search.c	2010-09-24 22:19:30 +0000
+++ b/storage/myisam/mi_search.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_static.c'
--- a/storage/myisam/mi_static.c	2010-08-05 12:34:19 +0000
+++ b/storage/myisam/mi_static.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004-2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_statrec.c'
--- a/storage/myisam/mi_statrec.c	2010-07-02 15:21:07 +0000
+++ b/storage/myisam/mi_statrec.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_test1.c'
--- a/storage/myisam/mi_test1.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/mi_test1.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_test2.c'
--- a/storage/myisam/mi_test2.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/mi_test2.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_test3.c'
--- a/storage/myisam/mi_test3.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/mi_test3.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_unique.c'
--- a/storage/myisam/mi_unique.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/mi_unique.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_update.c'
--- a/storage/myisam/mi_update.c	2009-11-24 13:54:59 +0000
+++ b/storage/myisam/mi_update.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/mi_write.c'
--- a/storage/myisam/mi_write.c	2010-07-23 20:16:29 +0000
+++ b/storage/myisam/mi_write.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/myisam_ftdump.c'
--- a/storage/myisam/myisam_ftdump.c	2010-07-24 12:24:44 +0000
+++ b/storage/myisam/myisam_ftdump.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2006 MySQL AB
+/* Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/myisamchk.c'
--- a/storage/myisam/myisamchk.c	2010-07-23 20:16:29 +0000
+++ b/storage/myisam/myisamchk.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/myisamdef.h'
--- a/storage/myisam/myisamdef.h	2010-07-23 20:15:07 +0000
+++ b/storage/myisam/myisamdef.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/myisamlog.c'
--- a/storage/myisam/myisamlog.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/myisamlog.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/myisampack.c'
--- a/storage/myisam/myisampack.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/myisampack.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/rt_index.c'
--- a/storage/myisam/rt_index.c	2010-09-24 22:19:30 +0000
+++ b/storage/myisam/rt_index.c	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2002-2006 MySQL AB & Ramil Kalimullin
-   
+/* Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'storage/myisam/rt_index.h'
--- a/storage/myisam/rt_index.h	2006-12-31 00:32:21 +0000
+++ b/storage/myisam/rt_index.h	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2002, 2004 MySQL AB & Ramil Kalimullin
+/* Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'storage/myisam/rt_key.c'
--- a/storage/myisam/rt_key.c	2007-03-08 11:13:54 +0000
+++ b/storage/myisam/rt_key.c	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2000 MySQL AB & Ramil Kalimullin
-   
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'storage/myisam/rt_key.h'
--- a/storage/myisam/rt_key.h	2006-12-31 00:32:21 +0000
+++ b/storage/myisam/rt_key.h	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2002, 2004 MySQL AB & Ramil Kalimullin
+/* Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'storage/myisam/rt_mbr.c'
--- a/storage/myisam/rt_mbr.c	2007-10-05 10:43:15 +0000
+++ b/storage/myisam/rt_mbr.c	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2002-2004, 2006 MySQL AB & Ramil Kalimullin
-   
+/* Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'storage/myisam/rt_mbr.h'
--- a/storage/myisam/rt_mbr.h	2006-12-31 00:32:21 +0000
+++ b/storage/myisam/rt_mbr.h	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2002, 2004 MySQL AB & Ramil Kalimullin
-   
+/* Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'storage/myisam/rt_split.c'
--- a/storage/myisam/rt_split.c	2010-09-24 22:13:51 +0000
+++ b/storage/myisam/rt_split.c	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2002-2005 MySQL AB & Alexey Botchkov
-   
+/* Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'storage/myisam/rt_test.c'
--- a/storage/myisam/rt_test.c	2010-07-23 20:09:27 +0000
+++ b/storage/myisam/rt_test.c	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2002-2004 MySQL AB
-   
+/* Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'storage/myisam/sort.c'
--- a/storage/myisam/sort.c	2010-07-15 11:16:06 +0000
+++ b/storage/myisam/sort.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisam/sp_defs.h'
--- a/storage/myisam/sp_defs.h	2007-05-10 09:59:39 +0000
+++ b/storage/myisam/sp_defs.h	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2002, 2004 MySQL AB & Ramil Kalimullin
-   
+/* Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'storage/myisam/sp_key.c'
--- a/storage/myisam/sp_key.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/sp_key.c	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2000 MySQL AB & Ramil Kalimullin
-   
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'storage/myisam/sp_test.c'
--- a/storage/myisam/sp_test.c	2010-07-23 20:17:55 +0000
+++ b/storage/myisam/sp_test.c	2010-10-01 19:42:12 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2002-2004 MySQL AB
-   
+/* Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.
-   
+
    This program 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.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

=== modified file 'storage/myisammrg/ha_myisammrg.h'
--- a/storage/myisammrg/ha_myisammrg.h	2009-12-08 13:57:25 +0000
+++ b/storage/myisammrg/ha_myisammrg.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_close.c'
--- a/storage/myisammrg/myrg_close.c	2010-07-08 21:20:08 +0000
+++ b/storage/myisammrg/myrg_close.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_create.c'
--- a/storage/myisammrg/myrg_create.c	2009-12-05 01:26:15 +0000
+++ b/storage/myisammrg/myrg_create.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2005 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_def.h'
--- a/storage/myisammrg/myrg_def.h	2009-12-05 01:26:15 +0000
+++ b/storage/myisammrg/myrg_def.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_delete.c'
--- a/storage/myisammrg/myrg_delete.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisammrg/myrg_delete.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_extra.c'
--- a/storage/myisammrg/myrg_extra.c	2009-12-02 23:09:22 +0000
+++ b/storage/myisammrg/myrg_extra.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_info.c'
--- a/storage/myisammrg/myrg_info.c	2009-07-30 10:34:41 +0000
+++ b/storage/myisammrg/myrg_info.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_locking.c'
--- a/storage/myisammrg/myrg_locking.c	2007-07-25 14:56:17 +0000
+++ b/storage/myisammrg/myrg_locking.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_open.c'
--- a/storage/myisammrg/myrg_open.c	2010-07-20 19:30:10 +0000
+++ b/storage/myisammrg/myrg_open.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_panic.c'
--- a/storage/myisammrg/myrg_panic.c	2006-12-31 00:32:21 +0000
+++ b/storage/myisammrg/myrg_panic.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001 MySQL AB
+/* Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_queue.c'
--- a/storage/myisammrg/myrg_queue.c	2010-05-31 13:38:02 +0000
+++ b/storage/myisammrg/myrg_queue.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003, 2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_range.c'
--- a/storage/myisammrg/myrg_range.c	2006-12-31 00:32:21 +0000
+++ b/storage/myisammrg/myrg_range.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2004 MySQL AB
+/* Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_records.c'
--- a/storage/myisammrg/myrg_records.c	2008-04-25 21:45:58 +0000
+++ b/storage/myisammrg/myrg_records.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_rfirst.c'
--- a/storage/myisammrg/myrg_rfirst.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisammrg/myrg_rfirst.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_rkey.c'
--- a/storage/myisammrg/myrg_rkey.c	2009-08-28 16:21:54 +0000
+++ b/storage/myisammrg/myrg_rkey.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003, 2005 MySQL AB
+/* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_rlast.c'
--- a/storage/myisammrg/myrg_rlast.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisammrg/myrg_rlast.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_rnext.c'
--- a/storage/myisammrg/myrg_rnext.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisammrg/myrg_rnext.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_rnext_same.c'
--- a/storage/myisammrg/myrg_rnext_same.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisammrg/myrg_rnext_same.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2004 MySQL AB
+/* Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_rprev.c'
--- a/storage/myisammrg/myrg_rprev.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisammrg/myrg_rprev.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_rrnd.c'
--- a/storage/myisammrg/myrg_rrnd.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisammrg/myrg_rrnd.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_rsame.c'
--- a/storage/myisammrg/myrg_rsame.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisammrg/myrg_rsame.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_static.c'
--- a/storage/myisammrg/myrg_static.c	2009-12-05 01:26:15 +0000
+++ b/storage/myisammrg/myrg_static.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_update.c'
--- a/storage/myisammrg/myrg_update.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisammrg/myrg_update.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'storage/myisammrg/myrg_write.c'
--- a/storage/myisammrg/myrg_write.c	2007-05-10 09:59:39 +0000
+++ b/storage/myisammrg/myrg_write.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004 MySQL AB
+/* Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/bchange.c'
--- a/strings/bchange.c	2007-05-10 09:59:39 +0000
+++ b/strings/bchange.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/bfill.c'
--- a/strings/bfill.c	2010-07-26 21:16:48 +0000
+++ b/strings/bfill.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002 MySQL AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*  File   : bfill.c
     Author : Richard A. O'Keefe.

=== modified file 'strings/bmove.c'
--- a/strings/bmove.c	2010-07-26 21:16:48 +0000
+++ b/strings/bmove.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002 MySQL AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*  File   : bmove.c
     Author : Richard A. O'Keefe.

=== modified file 'strings/bmove_upp.c'
--- a/strings/bmove_upp.c	2010-07-26 21:16:48 +0000
+++ b/strings/bmove_upp.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/conf_to_src.c'
--- a/strings/conf_to_src.c	2009-10-15 10:17:32 +0000
+++ b/strings/conf_to_src.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype-big5.c'
--- a/strings/ctype-big5.c	2010-07-26 06:47:03 +0000
+++ b/strings/ctype-big5.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype-bin.c'
--- a/strings/ctype-bin.c	2009-11-11 16:03:02 +0000
+++ b/strings/ctype-bin.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002 MySQL AB & tommy@stripped.
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* This file is for binary pseudo charset, created by bar@stripped */
 

=== modified file 'strings/ctype-cp932.c'
--- a/strings/ctype-cp932.c	2010-07-26 06:47:03 +0000
+++ b/strings/ctype-cp932.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype-czech.c'
--- a/strings/ctype-czech.c	2010-07-15 11:16:06 +0000
+++ b/strings/ctype-czech.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype-euc_kr.c'
--- a/strings/ctype-euc_kr.c	2010-07-26 06:47:03 +0000
+++ b/strings/ctype-euc_kr.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype-eucjpms.c'
--- a/strings/ctype-eucjpms.c	2010-07-26 06:47:03 +0000
+++ b/strings/ctype-eucjpms.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002 MySQL AB & tommy@stripped.
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* This file is for Japanese EUC charset, and created based on
 ctype-ujis.c file.

=== modified file 'strings/ctype-extra.c'
--- a/strings/ctype-extra.c	2009-09-30 05:09:28 +0000
+++ b/strings/ctype-extra.c	2010-10-01 19:42:12 +0000
@@ -6,7 +6,7 @@
     ./conf_to_src ../sql/share/charsets/ > FILE
 */
 
-/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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 St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_global.h>
 #include <m_ctype.h>

=== modified file 'strings/ctype-gb2312.c'
--- a/strings/ctype-gb2312.c	2010-07-26 06:47:03 +0000
+++ b/strings/ctype-gb2312.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype-gbk.c'
--- a/strings/ctype-gbk.c	2010-07-26 06:47:03 +0000
+++ b/strings/ctype-gbk.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype-latin1.c'
--- a/strings/ctype-latin1.c	2009-11-11 16:03:02 +0000
+++ b/strings/ctype-latin1.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype-mb.c'
--- a/strings/ctype-mb.c	2010-07-26 06:47:03 +0000
+++ b/strings/ctype-mb.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype-simple.c'
--- a/strings/ctype-simple.c	2010-07-23 20:09:27 +0000
+++ b/strings/ctype-simple.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype-sjis.c'
--- a/strings/ctype-sjis.c	2010-07-26 06:47:03 +0000
+++ b/strings/ctype-sjis.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype-tis620.c'
--- a/strings/ctype-tis620.c	2010-07-15 11:16:06 +0000
+++ b/strings/ctype-tis620.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype-uca.c'
--- a/strings/ctype-uca.c	2010-03-04 12:02:30 +0000
+++ b/strings/ctype-uca.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2004 MySQL AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* 
    UCA (Unicode Collation Algorithm) support. 

=== modified file 'strings/ctype-ucs2.c'
--- a/strings/ctype-ucs2.c	2010-09-28 15:15:58 +0000
+++ b/strings/ctype-ucs2.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2000 MySQL AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* UCS2 support. Written by Alexander Barkov <bar@stripped> */
 

=== modified file 'strings/ctype-ujis.c'
--- a/strings/ctype-ujis.c	2010-07-26 06:47:03 +0000
+++ b/strings/ctype-ujis.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002 MySQL AB & tommy@stripped.
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* This file is for Japanese EUC charset, and created by tommy@stripped.
  */

=== modified file 'strings/ctype-utf8.c'
--- a/strings/ctype-utf8.c	2010-09-28 15:15:58 +0000
+++ b/strings/ctype-utf8.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
 
-   This library is distributed in the hope that it will be useful,
+   This program 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
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* UTF8 according RFC 2279 */
 /* Written by Alexander Barkov <bar@stripped> */

=== modified file 'strings/ctype-win1250ch.c'
--- a/strings/ctype-win1250ch.c	2010-07-15 11:16:06 +0000
+++ b/strings/ctype-win1250ch.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/ctype.c'
--- a/strings/ctype.c	2009-11-09 09:45:40 +0000
+++ b/strings/ctype.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/decimal.c'
--- a/strings/decimal.c	2010-07-20 19:30:10 +0000
+++ b/strings/decimal.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/do_ctype.c'
--- a/strings/do_ctype.c	2010-07-23 20:16:29 +0000
+++ b/strings/do_ctype.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/dtoa.c'
--- a/strings/dtoa.c	2010-06-01 17:37:45 +0000
+++ b/strings/dtoa.c	2010-10-01 19:42:12 +0000
@@ -1,9 +1,8 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /****************************************************************
 

=== modified file 'strings/dump_map.c'
--- a/strings/dump_map.c	2006-12-31 00:02:27 +0000
+++ b/strings/dump_map.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2004 MySQL AB
+/* Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <stdio.h>
 #include <string.h>

=== modified file 'strings/int2str.c'
--- a/strings/int2str.c	2010-07-15 11:16:06 +0000
+++ b/strings/int2str.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/is_prefix.c'
--- a/strings/is_prefix.c	2006-12-23 19:17:15 +0000
+++ b/strings/is_prefix.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/llstr.c'
--- a/strings/llstr.c	2007-11-30 05:32:04 +0000
+++ b/strings/llstr.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/longlong2str.c'
--- a/strings/longlong2str.c	2009-12-22 09:35:56 +0000
+++ b/strings/longlong2str.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/longlong2str_asm.c'
--- a/strings/longlong2str_asm.c	2010-01-19 13:30:55 +0000
+++ b/strings/longlong2str_asm.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/my_strchr.c'
--- a/strings/my_strchr.c	2007-02-23 11:13:55 +0000
+++ b/strings/my_strchr.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/my_strtoll10.c'
--- a/strings/my_strtoll10.c	2010-07-15 11:13:30 +0000
+++ b/strings/my_strtoll10.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/my_vsnprintf.c'
--- a/strings/my_vsnprintf.c	2010-09-15 11:33:22 +0000
+++ b/strings/my_vsnprintf.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/str2int.c'
--- a/strings/str2int.c	2006-12-23 19:17:15 +0000
+++ b/strings/str2int.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/str_alloc.c'
--- a/strings/str_alloc.c	2006-12-23 19:17:15 +0000
+++ b/strings/str_alloc.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/str_test.c'
--- a/strings/str_test.c	2010-07-23 20:17:14 +0000
+++ b/strings/str_test.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strappend.c'
--- a/strings/strappend.c	2007-05-10 09:59:39 +0000
+++ b/strings/strappend.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strcend.c'
--- a/strings/strcend.c	2010-07-26 21:16:48 +0000
+++ b/strings/strcend.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strcont.c'
--- a/strings/strcont.c	2007-05-10 09:59:39 +0000
+++ b/strings/strcont.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strend.c'
--- a/strings/strend.c	2010-07-26 21:16:48 +0000
+++ b/strings/strend.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002 MySQL AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*  File   : strend.c
     Author : Richard A. O'Keefe.

=== modified file 'strings/strfill.c'
--- a/strings/strfill.c	2007-05-10 09:59:39 +0000
+++ b/strings/strfill.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strmake.c'
--- a/strings/strmake.c	2009-07-16 13:17:47 +0000
+++ b/strings/strmake.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strmov.c'
--- a/strings/strmov.c	2010-07-26 21:16:48 +0000
+++ b/strings/strmov.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strnlen.c'
--- a/strings/strnlen.c	2007-05-10 09:59:39 +0000
+++ b/strings/strnlen.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strnmov.c'
--- a/strings/strnmov.c	2007-05-10 09:59:39 +0000
+++ b/strings/strnmov.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strstr.c'
--- a/strings/strstr.c	2006-12-23 19:17:15 +0000
+++ b/strings/strstr.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002 MySQL AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*  File   : strstr.c
     Author : Monty

=== modified file 'strings/strto.c'
--- a/strings/strto.c	2007-05-10 09:59:39 +0000
+++ b/strings/strto.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strtol.c'
--- a/strings/strtol.c	2010-07-15 11:16:06 +0000
+++ b/strings/strtol.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strtoll.c'
--- a/strings/strtoll.c	2006-12-23 19:17:15 +0000
+++ b/strings/strtoll.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strtoul.c'
--- a/strings/strtoul.c	2010-07-15 11:16:06 +0000
+++ b/strings/strtoul.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strtoull.c'
--- a/strings/strtoull.c	2006-12-23 19:17:15 +0000
+++ b/strings/strtoull.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/strxmov.c'
--- a/strings/strxmov.c	2006-12-23 19:17:15 +0000
+++ b/strings/strxmov.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002 MySQL AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*  File   : strxmov.c
     Author : Richard A. O'Keefe.

=== modified file 'strings/strxnmov.c'
--- a/strings/strxnmov.c	2007-05-10 09:59:39 +0000
+++ b/strings/strxnmov.c	2010-10-01 19:42:12 +0000
@@ -1,19 +1,17 @@
-/* Copyright (C) 2002 MySQL AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; version 2
-   of the License.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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
-   Library General Public License for more details.
-   
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*  File   : strxnmov.c
     Author : Richard A. O'Keefe.

=== modified file 'strings/t_ctype.h'
--- a/strings/t_ctype.h	2006-12-23 19:17:15 +0000
+++ b/strings/t_ctype.h	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'strings/uca-dump.c'
--- a/strings/uca-dump.c	2006-12-31 00:02:27 +0000
+++ b/strings/uca-dump.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <stdio.h>
 #include <stdlib.h>

=== modified file 'strings/uctypedump.c'
--- a/strings/uctypedump.c	2006-12-31 01:29:11 +0000
+++ b/strings/uctypedump.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
 #include <stdio.h>

=== modified file 'strings/utr11-dump.c'
--- a/strings/utr11-dump.c	2006-12-31 00:02:27 +0000
+++ b/strings/utr11-dump.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <stdio.h>
 #include <stdlib.h>

=== modified file 'strings/xml.c'
--- a/strings/xml.c	2010-07-02 18:30:47 +0000
+++ b/strings/xml.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'tests/bug25714.c'
--- a/tests/bug25714.c	2009-02-13 16:41:47 +0000
+++ b/tests/bug25714.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'tests/connect_test.c'
--- a/tests/connect_test.c	2006-12-23 19:17:15 +0000
+++ b/tests/connect_test.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'tests/deadlock_test.c'
--- a/tests/deadlock_test.c	2006-12-31 00:02:27 +0000
+++ b/tests/deadlock_test.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003-2004, 2006 MySQL AB
+/* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'tests/insert_test.c'
--- a/tests/insert_test.c	2006-12-23 19:17:15 +0000
+++ b/tests/insert_test.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'tests/list_test.c'
--- a/tests/list_test.c	2006-12-23 19:17:15 +0000
+++ b/tests/list_test.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2010-09-07 07:49:47 +0000
+++ b/tests/mysql_client_test.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2004 MySQL AB
+/* Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'tests/select_test.c'
--- a/tests/select_test.c	2006-12-23 19:17:15 +0000
+++ b/tests/select_test.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'tests/showdb_test.c'
--- a/tests/showdb_test.c	2006-12-23 19:17:15 +0000
+++ b/tests/showdb_test.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'tests/ssl_test.c'
--- a/tests/ssl_test.c	2007-09-13 14:19:46 +0000
+++ b/tests/ssl_test.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'tests/thread_test.c'
--- a/tests/thread_test.c	2010-07-24 12:24:44 +0000
+++ b/tests/thread_test.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'unittest/examples/core-t.c'
--- a/unittest/examples/core-t.c	2009-11-18 04:29:26 +0000
+++ b/unittest/examples/core-t.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_global.h>
 

=== modified file 'unittest/examples/simple-t.c'
--- a/unittest/examples/simple-t.c	2006-12-31 01:29:11 +0000
+++ b/unittest/examples/simple-t.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <tap.h>
 

=== modified file 'unittest/examples/skip-t.c'
--- a/unittest/examples/skip-t.c	2006-12-31 01:29:11 +0000
+++ b/unittest/examples/skip-t.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <tap.h>
 #include <stdlib.h>

=== modified file 'unittest/examples/skip_all-t.c'
--- a/unittest/examples/skip_all-t.c	2009-11-18 04:29:26 +0000
+++ b/unittest/examples/skip_all-t.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_global.h>
 

=== modified file 'unittest/examples/todo-t.c'
--- a/unittest/examples/todo-t.c	2009-11-18 04:29:26 +0000
+++ b/unittest/examples/todo-t.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_global.h>
 

=== modified file 'unittest/mysys/base64-t.c'
--- a/unittest/mysys/base64-t.c	2009-09-23 13:21:29 +0000
+++ b/unittest/mysys/base64-t.c	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the License.
-
-   This program 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.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_global.h>
 #include <my_sys.h>

=== modified file 'unittest/mysys/bitmap-t.c'
--- a/unittest/mysys/bitmap-t.c	2008-02-18 22:29:39 +0000
+++ b/unittest/mysys/bitmap-t.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,12 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-   This test was copied from the unit test inside the
-   mysys/my_bitmap.c file and adapted by Mats Kindahl to use the mytap
-   library.
-*/
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_global.h>
 #include <my_sys.h>

=== modified file 'unittest/mysys/lf-t.c'
--- a/unittest/mysys/lf-t.c	2009-11-18 02:31:40 +0000
+++ b/unittest/mysys/lf-t.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'unittest/mysys/my_atomic-t.c'
--- a/unittest/mysys/my_atomic-t.c	2010-07-23 12:37:10 +0000
+++ b/unittest/mysys/my_atomic-t.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'unittest/mysys/my_rdtsc-t.c'
--- a/unittest/mysys/my_rdtsc-t.c	2009-11-24 23:36:31 +0000
+++ b/unittest/mysys/my_rdtsc-t.c	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program 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.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
   rdtsc3 -- multi-platform timer code

=== modified file 'unittest/mysys/my_vsnprintf-t.c'
--- a/unittest/mysys/my_vsnprintf-t.c	2010-09-15 11:33:22 +0000
+++ b/unittest/mysys/my_vsnprintf-t.c	2010-10-01 19:42:12 +0000
@@ -1,17 +1,17 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; version 2 of the License.
-
-   This program 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.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program 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.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <my_global.h>
 #include <m_string.h>

=== modified file 'unittest/mysys/thr_template.c'
--- a/unittest/mysys/thr_template.c	2009-11-18 00:11:32 +0000
+++ b/unittest/mysys/thr_template.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'unittest/mytap/t/basic-t.c'
--- a/unittest/mytap/t/basic-t.c	2006-12-31 01:29:11 +0000
+++ b/unittest/mytap/t/basic-t.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "my_config.h"
 

=== modified file 'vio/test-ssl.c'
--- a/vio/test-ssl.c	2010-07-15 11:13:30 +0000
+++ b/vio/test-ssl.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'vio/test-sslclient.c'
--- a/vio/test-sslclient.c	2010-07-08 21:20:08 +0000
+++ b/vio/test-sslclient.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'vio/test-sslserver.c'
--- a/vio/test-sslserver.c	2010-07-08 21:20:08 +0000
+++ b/vio/test-sslserver.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'vio/vio.c'
--- a/vio/vio.c	2010-08-16 12:50:27 +0000
+++ b/vio/vio.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'vio/vio_priv.h'
--- a/vio/vio_priv.h	2010-06-07 14:01:39 +0000
+++ b/vio/vio_priv.h	2010-10-01 19:42:12 +0000
@@ -1,7 +1,7 @@
 #ifndef VIO_PRIV_INCLUDED
 #define VIO_PRIV_INCLUDED
 
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'vio/viosocket.c'
--- a/vio/viosocket.c	2010-08-16 12:50:27 +0000
+++ b/vio/viosocket.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'vio/viossl.c'
--- a/vio/viossl.c	2010-08-16 12:50:27 +0000
+++ b/vio/viossl.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'vio/viosslfactories.c'
--- a/vio/viosslfactories.c	2010-07-15 11:13:30 +0000
+++ b/vio/viosslfactories.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'vio/viotest-ssl.c'
--- a/vio/viotest-ssl.c	2010-07-08 21:20:08 +0000
+++ b/vio/viotest-ssl.c	2010-10-01 19:42:12 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


Attachment: [text/bzr-bundle] bzr/alexander.nozdrin@oracle.com-20101001194212-f041a4nw2np0qn4e.bundle
Thread
bzr commit into mysql-5.5-bugteam branch (alexander.nozdrin:3210) Bug#57094Alexander Nozdrin1 Oct