mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 11:27:39 +02:00
Auto-merge from mysql-5.5.
This commit is contained in:
commit
98f69947aa
98 changed files with 1197 additions and 1697 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (C) 2006 MySQL AB, 2009 Sun Microsystems, Inc
|
||||
# Copyright (c) 2006, 2010, 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,9 +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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mysys)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue