diff options
author | unknown <sasha@mysql.sashanet.com> | 2002-03-30 12:36:05 -0700 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2002-03-30 12:36:05 -0700 |
commit | 5449b03bc83cc6917e47c4f50a630a189a595c3d (patch) | |
tree | ad398b75895850d75ea225d34b9dc052ac6d9f37 /dbug | |
parent | ef261914d3fdaaf25f1415b8625cc9ff89f9266a (diff) | |
download | mariadb-git-5449b03bc83cc6917e47c4f50a630a189a595c3d.tar.gz |
replication updates. This changeset seems to be working fine on test systems.
If no problems are discovered in the next week, this will make the replication
code ready for 4.0.2 release.
dbug/dbug.c:
cleanup of my previous fix
sql/mysqld.cc:
fixed a REALLY NASTY BUG - slave threads were being launched before
initialization of global thread keys. Thus if the slave thread was slow
to start everything worked fine, but if it started quickly, we would get
into trouble using the unitinialized keys
sql/net_pkg.cc:
make net_printf() work with 0 error code taking the third argument as
format string in that case
sql/slave.cc:
misc fix-ups and debugging instrumentations
sql/slave.h:
added skip_log_purge member
sql/sql_class.cc:
debugging instrumentation to track down random memory corruption
sql/sql_class.h:
added debugging sentry to THD to track down memory corruption
sql/sql_repl.cc:
fixed bugs in CHANGE MASTER
Diffstat (limited to 'dbug')
-rw-r--r-- | dbug/dbug.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index 8f214bfbe7c..88d8043c0e5 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -706,8 +706,6 @@ char ***_sframep_ __attribute__((unused))) if (!_no_db_) { int save_errno=errno; - if (!init_done) - _db_push_ (_DBUG_START_CONDITION_); /* Sasha: the test below is so we could call functions with DBUG_ENTER before my_thread_init(). I needed this because I suspected corruption of a block allocated by my_thread_init() itself, so I wanted to use @@ -715,6 +713,8 @@ char ***_sframep_ __attribute__((unused))) */ if (!(state=code_state())) return; + if (!init_done) + _db_push_ (_DBUG_START_CONDITION_); *_sfunc_ = state->func; *_sfile_ = state->file; @@ -794,10 +794,10 @@ uint *_slevel_) if (!_no_db_) { int save_errno=errno; + if (!(state=code_state())) + return; if (!init_done) _db_push_ (""); - if (!(state=code_state())) - return; /* Only happens at end of program */ if (stack->flags & (TRACE_ON | DEBUG_ON | PROFILE_ON)) { if (!state->locked) |