List:Commits« Previous MessageNext Message »
From:Guilhem Bichot Date:February 16 2011 3:06pm
Subject:bzr commit into mysql-trunk branch (guilhem.bichot:3267)
View as plain text  
#At file:///home/mysql_src/bzrrepos_new/mysql-next-mr-opt-backporting-wl4800-new2/ based on revid:guilhem.bichot@stripped

 3267 Guilhem Bichot	2011-02-16
      Copyright fixes for files which this WL touched. Post-merge fixes.
     @ mysql-test/lib/My/SafeProcess/safe_process.cc
        Removing workaround for fixed bug.
     @ mysql-test/mysql-test-run.pl
        Bjorn has removed this code today in another branch, so let's
        not create a conflict at next merge.
     @ sql/opt_range.cc
        print_quick is used now.
     @ sql/sql_base.cc
        reverting code to how it is in main tree.
     @ sql/sql_class.h
        fix for silent merge error :-/
     @ sql/sql_select.cc
        unneeded {}. Out-of-date comment.

    modified:
      CMakeLists.txt
      WL4800_Doxyfile
      WL4800_TODO.txt
      WL4800_extract_plans.py
      WL4800_select_to_explain_test.py
      WL4800_validate_json.py
      include/my_getopt.h
      include/mysql/plugin.h
      mysql-test/lib/My/SafeProcess/safe_process.cc
      mysql-test/mysql-test-run.pl
      mysys/array.c
      mysys/my_alloc.c
      mysys/my_getopt.c
      mysys/typelib.c
      sql/item.cc
      sql/item_cmpfunc.h
      sql/opt_range.cc
      sql/set_var.cc
      sql/sql_array.h
      sql/sql_base.cc
      sql/sql_class.h
      sql/sql_help.cc
      sql/sql_plugin.h
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_test.cc
      sql/sql_test.h
      sql/sql_update.cc
      sql/sys_vars.cc
      sql/sys_vars.h
      unittest/gunit/opt_notrace-t.cc
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2011-02-16 13:52:44 +0000
+++ b/CMakeLists.txt	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. 
+# 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

=== modified file 'WL4800_Doxyfile'
--- a/WL4800_Doxyfile	2010-09-22 19:50:59 +0000
+++ b/WL4800_Doxyfile	2011-02-16 15:06:06 +0000
@@ -1,6 +1,6 @@
 # Doxyfile 1.6.1
 
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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 'WL4800_TODO.txt'
--- a/WL4800_TODO.txt	2011-02-15 20:53:19 +0000
+++ b/WL4800_TODO.txt	2011-02-16 15:06:06 +0000
@@ -51,3 +51,7 @@ developer notices a syntax error when ru
 sql_print_warning() is an idea.
 
 make the charset parameter "const CHARSET_INFO *", see the @todo in opt_trace.h
+
+In typelib.c: at the next merge, once the fix for BUG#59894 is in,
+test the crash and eliminate the workaround (search for "BUG#53164" in
+text). If so, close BUG#53164.

=== modified file 'WL4800_extract_plans.py'
--- a/WL4800_extract_plans.py	2010-09-20 08:12:18 +0000
+++ b/WL4800_extract_plans.py	2011-02-16 15:06:06 +0000
@@ -1,6 +1,6 @@
 #! /usr/bin/python
 
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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 'WL4800_select_to_explain_test.py'
--- a/WL4800_select_to_explain_test.py	2010-09-20 08:12:18 +0000
+++ b/WL4800_select_to_explain_test.py	2011-02-16 15:06:06 +0000
@@ -1,6 +1,6 @@
 #! /usr/bin/python
 
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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 'WL4800_validate_json.py'
--- a/WL4800_validate_json.py	2011-01-17 12:25:20 +0000
+++ b/WL4800_validate_json.py	2011-02-16 15:06:06 +0000
@@ -1,6 +1,6 @@
 #! /usr/bin/python
 
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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/my_getopt.h'
--- a/include/my_getopt.h	2011-02-16 13:52:44 +0000
+++ b/include/my_getopt.h	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2004 MySQL AB
+/* Copyright (c) 2002, 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
@@ -10,8 +10,8 @@
    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 */
+   along with this program; if not, write to the Free Software Foundation,
+   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
 #ifndef _my_getopt_h
 #define _my_getopt_h

=== modified file 'include/mysql/plugin.h'
--- a/include/mysql/plugin.h	2011-02-16 13:52:44 +0000
+++ b/include/mysql/plugin.h	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2005, 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
@@ -10,8 +10,8 @@
    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 */
+   along with this program; if not, write to the Free Software Foundation,
+   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
 #ifndef _my_plugin_h
 #define _my_plugin_h

=== modified file 'mysql-test/lib/My/SafeProcess/safe_process.cc'
--- a/mysql-test/lib/My/SafeProcess/safe_process.cc	2011-02-16 13:52:44 +0000
+++ b/mysql-test/lib/My/SafeProcess/safe_process.cc	2011-02-16 15:06:06 +0000
@@ -95,8 +95,7 @@ static void kill_child(void)
 
   message("Killing child: %d", child_pid);
   // Terminate whole process group
-  // quick fix until BUG#43418 is fixed
-  kill(-child_pid, SIGTERM);
+  kill(-child_pid, SIGKILL);
 
   pid_t ret_pid= waitpid(child_pid, &status, 0);
   if (ret_pid == child_pid)

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-16 13:52:44 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-16 15:06:06 +0000
@@ -1575,7 +1575,6 @@ sub command_line_setup {
 
   if ($opt_debug && $opt_debug ne "1")
   {
-    # cannot happen, --debug accepts no param
     $debug_d= "d,$opt_debug";
     $debug_d= "d,query,info,error,enter,exit" if $opt_debug eq "std";
   }

=== modified file 'mysys/array.c'
--- a/mysys/array.c	2011-02-16 13:52:44 +0000
+++ b/mysys/array.c	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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
@@ -10,8 +10,8 @@
    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 */
+   along with this program; if not, write to the Free Software Foundation,
+   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
 /* Handling of arrays that can grow dynamicly. */
 

=== modified file 'mysys/my_alloc.c'
--- a/mysys/my_alloc.c	2011-01-21 15:11:00 +0000
+++ b/mysys/my_alloc.c	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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
@@ -10,8 +10,8 @@
    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 */
+   along with this program; if not, write to the Free Software Foundation,
+   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
 /* Routines to handle mallocing of results which will be freed the same time */
 

=== modified file 'mysys/my_getopt.c'
--- a/mysys/my_getopt.c	2011-02-16 13:52:44 +0000
+++ b/mysys/my_getopt.c	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2002, 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
@@ -10,8 +10,8 @@
    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 */
+   along with this program; if not, write to the Free Software Foundation,
+   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
 #include <my_global.h>
 #include <m_string.h>

=== modified file 'mysys/typelib.c'
--- a/mysys/typelib.c	2010-05-24 18:38:10 +0000
+++ b/mysys/typelib.c	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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
@@ -10,8 +10,8 @@
    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 */
+   along with this program; if not, write to the Free Software Foundation,
+   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
 /* Functions to handle typelib */
 

=== modified file 'sql/item.cc'
--- a/sql/item.cc	2011-02-16 13:52:44 +0000
+++ b/sql/item.cc	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* 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 'sql/item_cmpfunc.h'
--- a/sql/item_cmpfunc.h	2011-02-16 13:52:44 +0000
+++ b/sql/item_cmpfunc.h	2011-02-16 15:06:06 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_CMPFUNC_INCLUDED
 #define ITEM_CMPFUNC_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 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2011-02-16 13:52:44 +0000
+++ b/sql/opt_range.cc	2011-02-16 15:06:06 +0000
@@ -6323,7 +6323,10 @@ get_mm_leaf(RANGE_OPT_PARAM *param, Item
        field->type() == MYSQL_TYPE_DATETIME))
     field->table->in_use->variables.sql_mode|= MODE_INVALID_DATES;
   {
-    // Note that value may be a stored function call, executed here.
+    /*
+      Note that value may be a stored function call, executed here. Happens in
+      optimizer_trace2_no_prot.test for example.
+    */
     err= value->save_in_field_no_warnings(field, 1);
   }
   if (err > 0)
@@ -12409,7 +12412,6 @@ print_multiple_key_values(KEY_PART *key_
   dbug_tmp_restore_column_maps(table->read_set, table->write_set, old_sets);
 }
 
-// print_quick defined but not used.
 static void print_quick(QUICK_SELECT_I *quick, const key_map *needed_reg)
 {
   char buf[MAX_KEY/8+1];

=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2011-02-16 13:52:44 +0000
+++ b/sql/set_var.cc	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 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 'sql/sql_array.h'
--- a/sql/sql_array.h	2011-02-16 13:52:44 +0000
+++ b/sql/sql_array.h	2011-02-16 15:06:06 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_ARRAY_INCLUDED
 #define SQL_ARRAY_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 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2011-02-16 13:52:44 +0000
+++ b/sql/sql_base.cc	2011-02-16 15:06:06 +0000
@@ -4935,12 +4935,10 @@ err:
   thd_proc_info(thd, 0);
   free_root(&new_frm_mem, MYF(0));              // Free pre-alloced block
 
-  if (unlikely(error))
+  if (error && *table_to_open)
   {
-    if (*table_to_open)
-      (*table_to_open)->table= NULL;
+    (*table_to_open)->table= NULL;
   }
-
   DBUG_PRINT("open_tables", ("returning: %d", (int) error));
   DBUG_RETURN(error);
 }

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2011-02-16 13:52:44 +0000
+++ b/sql/sql_class.h	2011-02-16 15:06:06 +0000
@@ -3781,7 +3781,7 @@ public:
 #define CF_WRITE_RPL_INFO_COMMAND (1U << 12)
 
 /** Identifies statements which may generate an optimizer trace */
-#define CF_OPTIMIZER_TRACE (1U << 12)
+#define CF_OPTIMIZER_TRACE (1U << 13)
 
 /* Bits in server_command_flags */
 

=== modified file 'sql/sql_help.cc'
--- a/sql/sql_help.cc	2011-02-16 13:52:44 +0000
+++ b/sql/sql_help.cc	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* 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 'sql/sql_plugin.h'
--- a/sql/sql_plugin.h	2011-02-16 13:52:44 +0000
+++ b/sql/sql_plugin.h	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 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 'sql/sql_prepare.cc'
--- a/sql/sql_prepare.cc	2011-02-16 13:52:44 +0000
+++ b/sql/sql_prepare.cc	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 1995, 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 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-02-16 13:52:44 +0000
+++ b/sql/sql_select.cc	2011-02-16 15:06:06 +0000
@@ -4209,20 +4209,17 @@ bool JOIN::flatten_subqueries()
     if (replace_subcondition(this, tree, *subq, new Item_int(1), FALSE))
       DBUG_RETURN(TRUE); /* purecov: inspected */
   }
-  {
-    for (subq= sj_subselects.front();
-
-         subq != subq_end &&
-           tables + (*subq)->unit->first_select()->join->tables < MAX_TABLES;
-         subq++)
-    {
-      OPT_TRACE_TRANSFORM(trace, oto0, oto1,
-                          (*subq)->get_select_lex()->select_number,
-                          "IN (SELECT)", "semijoin");
-      oto1.add("chosen", true);
-      if (convert_subquery_to_semijoin(this, *subq))
-        DBUG_RETURN(TRUE);
-    }
+  for (subq= sj_subselects.front();
+       subq != subq_end &&
+         tables + (*subq)->unit->first_select()->join->tables < MAX_TABLES;
+       subq++)
+  {
+    OPT_TRACE_TRANSFORM(trace, oto0, oto1,
+                        (*subq)->get_select_lex()->select_number,
+                        "IN (SELECT)", "semijoin");
+    oto1.add("chosen", true);
+    if (convert_subquery_to_semijoin(this, *subq))
+      DBUG_RETURN(TRUE);
   }
 skip_conversion:
   /* 
@@ -9772,8 +9769,6 @@ static bool pushdown_on_conditions(JOIN*
     /* 
        Table last_tab is the last inner table of an outer join.
        An on expression is always attached to it.
-       (NOTE: print_outer_join_conds makes some assumptions about what the
-       below code does. Be sure not to break them)
     */     
     Item *on_expr= *first_inner_tab->on_expr_ref;
 

=== modified file 'sql/sql_select.h'
--- a/sql/sql_select.h	2011-02-16 13:52:44 +0000
+++ b/sql/sql_select.h	2011-02-16 15:06:06 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_SELECT_INCLUDED
 #define SQL_SELECT_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 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2011-02-16 13:52:44 +0000
+++ b/sql/sql_show.cc	2011-02-16 15:06:06 +0000
@@ -2082,8 +2082,7 @@ void reset_status_vars()
   for (; ptr < last; ptr++)
   {
     /* Note that SHOW_LONG_NOFLUSH variables are not reset */
-    if (ptr->type == SHOW_LONG ||
-        ptr->type == SHOW_SIGNED_LONG)
+    if (ptr->type == SHOW_LONG || ptr->type == SHOW_SIGNED_LONG)
       *(ulong*) ptr->value= 0;
   }  
 }

=== modified file 'sql/sql_test.cc'
--- a/sql/sql_test.cc	2011-02-16 13:52:44 +0000
+++ b/sql/sql_test.cc	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* 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 'sql/sql_test.h'
--- a/sql/sql_test.h	2010-12-30 16:17:40 +0000
+++ b/sql/sql_test.h	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* 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

=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc	2011-02-16 13:52:44 +0000
+++ b/sql/sql_update.cc	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* 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 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2011-02-16 13:52:44 +0000
+++ b/sql/sys_vars.cc	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 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 'sql/sys_vars.h'
--- a/sql/sys_vars.h	2011-02-16 13:52:44 +0000
+++ b/sql/sys_vars.h	2011-02-16 15:06:06 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 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 'unittest/gunit/opt_notrace-t.cc'
--- a/unittest/gunit/opt_notrace-t.cc	2011-01-11 08:15:46 +0000
+++ b/unittest/gunit/opt_notrace-t.cc	2011-02-16 15:06:06 +0000
@@ -1,3 +1,18 @@
+/* Copyright (c) 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
+   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  */
+
 #include "my_config.h"
 #include <gtest/gtest.h>
 


Attachment: [text/bzr-bundle] bzr/guilhem.bichot@oracle.com-20110216150606-nsln05ssluhy54vi.bundle
Thread
bzr commit into mysql-trunk branch (guilhem.bichot:3267) Guilhem Bichot16 Feb