summaryrefslogtreecommitdiff
path: root/mysys/thr_alarm.c
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-01-24 01:59:03 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2012-01-24 01:59:03 +0100
commitb7cf6abe521160a9b9a905df3bdfe134f1336d39 (patch)
tree039c60119e2569a7e186def9a924b67478eab429 /mysys/thr_alarm.c
parentc492296127b55f35f4dd78ba8829b65d3a5c0740 (diff)
parent19d13a3b17d613c04acbcd8c7a0578a55e0c2938 (diff)
downloadmariadb-git-b7cf6abe521160a9b9a905df3bdfe134f1336d39.tar.gz
merge
Diffstat (limited to 'mysys/thr_alarm.c')
-rw-r--r--mysys/thr_alarm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index 4b5144e90bf..7f3bce38c6a 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/*
+ Copyright (c) 2000, 2011, Oracle and/or its affiliates
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