3281 Marc Alff 2010-07-02
Updated copyright headers
modified:
sql/authors.h
sql/client_settings.h
sql/contributors.h
sql/custom_conf.h
sql/event_data_objects.h
sql/event_db_repository.h
sql/field_conv.cc
sql/frm_crypt.cc
sql/gstream.cc
sql/gstream.h
sql/ha_ndbcluster_cond.cc
sql/ha_ndbcluster_cond.h
sql/ha_ndbcluster_tables.h
sql/hash_filo.cc
sql/init.cc
sql/item_buff.cc
sql/item_geofunc.cc
sql/item_geofunc.h
sql/item_row.cc
sql/item_row.h
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/lex.h
sql/lex_symbol.h
sql/log_event_old.h
sql/mdl.cc
sql/mdl.h
sql/mf_iocache.cc
sql/my_decimal.cc
sql/my_decimal.h
sql/mysqld_suffix.h
sql/net_serv.cc
sql/opt_range.h
sql/parse_file.h
sql/procedure.cc
sql/procedure.h
sql/protocol.h
sql/records.cc
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_record.cc
sql/rpl_record.h
sql/rpl_record_old.h
sql/rpl_tblmap.cc
sql/rpl_tblmap.h
sql/rpl_utility.cc
sql/rpl_utility.h
sql/scheduler.h
sql/sha2.cc
sql/sp.cc
sql/sp.h
sql/sp_cache.h
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_analyse.cc
sql/sql_analyse.h
sql/sql_array.h
sql/sql_audit.h
sql/sql_binlog.cc
sql/sql_bitmap.h
sql/sql_client.cc
sql/sql_crypt.cc
sql/sql_crypt.h
sql/sql_cursor.cc
sql/sql_cursor.h
sql/sql_derived.cc
sql/sql_do.cc
sql/sql_help.cc
sql/sql_list.cc
sql/sql_list.h
sql/sql_locale.cc
sql/sql_map.h
sql/sql_olap.cc
sql/sql_plist.h
sql/sql_prepare.h
sql/sql_profile.h
sql/sql_select.h
sql/sql_servers.h
sql/sql_sort.h
sql/sql_string.cc
sql/sql_string.h
sql/sql_tablespace.cc
sql/sql_time.cc
sql/sql_trigger.h
sql/sql_udf.h
sql/sql_view.h
sql/strfunc.cc
sql/structs.h
sql/thr_malloc.cc
sql/tzfile.h
sql/tztime.h
sql/uniques.cc
sql/unireg.h
3280 Alexander Nozdrin 2010-07-02 [merge]
Auto-merge from mysql-trunk-bugfixing.
modified:
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/rpl_ndb/t/disabled.def
=== modified file 'sql/authors.h'
--- a/sql/authors.h 2010-06-19 07:50:33 +0000
+++ b/sql/authors.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,8 @@
#ifndef AUTHORS_INCLUDED
#define AUTHORS_INCLUDED
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 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/client_settings.h'
--- a/sql/client_settings.h 2010-07-02 02:58:51 +0000
+++ b/sql/client_settings.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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/contributors.h'
--- a/sql/contributors.h 2009-09-23 21:32:31 +0000
+++ b/sql/contributors.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef CONTRIBUTORS_INCLUDED
#define CONTRIBUTORS_INCLUDED
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, 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/custom_conf.h'
--- a/sql/custom_conf.h 2010-07-02 02:58:51 +0000
+++ b/sql/custom_conf.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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/event_data_objects.h'
--- a/sql/event_data_objects.h 2010-07-02 02:58:51 +0000
+++ b/sql/event_data_objects.h 2010-07-02 18:15:21 +0000
@@ -1,6 +1,6 @@
#ifndef _EVENT_DATA_OBJECTS_H_
#define _EVENT_DATA_OBJECTS_H_
-/* Copyright (C) 2004-2006 MySQL AB
+/* Copyright (c) 2004, 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/event_db_repository.h'
--- a/sql/event_db_repository.h 2010-07-02 02:58:51 +0000
+++ b/sql/event_db_repository.h 2010-07-02 18:15:21 +0000
@@ -1,6 +1,6 @@
#ifndef _EVENT_DB_REPOSITORY_H_
#define _EVENT_DB_REPOSITORY_H_
-/* Copyright (C) 2004-2006 MySQL AB
+/* Copyright (c) 2004, 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/field_conv.cc'
--- a/sql/field_conv.cc 2010-07-02 02:58:51 +0000
+++ b/sql/field_conv.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* 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/frm_crypt.cc'
--- a/sql/frm_crypt.cc 2010-07-02 02:58:51 +0000
+++ b/sql/frm_crypt.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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/gstream.cc'
--- a/sql/gstream.cc 2010-07-02 02:58:51 +0000
+++ b/sql/gstream.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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/gstream.h'
--- a/sql/gstream.h 2010-07-02 02:58:51 +0000
+++ b/sql/gstream.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef GSTREAM_INCLUDED
#define GSTREAM_INCLUDED
-/* Copyright (C) 2000-2004 MySQL AB
+/* 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/ha_ndbcluster_cond.cc'
--- a/sql/ha_ndbcluster_cond.cc 2010-07-02 02:58:51 +0000
+++ b/sql/ha_ndbcluster_cond.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* 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/ha_ndbcluster_cond.h'
--- a/sql/ha_ndbcluster_cond.h 2010-07-02 02:58:51 +0000
+++ b/sql/ha_ndbcluster_cond.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef HA_NDBCLUSTER_COND_INCLUDED
#define HA_NDBCLUSTER_COND_INCLUDED
-/* Copyright (C) 2000-2007 MySQL AB
+/* 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/ha_ndbcluster_tables.h'
--- a/sql/ha_ndbcluster_tables.h 2010-07-02 02:58:51 +0000
+++ b/sql/ha_ndbcluster_tables.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef HA_NDBCLUSTER_TABLES_INCLUDED
#define HA_NDBCLUSTER_TABLES_INCLUDED
-/* Copyright (C) 2000-2003 MySQL AB
+/* 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/hash_filo.cc'
--- a/sql/hash_filo.cc 2010-07-02 02:58:51 +0000
+++ b/sql/hash_filo.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2005 MySQL AB
+/* 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/init.cc'
--- a/sql/init.cc 2010-07-02 02:58:51 +0000
+++ b/sql/init.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB
+/* 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/item_buff.cc'
--- a/sql/item_buff.cc 2010-07-02 02:58:51 +0000
+++ b/sql/item_buff.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* 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/item_geofunc.cc'
--- a/sql/item_geofunc.cc 2010-07-02 02:58:51 +0000
+++ b/sql/item_geofunc.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2006 MySQL AB
+/* Copyright (c) 2003, 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/item_geofunc.h'
--- a/sql/item_geofunc.h 2010-07-02 02:58:51 +0000
+++ b/sql/item_geofunc.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef ITEM_GEOFUNC_INCLUDED
#define ITEM_GEOFUNC_INCLUDED
-/* Copyright (C) 2000-2003 MySQL AB
+/* 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/item_row.cc'
--- a/sql/item_row.cc 2010-07-02 02:58:51 +0000
+++ b/sql/item_row.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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/item_row.h'
--- a/sql/item_row.h 2010-07-02 02:58:51 +0000
+++ b/sql/item_row.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef ITEM_ROW_INCLUDED
#define ITEM_ROW_INCLUDED
-/* Copyright (C) 2000 MySQL AB
+/* 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/item_strfunc.h'
--- a/sql/item_strfunc.h 2010-07-02 02:58:51 +0000
+++ b/sql/item_strfunc.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef ITEM_STRFUNC_INCLUDED
#define ITEM_STRFUNC_INCLUDED
-/* Copyright (C) 2000-2003 MySQL AB
+/* 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/item_subselect.cc'
--- a/sql/item_subselect.cc 2010-07-02 02:58:51 +0000
+++ b/sql/item_subselect.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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/item_subselect.h'
--- a/sql/item_subselect.h 2010-07-02 02:58:51 +0000
+++ b/sql/item_subselect.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef ITEM_SUBSELECT_INCLUDED
#define ITEM_SUBSELECT_INCLUDED
-/* Copyright (C) 2000 MySQL AB
+/* 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/item_timefunc.cc'
--- a/sql/item_timefunc.cc 2010-07-02 02:58:51 +0000
+++ b/sql/item_timefunc.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* 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/item_timefunc.h'
--- a/sql/item_timefunc.h 2010-07-02 02:58:51 +0000
+++ b/sql/item_timefunc.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef ITEM_TIMEFUNC_INCLUDED
#define ITEM_TIMEFUNC_INCLUDED
-/* Copyright (C) 2000-2006 MySQL AB
+/* 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/item_xmlfunc.cc'
--- a/sql/item_xmlfunc.cc 2010-03-31 14:05:33 +0000
+++ b/sql/item_xmlfunc.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 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/item_xmlfunc.h'
--- a/sql/item_xmlfunc.h 2010-07-02 02:58:51 +0000
+++ b/sql/item_xmlfunc.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef ITEM_XMLFUNC_INCLUDED
#define ITEM_XMLFUNC_INCLUDED
-/* Copyright (C) 2000-2005 MySQL AB
+/* 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/key.cc'
--- a/sql/key.cc 2010-07-02 02:58:51 +0000
+++ b/sql/key.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* 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/lex.h'
--- a/sql/lex.h 2010-07-02 02:58:51 +0000
+++ b/sql/lex.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef LEX_INCLUDED
#define LEX_INCLUDED
-/* Copyright (C) 2000-2002 MySQL AB
+/* 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/lex_symbol.h'
--- a/sql/lex_symbol.h 2010-07-02 02:58:51 +0000
+++ b/sql/lex_symbol.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2004 MySQL AB
+/* 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/log_event_old.h'
--- a/sql/log_event_old.h 2010-07-02 02:58:51 +0000
+++ b/sql/log_event_old.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2007 MySQL AB. All rights reserved.
+/* 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/mdl.cc'
--- a/sql/mdl.cc 2010-07-02 02:58:51 +0000
+++ b/sql/mdl.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2008 MySQL AB
+/* 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/mdl.h'
--- a/sql/mdl.h 2010-07-02 02:58:51 +0000
+++ b/sql/mdl.h 2010-07-02 18:15:21 +0000
@@ -1,6 +1,6 @@
#ifndef MDL_H
#define MDL_H
-/* Copyright (C) 2007-2008 MySQL AB
+/* 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/mf_iocache.cc'
--- a/sql/mf_iocache.cc 2010-07-02 02:58:51 +0000
+++ b/sql/mf_iocache.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* 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/my_decimal.cc'
--- a/sql/my_decimal.cc 2010-07-02 02:58:51 +0000
+++ b/sql/my_decimal.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 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/my_decimal.h'
--- a/sql/my_decimal.h 2010-07-02 02:58:51 +0000
+++ b/sql/my_decimal.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 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/mysqld_suffix.h'
--- a/sql/mysqld_suffix.h 2010-07-02 02:58:51 +0000
+++ b/sql/mysqld_suffix.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef MYSQLD_SUFFIX_INCLUDED
#define MYSQLD_SUFFIX_INCLUDED
-/* Copyright (C) 2000-2004 MySQL AB
+/* 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/net_serv.cc'
--- a/sql/net_serv.cc 2010-07-02 02:58:51 +0000
+++ b/sql/net_serv.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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/opt_range.h'
--- a/sql/opt_range.h 2010-07-02 02:58:51 +0000
+++ b/sql/opt_range.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* 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/parse_file.h'
--- a/sql/parse_file.h 2010-07-02 02:58:51 +0000
+++ b/sql/parse_file.h 2010-07-02 18:15:21 +0000
@@ -1,5 +1,5 @@
/* -*- C++ -*- */
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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/procedure.cc'
--- a/sql/procedure.cc 2010-07-02 02:58:51 +0000
+++ b/sql/procedure.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004-2005 MySQL AB
+/* 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/procedure.h'
--- a/sql/procedure.h 2010-07-02 02:58:51 +0000
+++ b/sql/procedure.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef PROCEDURE_INCLUDED
#define PROCEDURE_INCLUDED
-/* Copyright (C) 2000-2005 MySQL AB
+/* 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/protocol.h'
--- a/sql/protocol.h 2010-07-02 02:58:51 +0000
+++ b/sql/protocol.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef PROTOCOL_INCLUDED
#define PROTOCOL_INCLUDED
-/* Copyright (C) 2002-2006 MySQL AB
+/* 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/records.cc'
--- a/sql/records.cc 2010-07-02 02:58:51 +0000
+++ b/sql/records.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* 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/rpl_filter.cc'
--- a/sql/rpl_filter.cc 2010-07-02 02:58:51 +0000
+++ b/sql/rpl_filter.cc 2010-07-02 18:15:21 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2000-2003 MySQL AB
-
+/* 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
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,
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
=== modified file 'sql/rpl_filter.h'
--- a/sql/rpl_filter.h 2010-07-02 02:58:51 +0000
+++ b/sql/rpl_filter.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* 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/rpl_handler.cc'
--- a/sql/rpl_handler.cc 2010-07-02 02:58:51 +0000
+++ b/sql/rpl_handler.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 MySQL AB
+/* 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
=== modified file 'sql/rpl_handler.h'
--- a/sql/rpl_handler.h 2010-07-02 02:58:51 +0000
+++ b/sql/rpl_handler.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 MySQL AB
+/* 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
=== modified file 'sql/rpl_injector.cc'
--- a/sql/rpl_injector.cc 2010-06-22 06:03:00 +0000
+++ b/sql/rpl_injector.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, 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/rpl_injector.h'
--- a/sql/rpl_injector.h 2010-03-31 14:05:33 +0000
+++ b/sql/rpl_injector.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, 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/rpl_record.cc'
--- a/sql/rpl_record.cc 2010-07-02 02:58:51 +0000
+++ b/sql/rpl_record.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2007 MySQL AB. All rights reserved.
+/* 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/rpl_record.h'
--- a/sql/rpl_record.h 2010-07-02 02:58:51 +0000
+++ b/sql/rpl_record.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2007 MySQL AB. All rights reserved.
+/* 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/rpl_record_old.h'
--- a/sql/rpl_record_old.h 2010-07-02 02:58:51 +0000
+++ b/sql/rpl_record_old.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2007 MySQL AB. All rights reserved.
+/* 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/rpl_tblmap.cc'
--- a/sql/rpl_tblmap.cc 2010-07-02 02:58:51 +0000
+++ b/sql/rpl_tblmap.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, 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/rpl_tblmap.h'
--- a/sql/rpl_tblmap.h 2010-07-02 02:58:51 +0000
+++ b/sql/rpl_tblmap.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, 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/rpl_utility.cc'
--- a/sql/rpl_utility.cc 2010-06-19 07:50:33 +0000
+++ b/sql/rpl_utility.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, 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/rpl_utility.h'
--- a/sql/rpl_utility.h 2010-06-19 07:50:33 +0000
+++ b/sql/rpl_utility.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, 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-07-02 02:58:51 +0000
+++ b/sql/scheduler.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef SCHEDULER_INCLUDED
#define SCHEDULER_INCLUDED
-/* Copyright (C) 2007 MySQL AB
+/* 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/sha2.cc'
--- a/sql/sha2.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sha2.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 MySQL AB
+/* 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/sp.cc'
--- a/sql/sp.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sp.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB
+/* 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.h'
--- a/sql/sp.h 2010-07-02 02:58:51 +0000
+++ b/sql/sp.h 2010-07-02 18:15:21 +0000
@@ -1,5 +1,5 @@
/* -*- C++ -*- */
-/* Copyright (C) 2002 MySQL AB
+/* 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_cache.h'
--- a/sql/sp_cache.h 2010-07-02 02:58:51 +0000
+++ b/sql/sp_cache.h 2010-07-02 18:15:21 +0000
@@ -1,5 +1,5 @@
/* -*- C++ -*- */
-/* Copyright (C) 2002 MySQL AB
+/* 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-07-02 02:58:51 +0000
+++ b/sql/sp_head.h 2010-07-02 18:15:21 +0000
@@ -1,5 +1,5 @@
/* -*- C++ -*- */
-/* Copyright (C) 2002 MySQL AB
+/* 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_pcontext.cc'
--- a/sql/sp_pcontext.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sp_pcontext.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB
+/* 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_pcontext.h'
--- a/sql/sp_pcontext.h 2010-07-02 02:58:51 +0000
+++ b/sql/sp_pcontext.h 2010-07-02 18:15:21 +0000
@@ -1,5 +1,5 @@
/* -*- C++ -*- */
-/* Copyright (C) 2002 MySQL AB
+/* 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_rcontext.cc'
--- a/sql/sp_rcontext.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sp_rcontext.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 MySQL AB
+/* 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_rcontext.h'
--- a/sql/sp_rcontext.h 2010-07-02 02:58:51 +0000
+++ b/sql/sp_rcontext.h 2010-07-02 18:15:21 +0000
@@ -1,5 +1,5 @@
/* -*- C++ -*- */
-/* Copyright (C) 2002 MySQL AB
+/* 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/spatial.cc'
--- a/sql/spatial.cc 2010-07-02 02:58:51 +0000
+++ b/sql/spatial.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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/spatial.h'
--- a/sql/spatial.h 2010-07-02 02:58:51 +0000
+++ b/sql/spatial.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2006 MySQL AB
+/* 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/sql_analyse.cc'
--- a/sql/sql_analyse.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_analyse.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* 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/sql_analyse.h'
--- a/sql/sql_analyse.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_analyse.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef SQL_ANALYSE_INCLUDED
#define SQL_ANALYSE_INCLUDED
-/* Copyright (C) 2000-2003, 2005 MySQL AB
+/* 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/sql_array.h'
--- a/sql/sql_array.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_array.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef SQL_ARRAY_INCLUDED
#define SQL_ARRAY_INCLUDED
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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/sql_audit.h'
--- a/sql/sql_audit.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_audit.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef SQL_AUDIT_INCLUDED
#define SQL_AUDIT_INCLUDED
-/* Copyright (C) 2007 MySQL AB
+/* 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/sql_binlog.cc'
--- a/sql/sql_binlog.cc 2010-06-22 12:58:10 +0000
+++ b/sql/sql_binlog.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 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/sql_bitmap.h'
--- a/sql/sql_bitmap.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_bitmap.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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/sql_client.cc'
--- a/sql/sql_client.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_client.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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/sql_crypt.cc'
--- a/sql/sql_crypt.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_crypt.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003, 2005 MySQL AB
+/* 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/sql_crypt.h'
--- a/sql/sql_crypt.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_crypt.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef SQL_CRYPT_INCLUDED
#define SQL_CRYPT_INCLUDED
-/* Copyright (C) 2000-2001, 2005 MySQL AB
+/* 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/sql_cursor.cc'
--- a/sql/sql_cursor.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_cursor.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005-2006 MySQL AB
+/* Copyright (c) 2005, 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/sql_cursor.h'
--- a/sql/sql_cursor.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_cursor.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, 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/sql_derived.cc'
--- a/sql/sql_derived.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_derived.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2003 MySQL AB
+/* 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/sql_do.cc'
--- a/sql/sql_do.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_do.cc 2010-07-02 18:15:21 +0000
@@ -1,14 +1,14 @@
-/* Copyright (C) 2000-2006 MySQL AB
-
+/* 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
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,
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
=== modified file 'sql/sql_help.cc'
--- a/sql/sql_help.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_help.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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/sql_list.cc'
--- a/sql/sql_list.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_list.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003, 2005 MySQL AB
+/* 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/sql_list.h'
--- a/sql/sql_list.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_list.h 2010-07-02 18:15:21 +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, 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/sql_locale.cc'
--- a/sql/sql_locale.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_locale.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, 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/sql_map.h'
--- a/sql/sql_map.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_map.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef SQL_MAP_INCLUDED
#define SQL_MAP_INCLUDED
-/* Copyright (C) 2000-2001, 2005 MySQL AB
+/* 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/sql_olap.cc'
--- a/sql/sql_olap.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_olap.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* 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/sql_plist.h'
--- a/sql/sql_plist.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_plist.h 2010-07-02 18:15:21 +0000
@@ -1,6 +1,6 @@
#ifndef SQL_PLIST_H
#define SQL_PLIST_H
-/* Copyright (C) 2008 MySQL AB
+/* 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
=== modified file 'sql/sql_prepare.h'
--- a/sql/sql_prepare.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_prepare.h 2010-07-02 18:15:21 +0000
@@ -1,6 +1,6 @@
#ifndef SQL_PREPARE_H
#define SQL_PREPARE_H
-/* Copyright (C) 1995-2008 MySQL AB
+/* Copyright (c) 1995, 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/sql_profile.h'
--- a/sql/sql_profile.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_profile.h 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 MySQL AB
+/* 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/sql_select.h'
--- a/sql/sql_select.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_select.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef SQL_SELECT_INCLUDED
#define SQL_SELECT_INCLUDED
-/* Copyright (C) 2000-2006 MySQL AB
+/* 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/sql_servers.h'
--- a/sql/sql_servers.h 2010-06-22 06:03:00 +0000
+++ b/sql/sql_servers.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef SQL_SERVERS_INCLUDED
#define SQL_SERVERS_INCLUDED
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, 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/sql_sort.h'
--- a/sql/sql_sort.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_sort.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef SQL_SORT_INCLUDED
#define SQL_SORT_INCLUDED
-/* Copyright (C) 2000 MySQL AB
+/* 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/sql_string.cc'
--- a/sql/sql_string.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_string.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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/sql_string.h'
--- a/sql/sql_string.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_string.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef SQL_STRING_INCLUDED
#define SQL_STRING_INCLUDED
-/* Copyright (C) 2000 MySQL AB
+/* 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/sql_tablespace.cc'
--- a/sql/sql_tablespace.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_tablespace.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* 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/sql_time.cc'
--- a/sql/sql_time.cc 2010-07-02 02:58:51 +0000
+++ b/sql/sql_time.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* 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/sql_trigger.h'
--- a/sql/sql_trigger.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_trigger.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef SQL_TRIGGER_INCLUDED
#define SQL_TRIGGER_INCLUDED
-/* Copyright (C) 2004-2005 MySQL AB
+/* Copyright (c) 2004, 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/sql_udf.h'
--- a/sql/sql_udf.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_udf.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef SQL_UDF_INCLUDED
#define SQL_UDF_INCLUDED
-/* Copyright (C) 2000-2001, 2003-2006 MySQL AB
+/* 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/sql_view.h'
--- a/sql/sql_view.h 2010-07-02 02:58:51 +0000
+++ b/sql/sql_view.h 2010-07-02 18:15:21 +0000
@@ -2,7 +2,7 @@
#define SQL_VIEW_INCLUDED
/* -*- C++ -*- */
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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/strfunc.cc'
--- a/sql/strfunc.cc 2010-07-02 02:58:51 +0000
+++ b/sql/strfunc.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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/structs.h'
--- a/sql/structs.h 2010-07-02 02:58:51 +0000
+++ b/sql/structs.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef STRUCTS_INCLUDED
#define STRUCTS_INCLUDED
-/* Copyright (C) 2000-2006 MySQL AB
+/* 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/thr_malloc.cc'
--- a/sql/thr_malloc.cc 2010-07-02 02:58:51 +0000
+++ b/sql/thr_malloc.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003-2004 MySQL AB
+/* 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/tzfile.h'
--- a/sql/tzfile.h 2010-07-02 02:58:51 +0000
+++ b/sql/tzfile.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef TZFILE_INCLUDED
#define TZFILE_INCLUDED
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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/tztime.h'
--- a/sql/tztime.h 2010-07-02 02:58:51 +0000
+++ b/sql/tztime.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef TZTIME_INCLUDED
#define TZTIME_INCLUDED
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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/uniques.cc'
--- a/sql/uniques.cc 2010-07-02 02:58:51 +0000
+++ b/sql/uniques.cc 2010-07-02 18:15:21 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 MySQL AB
+/* Copyright (c) 2001, 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/unireg.h'
--- a/sql/unireg.h 2010-07-02 02:58:51 +0000
+++ b/sql/unireg.h 2010-07-02 18:15:21 +0000
@@ -1,7 +1,7 @@
#ifndef UNIREG_INCLUDED
#define UNIREG_INCLUDED
-/* Copyright (C) 2000-2006 MySQL AB
+/* 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
Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100702181521-01voy16drzeae8hp.bundle
| Thread |
|---|
| • bzr push into mysql-next-mr-bugfixing branch (marc.alff:3280 to 3281) | Marc Alff | 2 Jul |
