From: Georgi Kodinov
Date: March 22 2011 12:05pm
Subject: bzr push into mysql-trunk branch (Georgi.Kodinov:3307)
List-Archive: http://lists.mysql.com/commits/133509
Message-Id: <201103221205.p2MC5qn2025011@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3307 Georgi Kodinov	2011-03-22 [merge]
      merge

    modified:
      mysql-test/collections/default.daily
      mysql-test/extra/rpl_tests/rpl_crash_safe.inc
      mysql-test/suite/binlog/t/binlog_variables_relay_log.test
      mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test
      mysql-test/suite/rpl/r/rpl_row_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
      mysql-test/suite/rpl/t/rpl_000017.test
      mysql-test/t/flush2.test
=== 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	2011-03-21 15:54:40 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, 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
@@ -259,7 +259,7 @@ mysql_declare_plugin(ftexample)
   MYSQL_FTPARSER_PLUGIN,      /* type                            */
   &simple_parser_descriptor,  /* descriptor                      */
   "simple_parser",            /* name                            */
-  "MySQL AB",                 /* author                          */
+  "Oracle Corp",              /* author                          */
   "Simple Full-Text Parser",  /* description                     */
   PLUGIN_LICENSE_GPL,
   simple_parser_plugin_init,  /* init function (when loaded)     */

No bundle (reason: useless for push emails).