diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-15 19:28:38 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-15 19:28:38 +0100 |
| commit | b86ba751daf208f38aaa98672d10733fd7173eae (patch) | |
| tree | 18e771eded2ddda17374edd528454401aaa21bd2 /client | |
| parent | 505a6018212751b311c2ded88ffe200867729e86 (diff) | |
| download | mariadb-git-b86ba751daf208f38aaa98672d10733fd7173eae.tar.gz | |
always use sql/sql_string.* files, never - client/sql_string.*
Diffstat (limited to 'client')
| -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 |
3 files changed, 2 insertions, 1 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 |