summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-07-07 12:42:14 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-07-07 12:42:14 +0300
commit9fc51026734880056a2da6cbe0ee584fc0e707da (patch)
tree07ec896a723255d6681b2fc644486b473912af40
parentc74d844de30136c570c3bca089d1f2949d00603c (diff)
parent1219d9a1dd0243d0490c9315a9fc2b40031a4850 (diff)
downloadmariadb-git-9fc51026734880056a2da6cbe0ee584fc0e707da.tar.gz
merge mysql-5.1->mysql-5.5
-rw-r--r--include/probes_mysql_nodtrace.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/include/probes_mysql_nodtrace.h b/include/probes_mysql_nodtrace.h
index 0678dd9445e..bc3b65a00e5 100644
--- a/include/probes_mysql_nodtrace.h
+++ b/include/probes_mysql_nodtrace.h
@@ -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).
*/