Commit fe9d2f93 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents a2f7649e e3648650

VC++Files/sql/mysqld.dsp

+7 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ LINK32=xilink6.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c

# SUBTRACT CPP /Fr /YX

# ADD BASE RSC /l 0x410 /d "_DEBUG"

# ADD RSC /l 0x409 /d "_DEBUG"
@@ -130,7 +130,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -159,7 +159,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -452,6 +452,10 @@ SOURCE=.\gstream.cpp 
# End Source File

# Begin Source File



SOURCE=.\examples\ha_archive.cpp

# End Source File

# Begin Source File



SOURCE=.\ha_blackhole.cpp

# End Source File

# Begin Source File

extra/yassl/include/factory.hpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public: 
        init(*this); 

    }



    // reservce place in vector before registering, used by init funcion

    // reserve place in vector before registering, used by init funcion

    void Reserve(size_t sz)

    {

        callbacks_.reserve(sz);

extra/yassl/include/yassl_int.hpp

+5 −3
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
#include "yassl_imp.hpp"

#include "crypto_wrapper.hpp"

#include "cert_wrapper.hpp"

#include "lock.hpp"

#include "log.hpp"

#include "lock.hpp"





namespace yaSSL {
@@ -122,7 +122,8 @@ public: 


    friend sslFactory& GetSSL_Factory();        // singleton creator

private:

    static sslFactory instance;

    static sslFactory instance_;



    sslFactory(const sslFactory&);              // hide copy

    sslFactory& operator=(const sslFactory&);   // and assign   

};
@@ -207,9 +208,10 @@ public: 


    friend Sessions& GetSessions(); // singleton creator

private:

    static Sessions instance_;



    Sessions(const Sessions&);              // hide copy

    Sessions& operator=(const Sessions&);   // and assign

    static Sessions instance;

};

extra/yassl/include/yassl_types.hpp

+0 −10
Original line number Diff line number Diff line
@@ -29,16 +29,6 @@ 


#include <stddef.h>



namespace yaSSL {



// library allocation

struct new_t {};      // yaSSL New type

extern new_t ys;      // pass in parameter



} // namespace yaSSL



void* operator new  (size_t, yaSSL::new_t);

void* operator new[](size_t, yaSSL::new_t);



namespace yaSSL {

extra/yassl/src/buffer.cpp

+6 −6
Original line number Diff line number Diff line
@@ -62,13 +62,13 @@ input_buffer::input_buffer() 




input_buffer::input_buffer(uint s) 

    : size_(0), current_(0), buffer_(new (ys) byte[s]), end_(buffer_ + s)

    : size_(0), current_(0), buffer_(new byte[s]), end_(buffer_ + s)

{}





// with assign

input_buffer::input_buffer(uint s, const byte* t, uint len) 

    : size_(0), current_(0), buffer_(new (ys) byte[s]), end_(buffer_ + s) 

    : size_(0), current_(0), buffer_(new byte[s]), end_(buffer_ + s) 

{ 

    assign(t, len); 

}
@@ -84,7 +84,7 @@ input_buffer::~input_buffer() 
void input_buffer::allocate(uint s) 

{ 

    assert(!buffer_);       // find realloc error

    buffer_ = new (ys) byte[s];

    buffer_ = new byte[s];

    end_ = buffer_ + s; 

}
@@ -198,13 +198,13 @@ output_buffer::output_buffer() 


// with allocate

output_buffer::output_buffer(uint s) 

    : current_(0), buffer_(new (ys) byte[s]), end_(buffer_ + s) 

    : current_(0), buffer_(new byte[s]), end_(buffer_ + s) 

{}





// with assign

output_buffer::output_buffer(uint s, const byte* t, uint len) 

    : current_(0), buffer_(new (ys) byte[s]), end_(buffer_+ s) 

    : current_(0), buffer_(new byte[s]), end_(buffer_+ s) 

{ 

    write(t, len); 

}
@@ -239,7 +239,7 @@ void output_buffer::set_current(uint c) 
void output_buffer::allocate(uint s) 

{ 

    assert(!buffer_);   // find realloc error

    buffer_ = new (ys) byte[s]; end_ = buffer_ + s; 

    buffer_ = new byte[s]; end_ = buffer_ + s; 

}