mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

merged 5.0-bugteam -> 5.1-bugteam

Browse source
This commit is contained in:
Georgi Kodinov 2009-03-24 15:58:52 +02:00
commit c36e935ac2
6 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysys/default.c
View file

@ -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 */

5
mysys/my_new.cc
View file

@ -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;
}