database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '5.5' into bb-10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2016-06-21 14:11:02 +02:00
parent 1d21b22155 a482e76e65
commit c081c978a2
84 changed files with 1451 additions and 1053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_reload.cc
View File

@ -1,4 +1,5 @@
/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2010, 2016, Oracle and/or its affiliates.
Copyright (c) 2011, 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