diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 14:32:51 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 14:32:51 -0400 |
| commit | c509f48b8e9cd0714154722aee2c9b8e62d1bc94 (patch) | |
| tree | 60a10a515a9f5656e797d8142f97b94f89f4e797 /sql/signal_handler.cc | |
| parent | 7b57c5ea6f1fda5100ce4a5fb61ee63e8a153d0f (diff) | |
| parent | 90e4f7f9d3f2669ac99f2817f884315bfc86b0a7 (diff) | |
| download | mariadb-git-c509f48b8e9cd0714154722aee2c9b8e62d1bc94.tar.gz | |
Merging mariadb-10.0.9.
* bzr merge -rtag:mariadb-10.0.9 maria/10.0.
Diffstat (limited to 'sql/signal_handler.cc')
| -rw-r--r-- | sql/signal_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc index c50072f5159..3fadbcd088f 100644 --- a/sql/signal_handler.cc +++ b/sql/signal_handler.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2011, Oracle and/or its affiliates. - Copyright (c) 2011, Monty Program Ab. +/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. + Copyright (c) 2011, 2014, SkySQL 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 |