From: Kent Boortz
Date: February 16 2012 11:15am
Subject: bzr push into mysql-trunk branch (kent.boortz:3904)
List-Archive: http://lists.mysql.com/commits/142903
Message-Id: <20120216111543.417C4F018F@tyr80.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3904 Kent Boortz	2012-02-16 [merge]
      Merge

    modified:
      storage/innobase/include/log0log.h
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0upd.cc
=== modified file 'include/CMakeLists.txt'
--- a/include/CMakeLists.txt	2012-02-01 08:31:03 +0000
+++ b/include/CMakeLists.txt	2012-02-16 09:51:14 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is 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	2012-01-23 10:02:54 +0000
+++ b/include/m_ctype.h	2012-02-16 09:51:14 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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	2012-01-26 13:09:59 +0000
+++ b/include/my_base.h	2012-02-16 09:51:14 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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	2012-01-31 15:16:16 +0000
+++ b/include/my_bitmap.h	2012-02-16 09:51:14 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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	2012-01-17 09:39:54 +0000
+++ b/include/my_global.h	2012-02-16 09:51:14 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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	2012-02-07 11:56:30 +0000
+++ b/include/my_sys.h	2012-02-16 09:51:14 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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/myisam.h'
--- a/include/myisam.h	2012-02-02 12:48:48 +0000
+++ b/include/myisam.h	2012-02-16 09:51:14 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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/psi/mysql_socket.h'
--- a/include/mysql/psi/mysql_socket.h	2012-01-06 09:03:53 +0000
+++ b/include/mysql/psi/mysql_socket.h	2012-02-16 09:51:14 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as

=== modified file 'include/mysql/psi/mysql_table.h'
--- a/include/mysql/psi/mysql_table.h	2012-01-06 09:03:53 +0000
+++ b/include/mysql/psi/mysql_table.h	2012-02-16 09:51:14 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 
   This program is 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/psi/mysql_thread.h'
--- a/include/mysql/psi/mysql_thread.h	2012-01-06 09:03:53 +0000
+++ b/include/mysql/psi/mysql_thread.h	2012-02-16 09:51:14 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 
   This program is 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/psi/psi.h'
--- a/include/mysql/psi/psi.h	2012-01-06 09:03:53 +0000
+++ b/include/mysql/psi/psi.h	2012-02-16 09:51:14 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 
   This program is 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/psi/psi_abi_v1.h'
--- a/include/mysql/psi/psi_abi_v1.h	2011-10-11 04:27:52 +0000
+++ b/include/mysql/psi/psi_abi_v1.h	2012-02-16 09:51:14 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 
   This program is 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	2011-11-07 14:35:16 +0000
+++ b/include/mysql_time.h	2012-02-16 09:51:14 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
 
  This program is 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/sql_common.h'
--- a/include/sql_common.h	2011-08-19 13:24:24 +0000
+++ b/include/sql_common.h	2012-02-16 09:51:14 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_COMMON_INCLUDED
 #define SQL_COMMON_INCLUDED
 
-/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
    
    This program is 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-case.h'
--- a/include/sslopt-case.h	2011-08-19 13:24:24 +0000
+++ b/include/sslopt-case.h	2012-02-16 09:51:14 +0000
@@ -1,7 +1,7 @@
 #ifndef SSLOPT_CASE_INCLUDED
 #define SSLOPT_CASE_INCLUDED
 
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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	2011-08-19 13:24:24 +0000
+++ b/include/sslopt-longopts.h	2012-02-16 09:51:14 +0000
@@ -1,7 +1,7 @@
 #ifndef SSLOPT_LONGOPTS_INCLUDED
 #define SSLOPT_LONGOPTS_INCLUDED
 
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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	2011-08-19 13:24:24 +0000
+++ b/include/sslopt-vars.h	2012-02-16 09:51:14 +0000
@@ -1,7 +1,7 @@
 #ifndef SSLOPT_VARS_INCLUDED
 #define SSLOPT_VARS_INCLUDED
 
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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	2012-02-15 07:20:32 +0000
+++ b/include/violite.h	2012-02-16 10:52:45 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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/waiting_threads.h'
--- a/include/waiting_threads.h	2011-10-11 04:27:52 +0000
+++ b/include/waiting_threads.h	2012-02-16 09:51:14 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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/welcome_copyright_notice.h'
--- a/include/welcome_copyright_notice.h	2011-07-11 16:21:46 +0000
+++ b/include/welcome_copyright_notice.h	2012-02-16 09:51:14 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2012-02-15 18:54:54 +0000
+++ b/libmysql/CMakeLists.txt	2012-02-16 10:52:45 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free 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	2012-02-14 20:35:05 +0000
+++ b/sql-common/my_time.c	2012-02-16 10:52:45 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2012-02-15 18:54:54 +0000
+++ b/sql/CMakeLists.txt	2012-02-16 10:52:45 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free 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	2012-02-15 13:57:17 +0000
+++ b/sql/keycaches.h	2012-02-16 10:52:45 +0000
@@ -1,7 +1,7 @@
 #ifndef KEYCACHES_INCLUDED
 #define KEYCACHES_INCLUDED
 
-/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/password.c'
--- a/sql/password.c	2012-02-15 18:54:54 +0000
+++ b/sql/password.c	2012-02-16 10:52:45 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'sql/signal_handler.cc'
--- a/sql/signal_handler.cc	2012-02-15 13:57:17 +0000
+++ b/sql/signal_handler.cc	2012-02-16 10:52:45 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free 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.cc'
--- a/sql/sql_select.cc	2012-02-15 10:47:01 +0000
+++ b/sql/sql_select.cc	2012-02-16 10:52:45 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free 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_tmp_table.cc'
--- a/sql/sql_tmp_table.cc	2012-02-15 10:47:01 +0000
+++ b/sql/sql_tmp_table.cc	2012-02-16 10:52:45 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	2012-02-16 10:52:14 +0000
+++ b/storage/innobase/handler/ha_innodb.cc	2012-02-16 11:13:58 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2008, 2009 Google Inc.
 Copyright (c) 2009, Percona Inc.
 

=== modified file 'storage/innobase/include/log0log.h'
--- a/storage/innobase/include/log0log.h	2012-02-16 10:52:14 +0000
+++ b/storage/innobase/include/log0log.h	2012-02-16 11:13:58 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2010, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2009, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by

=== modified file 'storage/innobase/include/srv0srv.h'
--- a/storage/innobase/include/srv0srv.h	2012-02-15 01:51:32 +0000
+++ b/storage/innobase/include/srv0srv.h	2012-02-16 10:52:45 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2008, 2009, Google Inc.
 Copyright (c) 2009, Percona Inc.
 

=== modified file 'storage/innobase/srv/srv0start.cc'
--- a/storage/innobase/srv/srv0start.cc	2012-02-15 01:12:54 +0000
+++ b/storage/innobase/srv/srv0start.cc	2012-02-16 10:52:45 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2008, Google Inc.
 Copyright (c) 2009, Percona Inc.
 

=== modified file 'vio/vio.c'
--- a/vio/vio.c	2012-02-15 07:20:32 +0000
+++ b/vio/vio.c	2012-02-16 10:52:45 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is 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	2012-02-15 07:20:32 +0000
+++ b/vio/viosocket.c	2012-02-16 10:52:45 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License

No bundle (reason: useless for push emails).