diff options
| -rw-r--r-- | mysys/default.c | 2 | ||||
| -rw-r--r-- | mysys/my_new.cc | 5 | ||||
| -rw-r--r-- | sql/sql_class.cc | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/mysys/default.c b/mysys/default.c index 0067e95ffbe..362aa0d4605 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -1083,7 +1083,7 @@ static const char **init_default_directories(MEM_ROOT *alloc) if ((env= getenv("ETC"))) errors += add_directory(alloc, env, dirs); #elif defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR != "") + if (DEFAULT_SYSCONFDIR[0]) errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); #endif /* __EMX__ || __OS2__ */ diff --git a/mysys/my_new.cc b/mysys/my_new.cc index babfe04d695..7da54ffac87 100644 --- a/mysys/my_new.cc +++ b/mysys/my_new.cc @@ -46,8 +46,9 @@ void operator delete[] (void *ptr) throw () C_MODE_START -int __cxa_pure_virtual() { - assert("Pure virtual method called." == "Aborted"); +int __cxa_pure_virtual() +{ + assert(! "Aborted: pure virtual method called."); return 0; } diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 88b7dfb46d7..74bc669a049 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1758,7 +1758,7 @@ void Query_arena::set_query_arena(Query_arena *set) void Query_arena::cleanup_stmt() { - DBUG_ASSERT("Query_arena::cleanup_stmt()" == "not implemented"); + DBUG_ASSERT(! "Query_arena::cleanup_stmt() not implemented"); } /* |