From: Georgi Kodinov
Date: July 7 2011 10:55am
Subject: bzr push into mysql-5.5 branch (Georgi.Kodinov:3453 to 3454)
List-Archive: http://lists.mysql.com/commits/140229
Message-Id: <201107071055.p67AtfCI018480@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3454 Georgi Kodinov	2011-07-07 [merge]
      merge mysql-5.1->mysql-5.5

    modified:
      include/probes_mysql_nodtrace.h
 3453 hery.ramilison@stripped	2011-07-06 [merge]
      Merge from mysql-5.5.14-release

    removed:
      storage/ndb/test/sql/
      storage/ndb/test/sql/BANK.sql
      storage/ndb/test/sql/T1.sql
      storage/ndb/test/sql/test_create_drop.pl
      storage/ndb/test/sql/test_range_bounds.pl
    added:
      mysql-test/r/secure_file_priv_win.result
      mysql-test/t/secure_file_priv_win-master.opt
      mysql-test/t/secure_file_priv_win.test
    modified:
      include/mysql/plugin_audit.h
      mysql-test/r/ctype_utf16.result
      mysql-test/r/explain.result
      mysql-test/r/plugin_auth.result
      mysql-test/r/sp-security.result
      mysql-test/r/sp.result
      mysql-test/r/subselect.result
      mysql-test/r/xml.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/t/innodb-index.test
      mysql-test/t/ctype_utf16.test
      mysql-test/t/explain.test
      mysql-test/t/plugin_auth.test
      mysql-test/t/sp-security.test
      mysql-test/t/sp.test
      mysql-test/t/subselect.test
      mysql-test/t/xml.test
      mysys/my_symlink.c
      plugin/audit_null/audit_null.c
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_subselect.cc
      sql/item_sum.cc
      sql/item_timefunc.cc
      sql/item_xmlfunc.cc
      sql/my_decimal.h
      sql/mysqld.cc
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_partition.cc
      sql/sql_priv.h
      sql/sql_select.cc
=== modified file 'include/probes_mysql_nodtrace.h'
--- a/include/probes_mysql_nodtrace.h	2011-06-30 15:46:53 +0000
+++ b/include/probes_mysql_nodtrace.h	2011-07-07 09:42:14 +0000
@@ -1,19 +1,3 @@
-/* Copyright (c) 2008, 2010 Sun Microsystems, Inc.
-   Use is subject to license terms.
-
-   This 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
 /*
  * Generated by dheadgen(1).
  */

No bundle (reason: useless for push emails).