diff options
author | iggy@amd64.(none) <> | 2008-03-28 14:02:27 -0400 |
---|---|---|
committer | iggy@amd64.(none) <> | 2008-03-28 14:02:27 -0400 |
commit | 79e434bc67abc695cd5c3a711a7f1732f91da155 (patch) | |
tree | bd2b7d6f189d12c7958ade6c6684233a9fae3607 /libmysql | |
parent | e09d9838259f831c27c546a2fea3a24e6b432733 (diff) | |
download | mariadb-git-79e434bc67abc695cd5c3a711a7f1732f91da155.tar.gz |
Bug#26243 mysql command line crash after control-c
- Backported the 5.1 DBUG to 5.0.
- Avoid memory cleanup race on Windows client for CTRL-C
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 0320126a522..affb5462eff 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-------------------------------------------------------"); |