diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
commit | cb248f880619431850e5638009a6098048050edf (patch) | |
tree | 32858b1936d56c8391abf003fbdf6a9d6ba9a5e9 /storage/myisammrg/myrg_locking.c | |
parent | c0ac0b886047496e105a566a063bf1bd932d00a4 (diff) | |
parent | 5543b75550962f07b4adcd47a6e52accec0a7d0f (diff) | |
download | mariadb-git-cb248f880619431850e5638009a6098048050edf.tar.gz |
Merge branch '5.5' into 10.1
Diffstat (limited to 'storage/myisammrg/myrg_locking.c')
-rw-r--r-- | storage/myisammrg/myrg_locking.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisammrg/myrg_locking.c b/storage/myisammrg/myrg_locking.c index 2c48f51991a..a79e35d2364 100644 --- a/storage/myisammrg/myrg_locking.c +++ b/storage/myisammrg/myrg_locking.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* Lock databases against read or write. |