mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Bug #49130 Running mtr tests with valgrind and debug produces lots of warnings
Use safe output formats for strings that are not null terminated. sql/item_func.cc: Use "%*.s" rather than "%s" format. sql/protocol.cc: Use "%*.s" rather than "%s" format. sql/sql_test.cc: Improve output from print_where() - output (nil) predicate if predicate is null - also output pointer value, for tracing of assignment and copying of predicates sql/sql_view.cc: Use "%*.s" rather than "%s" format.
This commit is contained in:
@ -55,19 +55,18 @@ static const char *lock_descriptions[] =
|
||||
void
|
||||
print_where(COND *cond,const char *info, enum_query_type query_type)
|
||||
{
|
||||
char buff[256];
|
||||
String str(buff,(uint32) sizeof(buff), system_charset_info);
|
||||
str.length(0);
|
||||
if (cond)
|
||||
{
|
||||
char buff[256];
|
||||
String str(buff,(uint32) sizeof(buff), system_charset_info);
|
||||
str.length(0);
|
||||
cond->print(&str, query_type);
|
||||
str.append('\0');
|
||||
DBUG_LOCK_FILE;
|
||||
(void) fprintf(DBUG_FILE,"\nWHERE:(%s) ",info);
|
||||
(void) fputs(str.ptr(),DBUG_FILE);
|
||||
(void) fputc('\n',DBUG_FILE);
|
||||
DBUG_UNLOCK_FILE;
|
||||
}
|
||||
str.append('\0');
|
||||
|
||||
DBUG_LOCK_FILE;
|
||||
(void) fprintf(DBUG_FILE,"\nWHERE:(%s) %p ", info, cond);
|
||||
(void) fputs(str.ptr(),DBUG_FILE);
|
||||
(void) fputc('\n',DBUG_FILE);
|
||||
DBUG_UNLOCK_FILE;
|
||||
}
|
||||
/* This is for debugging purposes */
|
||||
|
||||
|
Reference in New Issue
Block a user