diff options
| author | unknown <iggy@amd64.(none)> | 2008-03-28 16:01:05 -0400 |
|---|---|---|
| committer | unknown <iggy@amd64.(none)> | 2008-03-28 16:01:05 -0400 |
| commit | 219c7a2a4712ea829d24378eb34288b3563231d6 (patch) | |
| tree | 7bc62903e7cf887e446a8dd7c0e348d785518e72 /libmysql | |
| parent | afb4ac4545e07de958ca8721e1b7891ee4c0b955 (diff) | |
| parent | a9089cf460c7d7be3d8b843c948f0c707822878e (diff) | |
| download | mariadb-git-219c7a2a4712ea829d24378eb34288b3563231d6.tar.gz | |
Merge amd64.(none):/src/mysql-5.0-bugteam
into amd64.(none):/src/bug26243/my50-bug26243
libmysql/libmysql.c:
Auto merged
myisam/mi_open.c:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 97e0835b99f..bcbaf9f1822 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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-------------------------------------------------------"); |