mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 23:25:34 +02:00
Merge amd64.(none):/src/mysql-5.0-bugteam
into amd64.(none):/src/bug26243/my50-bug26243
This commit is contained in:
commit
b9877b84ac
19 changed files with 1754 additions and 1444 deletions
|
|
@ -298,16 +298,12 @@ mysql_debug(const char *debug __attribute__((unused)))
|
|||
{
|
||||
#ifndef DBUG_OFF
|
||||
char *env;
|
||||
if (_db_on_)
|
||||
return; /* Already using debugging */
|
||||
if (debug)
|
||||
{
|
||||
DEBUGGER_ON;
|
||||
DBUG_PUSH(debug);
|
||||
}
|
||||
else if ((env = getenv("MYSQL_DEBUG")))
|
||||
{
|
||||
DEBUGGER_ON;
|
||||
DBUG_PUSH(env);
|
||||
#if !defined(_WINVER) && !defined(WINVER)
|
||||
puts("\n-------------------------------------------------------");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue