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 /libmysql | |
| 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 'libmysql')
| -rw-r--r-- | libmysql/Makefile.am | 3 | ||||
| -rw-r--r-- | libmysql/client_settings.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 5e6c60a007b..38680c98d53 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -111,3 +111,6 @@ do-lib-dist: echo ' $$(AR) r $$@ $$?' >>$$dir/Makefile; \ gtar cvzf $$dir.tar.gz $$dir; \ cd $$dir; gmake + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index b343304ecf5..b67fbbc03af 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.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 |