diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
| commit | 4f435bddfd44d40999f88685c61cc04e319d8d6c (patch) | |
| tree | f9d0655a0d901b87f918a736741144b502cba3f6 /sql-common | |
| parent | 8c2bcdf85ff753bceeb5b235f3605e348e6f9e1d (diff) | |
| parent | 6ca4ca7d37fed3b3da18666768de6a2f8c34bc7b (diff) | |
| download | mariadb-git-4f435bddfd44d40999f88685c61cc04e319d8d6c.tar.gz | |
5.3 merge
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 3 | ||||
| -rw-r--r-- | sql-common/my_time.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 638dab9afc4..3e9a4592853 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. +/* + Copyright (c) 2003, 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 diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 83271aa91a0..3476401792c 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +/* + Copyright (c) 2004, 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 |