diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:47:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:54:04 +0300 |
| commit | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch) | |
| tree | 7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /sql/thr_malloc.cc | |
| parent | 8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff) | |
| parent | cb248f880619431850e5638009a6098048050edf (diff) | |
| download | mariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/thr_malloc.cc')
| -rw-r--r-- | sql/thr_malloc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/thr_malloc.cc b/sql/thr_malloc.cc index cbed769a424..4ad99bba7b5 100644 --- a/sql/thr_malloc.cc +++ b/sql/thr_malloc.cc @@ -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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Mallocs for used in threads */ |