summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2002-03-30 12:36:05 -0700
committerunknown <sasha@mysql.sashanet.com>2002-03-30 12:36:05 -0700
commit5449b03bc83cc6917e47c4f50a630a189a595c3d (patch)
treead398b75895850d75ea225d34b9dc052ac6d9f37 /sql/sql_class.h
parentef261914d3fdaaf25f1415b8625cc9ff89f9266a (diff)
downloadmariadb-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 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index fa63cd90976..289a2ab9255 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -251,6 +251,11 @@ public:
class delayed_insert;
+#define THD_SENTRY_MAGIC 0xfeedd1ff
+#define THD_SENTRY_GONE 0xdeadbeef
+
+#define THD_CHECK_SENTRY(thd) DBUG_ASSERT(thd->dbug_sentry == THD_SENTRY_MAGIC)
+
/* For each client connection we create a separate thread with THD serving as
a thread/connection descriptor */
@@ -312,6 +317,9 @@ public:
// TODO: document the variables below
MYSQL_LOCK *lock,*locked_tables;
ULL *ull;
+#ifndef DBUG_OFF
+ uint dbug_sentry; // watch out for memory corruption
+#endif
struct st_my_thread_var *mysys_var;
enum enum_server_command command;
uint32 server_id;