diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-08 17:47:33 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-08 17:47:33 +0200 |
| commit | 4e523ad68dce768516f58823667ce0d2484101d0 (patch) | |
| tree | ddc6455bd49752f4483b2fbe513bd7eaac760e0a /mysys | |
| parent | 5e1777f921d1ed9a43687b1c1606f33154add5cf (diff) | |
| parent | e0d0554bac0015643fe882704efbedad5ff024f0 (diff) | |
| download | mariadb-git-4e523ad68dce768516f58823667ce0d2484101d0.tar.gz | |
weave merge from mysql-5.1 to mysql-5.5
Resolved an innodb conflict thanks to vasil.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_fopen.c | 2 | ||||
| -rw-r--r-- | mysys/my_getsystime.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c index e184c8308fc..6e81b644bae 100644 --- a/mysys/my_fopen.c +++ b/mysys/my_fopen.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 diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c index 01b3b912aae..63280f40f2a 100644 --- a/mysys/my_getsystime.c +++ b/mysys/my_getsystime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2004, 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 |