summaryrefslogtreecommitdiff
path: root/mysys/thr_alarm.c
diff options
context:
space:
mode:
authorKent Boortz <kent.boortz@oracle.com>2011-06-30 17:37:13 +0200
committerKent Boortz <kent.boortz@oracle.com>2011-06-30 17:37:13 +0200
commit68f00a56868c5ca21b2d51598e1a43969ecf4896 (patch)
tree340d25d29aee511a9aaaf908894aea6a4ccbe8d0 /mysys/thr_alarm.c
parent679e460ed4aadd2180198272c5b89d65422fb384 (diff)
parent44135d4725dd3ad6d331c60b0bab1618472b8ae4 (diff)
downloadmariadb-git-68f00a56868c5ca21b2d51598e1a43969ecf4896.tar.gz
Updated/added copyright headers
Diffstat (limited to 'mysys/thr_alarm.c')
-rw-r--r--mysys/thr_alarm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index 386691be4de..6541fab138b 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/*
+ Copyright (c) 2000, 2010, 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 +12,8 @@
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