bk commit into 5.2 tree (rafal:1.2536)

[rsomla]

Below is the list of changes that have just been committed into a local
5.2 repository of rafal. When rafal does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-28 20:51:20+02:00, rafal@quant.(none) +1 -0
  WL#3568: Try to satisfy win compiler which doesn't like dereferencing
  this during object construction.

  sql/backup/stream.h@stripped, 2007-06-28 20:51:18+02:00, rafal@quant.(none) +5 -3
    In IStream constructor don't dereference this during member initialization.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	rafal
# Host:	quant.(none)
# Root:	/ext/mysql/bk/backup/alpha

--- 1.4/sql/backup/stream.h	2007-06-28 20:51:24 +02:00
+++ 1.5/sql/backup/stream.h	2007-06-28 20:51:24 +02:00
@@ -90,8 +90,10 @@
 
   typedef typename SWin::Result Result;
 
-  IStream(SWin &swin): m_win(swin)
-  {}
+  IStream(SWin *swin): m_win(*swin)
+  {
+    DBUG_ASSERT(swin);
+  }
 
   Result readbyte(byte &x)
   {
@@ -567,7 +569,7 @@
 
   IStream(const String &name):
     Stream(name,O_RDONLY),
-    Base3(static_cast<Window&>(*this)),
+    Base3(this),
     bytes(0)
   { last_byte= m_buf; }