mirror of
https://github.com/MariaDB/server.git
synced 2025-06-13 13:01:51 +03:00
mysql-5.5.18 merge
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
#ifndef MYSQL_PLUGIN_AUTH_COMMON_INCLUDED
|
||||
/* Copyright (C) 2010 Sergei Golubchik and Monty Program Ab
|
||||
Copyright (C) 2010 Sun Microsystems, Inc.
|
||||
Copyright (c) 2010, Oracle and/or its affiliates.
|
||||
|
||||
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
|
||||
@ -13,7 +13,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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
|
Reference in New Issue
Block a user