diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 22:26:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 22:26:58 +0100 |
| commit | cb67dcb6184535349ca4ff3d7c64eba9c63a0688 (patch) | |
| tree | 10d38ccf7fe60d5ea5c866d37292833b77dfcdae /mysql-test/include | |
| parent | 44002a34e680c79c01df879b540458c2885e97e8 (diff) | |
| parent | faec0e2f4aecfc902e354ae7af991779d6bfc4a7 (diff) | |
| download | mariadb-git-cb67dcb6184535349ca4ff3d7c64eba9c63a0688.tar.gz | |
mysql-5.5.37 selective merge
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/default_my.cnf | 1 | ||||
| -rw-r--r-- | mysql-test/include/have_perfschema.inc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/include/default_my.cnf b/mysql-test/include/default_my.cnf index ef7e9f60dd7..6b0493cdb08 100644 --- a/mysql-test/include/default_my.cnf +++ b/mysql-test/include/default_my.cnf @@ -1,4 +1,5 @@ # Copyright (c) 2007 MySQL AB, 2009, 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 diff --git a/mysql-test/include/have_perfschema.inc b/mysql-test/include/have_perfschema.inc index 6b558e07c20..d932ce0f9bd 100644 --- a/mysql-test/include/have_perfschema.inc +++ b/mysql-test/include/have_perfschema.inc @@ -1,4 +1,5 @@ # Copyright (C) 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 |