database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

always use sql/sql_string.* files, never - client/sql_string.*

Browse Source
This commit is contained in:
Sergei Golubchik
2011-12-15 19:28:38 +01:00
parent 505a601821
commit b86ba751da
6 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/CMakeLists.txt
View File

@ -26,7 +26,8 @@ INCLUDE_DIRECTORIES(
) )
ADD_DEFINITIONS(${SSL_DEFINES}) 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) TARGET_LINK_LIBRARIES(mysql mysqlclient)
IF(UNIX) IF(UNIX)
TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})

0
client/sql_string.cc → client/sql_string.cc.dontuse
View File

0
client/sql_string.h → client/sql_string.h.dontuse
View File

1
libmysqld/examples/CMakeLists.txt
View File

@ -16,6 +16,7 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/libmysqld/include ${CMAKE_SOURCE_DIR}/libmysqld/include
${CMAKE_SOURCE_DIR}/regex ${CMAKE_SOURCE_DIR}/regex
${CMAKE_SOURCE_DIR}/sql
${MY_READLINE_INCLUDE_DIR} ${MY_READLINE_INCLUDE_DIR}
) )

3
sql/sql_string.cc
View File

@ -27,9 +27,6 @@
#include "sql_string.h" #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 ** String functions
*****************************************************************************/ *****************************************************************************/

4
sql/sql_string.h
View File

@ -26,10 +26,6 @@
#include "my_sys.h" /* alloc_root, my_free, my_realloc */ #include "my_sys.h" /* alloc_root, my_free, my_realloc */
#include "m_string.h" /* TRASH */ #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; class String;
typedef struct st_io_cache IO_CACHE; typedef struct st_io_cache IO_CACHE;
typedef struct st_mem_root MEM_ROOT; typedef struct st_mem_root MEM_ROOT;