diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-07-07 14:27:26 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-07-07 14:27:26 +0300 |
| commit | c298dad7fd738c8dc09a318dba0570a8b8b4af19 (patch) | |
| tree | 86408e6f11f92d61d72dccf381a9671cbf72c887 /sql/sql_trigger.cc | |
| parent | f3b5aa7ad65d548177b158c23e7772033461e964 (diff) | |
| parent | bb5e014a2dac3b1e40b3268c6647ceb5d6a335a9 (diff) | |
| download | mariadb-git-c298dad7fd738c8dc09a318dba0570a8b8b4af19.tar.gz | |
weave merge of mysql-5.1->mysql-5.1-security
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 89ee411c8da..4e056739d96 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1,4 +1,5 @@ -/* Copyright (C) 2004-2005 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 @@ -11,7 +12,8 @@ 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 */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #define MYSQL_LEX 1 |