summaryrefslogtreecommitdiff
path: root/sql/my_lock.c
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2006-12-31 01:32:21 +0100
committerkent@kent-amd64.(none) <>2006-12-31 01:32:21 +0100
commit58763e383e40331b7010bf3280904efe4d4fc3df (patch)
treefa5f0a9d02637384a995bfbff6cf3b5184b4e1df /sql/my_lock.c
parent895e442dbfe8348f69388f6d181481a1b7576ca8 (diff)
parent1b8bd0d246f26fa05f9974005dc10cc647754ee1 (diff)
downloadmariadb-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 'sql/my_lock.c')
-rw-r--r--sql/my_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/my_lock.c b/sql/my_lock.c
index 368d24af5c8..f66d7282f72 100644
--- a/sql/my_lock.c
+++ b/sql/my_lock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2003 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