1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#43461: invalid comparison with string literal in default.c

Browse Source 
Don't compare string literals as it results in unspecified behavior.

mysys/default.c:
  Test for a empty string.
This commit is contained in:
Davi Arnaut 2009-03-19 17:20:15 -03:00
parent e8c13e6a54
commit 27e3214b49
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/default.c
View File

@ -1083,7 +1083,7 @@ static const char **init_default_directories(MEM_ROOT *alloc)
if ((env= getenv("ETC"))) if ((env= getenv("ETC")))
errors += add_directory(alloc, env, dirs); errors += add_directory(alloc, env, dirs);
#elif defined(DEFAULT_SYSCONFDIR) #elif defined(DEFAULT_SYSCONFDIR)
if (DEFAULT_SYSCONFDIR != "") if (DEFAULT_SYSCONFDIR[0])
errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
#endif /* __EMX__ || __OS2__ */ #endif /* __EMX__ || __OS2__ */

5
mysys/my_new.cc
View File

@ -46,8 +46,9 @@ void operator delete[] (void *ptr) throw ()
C_MODE_START C_MODE_START
int __cxa_pure_virtual() { int __cxa_pure_virtual()
assert("Pure virtual method called." == "Aborted"); {
assert(! "Aborted: pure virtual method called.");
return 0; return 0;
} }

2
sql/sql_class.cc
View File

@ -1758,7 +1758,7 @@ void Query_arena::set_query_arena(Query_arena *set)
void Query_arena::cleanup_stmt() void Query_arena::cleanup_stmt()
{ {
DBUG_ASSERT("Query_arena::cleanup_stmt()" == "not implemented"); DBUG_ASSERT(! "Query_arena::cleanup_stmt() not implemented");
} }
/* /*