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 /libmysqld | |
| 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 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 2 | ||||
| -rw-r--r-- | libmysqld/emb_qcache.h | 2 | ||||
| -rw-r--r-- | libmysqld/embedded_priv.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 0c3aaa8f2df..374f2e61e72 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +# Copyright (C) 2001-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/libmysqld/emb_qcache.h b/libmysqld/emb_qcache.h index ca7bbec15cd..5c5209902a1 100644 --- a/libmysqld/emb_qcache.h +++ b/libmysqld/emb_qcache.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2003, 2005 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 diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h index bbcf8886cc1..369b344d4bd 100644 --- a/libmysqld/embedded_priv.h +++ b/libmysqld/embedded_priv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2001-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 |