summaryrefslogtreecommitdiff
path: root/mysys/safemalloc.c
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-06-12 15:04:18 +0300
committermonty@mashka.mysql.fi <>2002-06-12 15:04:18 +0300
commitb8421d34ec13d626bb29a2f39021e226bf9ff74e (patch)
tree8495f49bd4d6cb6596a29d60137462d0563ed9ee /mysys/safemalloc.c
parent2aecdd1a91bf8386829146609ce0219c51793841 (diff)
downloadmariadb-git-b8421d34ec13d626bb29a2f39021e226bf9ff74e.tar.gz
Added the following new privleges:
SHOW DATABASES CREATE TEMPORARY TABLE LOCK TABLES REPLICATION SLAVE & REPLICATION CLIENT SUPER EXECUTE All scripts & documentation is updated for this change. Added better error messages for global privileges
Diffstat (limited to 'mysys/safemalloc.c')
-rw-r--r--mysys/safemalloc.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index 961d49f042e..768edc9f11e 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.c
@@ -374,19 +374,16 @@ static int check_ptr(const char *where, byte *ptr, const char *sFile,
return 0;
}
-#ifdef THREAD
+
+#if !defined(PEDANTIC_SAFEMALLOC) && defined(THREAD)
static int legal_leak(struct remember* pPtr)
{
/* TODO: This code needs to be made more general */
return (pthread_self() == pPtr->thread_id || main_th == pPtr->thread_id ||
shutdown_th == pPtr->thread_id || signal_th == pPtr->thread_id);
}
-#else
-static int legal_leak(struct remember* pPtr)
-{
- return 1;
-}
-#endif
+#endif /* THREAD */
+
/*
TERMINATE(FILE *file)