summaryrefslogtreecommitdiff
path: root/mysys/thr_alarm.c
diff options
context:
space:
mode:
authorKent Boortz <kent.boortz@oracle.com>2011-06-30 17:46:53 +0200
committerKent Boortz <kent.boortz@oracle.com>2011-06-30 17:46:53 +0200
commit02e07e3b5195707031dc7399d2a2163b1dfd94a3 (patch)
treed822259015334d322433a6bfcda63aad14087dd6 /mysys/thr_alarm.c
parent5276d4199d2ecc4e15d1687b40489453a811ea3b (diff)
parent68f00a56868c5ca21b2d51598e1a43969ecf4896 (diff)
downloadmariadb-git-02e07e3b5195707031dc7399d2a2163b1dfd94a3.tar.gz
Updated/added copyright headers
Diffstat (limited to 'mysys/thr_alarm.c')
-rw-r--r--mysys/thr_alarm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index 2e427f96bdd..42dd69f50ff 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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
@@ -11,7 +11,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* To avoid problems with alarms in debug code, we disable DBUG here */
#define FORCE_DBUG_OFF