diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:47:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:54:04 +0300 |
| commit | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch) | |
| tree | 7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /unittest/sql | |
| parent | 8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff) | |
| parent | cb248f880619431850e5638009a6098048050edf (diff) | |
| download | mariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'unittest/sql')
| -rw-r--r-- | unittest/sql/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | unittest/sql/explain_filename-t.cc | 2 | ||||
| -rw-r--r-- | unittest/sql/mf_iocache-t.cc | 2 | ||||
| -rw-r--r-- | unittest/sql/my_apc-t.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/unittest/sql/CMakeLists.txt b/unittest/sql/CMakeLists.txt index cd2ba9b3d2f..f63dc0b2a21 100644 --- a/unittest/sql/CMakeLists.txt +++ b/unittest/sql/CMakeLists.txt @@ -11,7 +11,7 @@ # # 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA MY_ADD_TESTS(my_apc LINK_LIBRARIES mysys EXT cc) diff --git a/unittest/sql/explain_filename-t.cc b/unittest/sql/explain_filename-t.cc index 5f2e165d6ff..859cb0cdaa4 100644 --- a/unittest/sql/explain_filename-t.cc +++ b/unittest/sql/explain_filename-t.cc @@ -12,7 +12,7 @@ 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /** Unit test case for the function explain_filename(). */ diff --git a/unittest/sql/mf_iocache-t.cc b/unittest/sql/mf_iocache-t.cc index 2e36148d05f..01cc8725ecc 100644 --- a/unittest/sql/mf_iocache-t.cc +++ b/unittest/sql/mf_iocache-t.cc @@ -11,7 +11,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_sys.h> #include <my_crypt.h> diff --git a/unittest/sql/my_apc-t.cc b/unittest/sql/my_apc-t.cc index 6d44859d164..c08e7281c92 100644 --- a/unittest/sql/my_apc-t.cc +++ b/unittest/sql/my_apc-t.cc @@ -12,7 +12,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* This file does standalone APC system tests. |