diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-03-24 15:58:52 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-03-24 15:58:52 +0200 |
| commit | 706a0a39ed3f6ca0f582d3c0946fce6e98062534 (patch) | |
| tree | 52d5e2538b0d3d438c092ff518220c8a1b274613 /mysys | |
| parent | 8ac45fb09d145d284aa78e54473748d2c82b23cd (diff) | |
| parent | 84a63525d5d54af1dce105dd01f3708268f5e1ee (diff) | |
| download | mariadb-git-706a0a39ed3f6ca0f582d3c0946fce6e98062534.tar.gz | |
merged 5.0-bugteam -> 5.1-bugteam
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 2 | ||||
| -rw-r--r-- | mysys/my_new.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mysys/default.c b/mysys/default.c index ce997f2556a..1c021b4584f 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -1127,7 +1127,7 @@ static const char **init_default_directories(MEM_ROOT *alloc) errors += add_directory(alloc, "/etc/mysql/", dirs); #if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR != "") + if (DEFAULT_SYSCONFDIR[0]) errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); #endif /* DEFAULT_SYSCONFDIR */ 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; } |