diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-26 23:05:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-26 23:05:26 +0200 |
| commit | 872649c7baab3a9f7efdda78e49c4bc7dd481d91 (patch) | |
| tree | 4fffb1a99ca36ccea65e64bcaa81293c40e7539f /storage/myisammrg | |
| parent | 4995bcffaded6a02106632fb8f259cd3d9048dc4 (diff) | |
| parent | 4f1ad43992d75676687f29da96dd7c4147247a8f (diff) | |
| download | mariadb-git-872649c7baab3a9f7efdda78e49c4bc7dd481d91.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 93722162d86..1a575a2ceea 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -1,4 +1,5 @@ /* Copyright (c) 2000, 2011, 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 |