diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-17 11:00:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-17 11:00:51 +0100 |
| commit | 84651126c0f101ea762eec0eb4045f533a00e96d (patch) | |
| tree | 1bba1d0079b08cb10fe69e03942cd5f254dc735e /tests | |
| parent | 1fa5183241e5a8e8e91690f0c35d676e9f3334ca (diff) | |
| parent | f7c8dd6bc7bb6d46d1ae2b6fdb47227429387e33 (diff) | |
| download | mariadb-git-84651126c0f101ea762eec0eb4045f533a00e96d.tar.gz | |
MySQL-5.5.36 merge
(without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/connect_test.c | 3 | ||||
| -rwxr-xr-x | tests/fork_big.pl | 5 | ||||
| -rw-r--r-- | tests/fork_big2.pl | 5 | ||||
| -rw-r--r-- | tests/insert_test.c | 3 | ||||
| -rw-r--r-- | tests/list_test.c | 3 | ||||
| -rw-r--r-- | tests/select_test.c | 3 | ||||
| -rw-r--r-- | tests/showdb_test.c | 3 | ||||
| -rw-r--r-- | tests/ssl_test.c | 3 |
8 files changed, 18 insertions, 10 deletions
diff --git a/tests/connect_test.c b/tests/connect_test.c index 3e23922031b..f30d0f2edba 100644 --- a/tests/connect_test.c +++ b/tests/connect_test.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2002-2004 MySQL AB + 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/tests/fork_big.pl b/tests/fork_big.pl index 506a2fb0d8e..b866b899f8d 100755 --- a/tests/fork_big.pl +++ b/tests/fork_big.pl @@ -1,7 +1,8 @@ #!/usr/bin/perl -w -# Copyright (C) 2001 MySQL AB -# +# Copyright (c) 2001, 2006 MySQL AB +# 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 # the Free Software Foundation; version 2 of the License. diff --git a/tests/fork_big2.pl b/tests/fork_big2.pl index 516e8ff9478..e92cf869e52 100644 --- a/tests/fork_big2.pl +++ b/tests/fork_big2.pl @@ -1,7 +1,8 @@ #!/usr/bin/perl -w -# Copyright (C) 2002, 2005 MySQL AB -# +# Copyright (c) 2002, 2003, 2005, 2006 MySQL AB +# 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 # the Free Software Foundation; version 2 of the License. diff --git a/tests/insert_test.c b/tests/insert_test.c index e67d03dd435..f09766088aa 100644 --- a/tests/insert_test.c +++ b/tests/insert_test.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000-2004 MySQL AB + 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/tests/list_test.c b/tests/list_test.c index 5b984b9eca9..2e8cd3654a3 100644 --- a/tests/list_test.c +++ b/tests/list_test.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2003, 2004 MySQL AB + 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/tests/select_test.c b/tests/select_test.c index f85a7bee2bf..9a144c59292 100644 --- a/tests/select_test.c +++ b/tests/select_test.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2002-2004 MySQL AB + 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/tests/showdb_test.c b/tests/showdb_test.c index 05c42b531cd..555a8511e61 100644 --- a/tests/showdb_test.c +++ b/tests/showdb_test.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2003, 2004 MySQL AB + 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/tests/ssl_test.c b/tests/ssl_test.c index 3793538b4d2..2cd4b4b868b 100644 --- a/tests/ssl_test.c +++ b/tests/ssl_test.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2003, 2004, 2007 MySQL AB + 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 |