mirror of
https://github.com/MariaDB/server.git
synced 2026-04-22 08:15:31 +02:00
mysql-5.5.18 merge
This commit is contained in:
commit
0e007344ea
1160 changed files with 12806 additions and 6189 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 2004-2006 MySQL AB
|
||||
/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
|
||||
|
||||
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
|
||||
|
|
@ -11,7 +11,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 */
|
||||
|
||||
#include <my_time.h>
|
||||
#include <m_string.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue