mirror of
https://github.com/MariaDB/server.git
synced 2025-08-31 22:22:30 +03:00
mysql-5.5.18 merge
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates.
|
||||
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates.
|
||||
Copyright (c) 2009-2011, Monty Program Ab
|
||||
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
License as published by the Free Software Foundation; version 2
|
||||
@@ -13,8 +13,8 @@
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with this library; if not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
||||
MA 02111-1307, USA */
|
||||
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
|
||||
MA 02110-1301, USA */
|
||||
|
||||
/* UCS2 support. Written by Alexander Barkov <bar@mysql.com> */
|
||||
|
||||
|
Reference in New Issue
Block a user