Skip to content

Commit 30e15f1

Browse files
committed
Bug#18525978: COMBINE CLIENT/SQL_STRING AND SQL/SQL_STRING
This patch removes client/sql_string.cc and moves sql/sql_string.cc to sql-common so that it can be used by both client and server. This removes code duplication. It turns out that the differences between client/sql_string.cc and sql/sql_string.cc were mostly due to bugfixes only applied to the latter (Bug#56492, Bug#44793, WL#1213, Bug#24293).
1 parent a909976 commit 30e15f1

File tree

10 files changed

+19
-1159
lines changed

10 files changed

+19
-1159
lines changed

client/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ INCLUDE_DIRECTORIES(
3131
COPY_OPENSSL_DLLS(copy_openssl_client)
3232

3333
ADD_DEFINITIONS(${SSL_DEFINES})
34-
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
34+
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc)
3535
TARGET_LINK_LIBRARIES(mysql mysqlclient)
3636
IF(UNIX)
3737
TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})

0 commit comments

Comments
 (0)