diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-11 19:28:05 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-11 19:28:05 +0200 |
| commit | 24e452a208adebedce6a8a418265fced66bfb027 (patch) | |
| tree | 83bc0c6e237fbd9f9dcbd2ac79f03a3b86756239 /sql/lock.cc | |
| parent | 8a09adb3eaf036b652b11afea7d9d86a978fa566 (diff) | |
| parent | 148587461954b544355bc808a89bfed1a70694e1 (diff) | |
| download | mariadb-git-24e452a208adebedce6a8a418265fced66bfb027.tar.gz | |
Merge with 5.1 & fixes to IGNORE handling
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 9fdb30eb1a0..3f9b3a9e18b 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -1,4 +1,5 @@ -/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. +/* + Copyright (c) 2000, 2010, Oracle and/or its affiliates. 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 +*/ /** |