diff options
| author | unknown <svoj@mysql.com/june.mysql.com> | 2006-12-29 15:33:03 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/june.mysql.com> | 2006-12-29 15:33:03 +0400 |
| commit | f64e8fed4c4d3fd8238e2fa43a90ebdc83506b62 (patch) | |
| tree | a06e6f5be2d437d63499499378d6801eaad32ce4 /sql/sql_update.cc | |
| parent | a954714daabae2203d47a48bbef95d167ed8e72e (diff) | |
| parent | 5b3450072f6a2f76d0cfa4364862a695108e1030 (diff) | |
| download | mariadb-git-f64e8fed4c4d3fd8238e2fa43a90ebdc83506b62.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
sql/lock.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index ce0126f1f1c..b92066ddece 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -2,8 +2,7 @@ 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; either version 2 of the License, or - (at your option) any later version. + 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 |