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

fixes for non-debug builds (CMAKE_BUILD_TYPE=Release or RelWithDebInfo)

Browse Source 
client/CMakeLists.txt:
  1. -rdynamic is a linker flag.
  2. it should be used in all builds, not debug only
libmysql/get_password.c:
  prefer a standard function, when possible
  (otherwise a plugin will need to load it from the client)
This commit is contained in:
Sergei Golubchik
2012-01-17 09:11:20 +01:00
parent 8b278b4415
commit 1433621c14
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/CMakeLists.txt
View File

@ -31,7 +31,7 @@ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.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})
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -rdynamic") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
ENDIF(UNIX) ENDIF(UNIX)
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)

2
libmysql/get_password.c
View File

@ -157,7 +157,7 @@ void get_tty_password_buff(const char *opt_message, char *buff, size_t buflen)
passbuff = getpass(opt_message ? opt_message : "Enter password: "); passbuff = getpass(opt_message ? opt_message : "Enter password: ");
/* copy the password to buff and clear original (static) buffer */ /* copy the password to buff and clear original (static) buffer */
strnmov(buff, passbuff, buflen - 1); strncpy(buff, passbuff, buflen - 1);
#ifdef _PASSWORD_LEN #ifdef _PASSWORD_LEN
memset(passbuff, 0, _PASSWORD_LEN); memset(passbuff, 0, _PASSWORD_LEN);
#endif #endif

2
sql/sql_partition.cc
View File

@ -7348,7 +7348,7 @@ int get_part_iter_for_interval_cols_via_map(partition_info *part_info,
PARTITION_ITERATOR *part_iter) PARTITION_ITERATOR *part_iter)
{ {
uint32 nparts; uint32 nparts;
get_col_endpoint_func get_col_endpoint; get_col_endpoint_func UNINIT_VAR(get_col_endpoint);
DBUG_ENTER("get_part_iter_for_interval_cols_via_map"); DBUG_ENTER("get_part_iter_for_interval_cols_via_map");
if (part_info->part_type == RANGE_PARTITION) if (part_info->part_type == RANGE_PARTITION)

2
sql/sql_trigger.cc
View File

@ -1722,7 +1722,7 @@ bool add_table_for_trigger(THD *thd,
LEX *lex= thd->lex; LEX *lex= thd->lex;
char trn_path_buff[FN_REFLEN]; char trn_path_buff[FN_REFLEN];
LEX_STRING trn_path= { trn_path_buff, 0 }; LEX_STRING trn_path= { trn_path_buff, 0 };
LEX_STRING tbl_name; LEX_STRING tbl_name= null_lex_str;
DBUG_ENTER("add_table_for_trigger"); DBUG_ENTER("add_table_for_trigger");

2
vio/viosocket.c
View File

@ -692,9 +692,7 @@ my_bool vio_is_connected(Vio *vio)
void vio_timeout(Vio *vio, uint which, uint timeout) void vio_timeout(Vio *vio, uint which, uint timeout)
{ {
#if defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO) #if defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO)
#ifndef DBUG_OFF
int r; int r;
#endif
DBUG_ENTER("vio_timeout"); DBUG_ENTER("vio_timeout");
{ {