diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-09 11:27:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-09 11:27:40 +0100 |
| commit | f3444df4153ccbb9ea8db73c1b5de6d7aa6d1334 (patch) | |
| tree | 76c059c29ec0caca19a62dbcbe8efcd22e697692 /mysys/lf_hash.c | |
| parent | c4cb24006139bb6a619ca9d6b00d00c2275d2c28 (diff) | |
| parent | 93a6142dd0c0c8b2e0683e4d57082582eac91fdb (diff) | |
| download | mariadb-git-f3444df4153ccbb9ea8db73c1b5de6d7aa6d1334.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
reverted about half of commits as either not applicable or
outright wrong
Diffstat (limited to 'mysys/lf_hash.c')
| -rw-r--r-- | mysys/lf_hash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/lf_hash.c b/mysys/lf_hash.c index ce1115ca3f0..797c20e819e 100644 --- a/mysys/lf_hash.c +++ b/mysys/lf_hash.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. + Copyright (c) 2009, 2016, MariaDB 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 |