diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
| commit | 567671368723c704d60902b4d0ccff951b414552 (patch) | |
| tree | 965519a5b0af3f33624c7e16fd61b58d15f42372 /vio | |
| parent | efee0608316e4cc034a3e62d05980eef8530843d (diff) | |
| parent | ceefe7bb50b17b72e88851e3b98642e89a4cddae (diff) | |
| download | mariadb-git-567671368723c704d60902b4d0ccff951b414552.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- client/mysqltest.cc
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/t/disabled.def
- sql/mysqld.cc
- sql/opt_range.cc
- sql/sp.cc
- sql/sql_acl.cc
- sql/sql_partition.cc
- sql/sql_table.cc
Diffstat (limited to 'vio')
| -rwxr-xr-x | vio/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vio/vio_priv.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/vio/CMakeLists.txt b/vio/CMakeLists.txt index 164bcde7c4b..e1bd57d150f 100755 --- a/vio/CMakeLists.txt +++ b/vio/CMakeLists.txt @@ -13,8 +13,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX") -SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX") ADD_DEFINITIONS(-DUSE_SYMDIR) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/extra/yassl/include) diff --git a/vio/vio_priv.h b/vio/vio_priv.h index b662a616eef..21fa80143cd 100644 --- a/vio/vio_priv.h +++ b/vio/vio_priv.h @@ -1,3 +1,6 @@ +#ifndef VIO_PRIV_INCLUDED +#define VIO_PRIV_INCLUDED + /* Copyright (C) 2003 MySQL AB This program is free software; you can redistribute it and/or modify @@ -41,3 +44,4 @@ void vio_ssl_delete(Vio *vio); int vio_ssl_blocking(Vio *vio, my_bool set_blocking_mode, my_bool *old_mode); #endif /* HAVE_OPENSSL */ +#endif /* VIO_PRIV_INCLUDED */ |