summaryrefslogtreecommitdiff
path: root/sql/sql_acl.h
diff options
context:
space:
mode:
authorkent@mysql.com/kent-amd64.(none) <>2006-12-31 01:04:07 +0100
committerkent@mysql.com/kent-amd64.(none) <>2006-12-31 01:04:07 +0100
commit1b8bd0d246f26fa05f9974005dc10cc647754ee1 (patch)
treeccace61b3d37f7480a06ecda03b0cfc451f58474 /sql/sql_acl.h
parent344d78a56328c1a9e77f8eb2f247d20ced3ce816 (diff)
parent6523aca7291d55b7fcb7668610a6fb0c752a3770 (diff)
downloadmariadb-git-1b8bd0d246f26fa05f9974005dc10cc647754ee1.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.0
Diffstat (limited to 'sql/sql_acl.h')
-rw-r--r--sql/sql_acl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h
index 78b1e3c81d1..cf2b9ce66a9 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-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