diff options
| author | svoj@mysql.com/june.mysql.com <> | 2006-12-29 15:33:03 +0400 |
|---|---|---|
| committer | svoj@mysql.com/june.mysql.com <> | 2006-12-29 15:33:03 +0400 |
| commit | 441f5069db8b03ce65dc2a9c81f35d4fa92076cf (patch) | |
| tree | a06e6f5be2d437d63499499378d6801eaad32ce4 /mysql-test | |
| parent | fb01230ac58ea792c8c466022d9222c795df20c8 (diff) | |
| parent | 3765d8a0126015d83b63f8951baa3e25239d68c7 (diff) | |
| download | mariadb-git-441f5069db8b03ce65dc2a9c81f35d4fa92076cf.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
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index eff2ae740f5..a275e71c672 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -2,8 +2,8 @@ # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# License as published by the Free Software Foundation; version 2 +# of the License. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of |