Merge bk-internal:/home/bk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

1 files changed, 5 insertions, 1 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index fa2bcc4d478..e185631f5d6 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -236,7 +236,11 @@ class MYSQL_LOG: public TC_LOG
 
 public:
   MYSQL_LOG();
-  ~MYSQL_LOG();
+  /*
+    note that there's no destructor ~MYSQL_LOG() !
+    The reason is that we don't want it to be automatically called
+    on exit() - but only during the correct shutdown process
+  */
 
   int open(const char *opt_name);
   void close();