diff options
| author | kent@mysql.com/kent-amd64.(none) <> | 2006-12-31 01:04:07 +0100 |
|---|---|---|
| committer | kent@mysql.com/kent-amd64.(none) <> | 2006-12-31 01:04:07 +0100 |
| commit | 1b8bd0d246f26fa05f9974005dc10cc647754ee1 (patch) | |
| tree | ccace61b3d37f7480a06ecda03b0cfc451f58474 /tests | |
| parent | 344d78a56328c1a9e77f8eb2f247d20ced3ce816 (diff) | |
| parent | 6523aca7291d55b7fcb7668610a6fb0c752a3770 (diff) | |
| download | mariadb-git-1b8bd0d246f26fa05f9974005dc10cc647754ee1.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.0
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/deadlock_test.c | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 46c42d461f3..5eade93621b 100755 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,3 +1,18 @@ +# Copyright (C) 2006 MySQL AB +# +# 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; 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 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# 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 + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") diff --git a/tests/Makefile.am b/tests/Makefile.am index 5e3f8b2bbad..a19ffecbd14 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +# Copyright (C) 2000-2006 MySQL AB # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public diff --git a/tests/deadlock_test.c b/tests/deadlock_test.c index 4c4a603f94d..e386205a985 100644 --- a/tests/deadlock_test.c +++ b/tests/deadlock_test.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000-2001, 2003-2004, 2006 MySQL AB 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 |