diff options
| -rw-r--r-- | client/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | client/sql_string.cc.dontuse (renamed from client/sql_string.cc) | 0 | ||||
| -rw-r--r-- | client/sql_string.h.dontuse (renamed from client/sql_string.h) | 0 | ||||
| -rw-r--r-- | libmysqld/examples/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | sql/sql_string.cc | 3 | ||||
| -rw-r--r-- | sql/sql_string.h | 4 |
6 files changed, 3 insertions, 8 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 18ecf2de03d..a5a73298122 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -26,7 +26,8 @@ INCLUDE_DIRECTORIES( ) ADD_DEFINITIONS(${SSL_DEFINES}) -MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) +MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc + ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) diff --git a/client/sql_string.cc b/client/sql_string.cc.dontuse index 26181722b11..26181722b11 100644 --- a/client/sql_string.cc +++ b/client/sql_string.cc.dontuse diff --git a/client/sql_string.h b/client/sql_string.h.dontuse index 26f3b330f20..26f3b330f20 100644 --- a/client/sql_string.h +++ b/client/sql_string.h.dontuse diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index 209e27c7870..3d67083acc9 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -16,6 +16,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libmysqld/include ${CMAKE_SOURCE_DIR}/regex + ${CMAKE_SOURCE_DIR}/sql ${MY_READLINE_INCLUDE_DIR} ) diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 47170e6c3db..683511c3da4 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -27,9 +27,6 @@ #include "sql_string.h" -#ifdef MYSQL_CLIENT -#error Attempt to use server-side sql_string on client. Use client/sql_string.cc -#endif /***************************************************************************** ** String functions *****************************************************************************/ diff --git a/sql/sql_string.h b/sql/sql_string.h index 7412022baf4..e0f9af9615b 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -26,10 +26,6 @@ #include "my_sys.h" /* alloc_root, my_free, my_realloc */ #include "m_string.h" /* TRASH */ -#ifdef MYSQL_CLIENT -#error Attempt to use server-side sql_string on client. Use client/sql_string.h -#endif - class String; typedef struct st_io_cache IO_CACHE; typedef struct st_mem_root MEM_ROOT; |