diff options
| author | kent@kent-amd64.(none) <> | 2006-12-31 01:32:21 +0100 |
|---|---|---|
| committer | kent@kent-amd64.(none) <> | 2006-12-31 01:32:21 +0100 |
| commit | 58763e383e40331b7010bf3280904efe4d4fc3df (patch) | |
| tree | fa5f0a9d02637384a995bfbff6cf3b5184b4e1df /tests | |
| parent | 895e442dbfe8348f69388f6d181481a1b7576ca8 (diff) | |
| parent | 1b8bd0d246f26fa05f9974005dc10cc647754ee1 (diff) | |
| download | mariadb-git-58763e383e40331b7010bf3280904efe4d4fc3df.tar.gz | |
Merge mysql.com:/home/kent/bk/main/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.1
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/deadlock_test.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 4ad69708c56..07a3a3b913c 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 |