Commit 20b6f563 authored by Horst Hunger's avatar Horst Hunger
Browse files

Due to merges.

parents e886b712 ac1ca6b9

dbug/dbug.c

+9 −0
Original line number Diff line number Diff line
@@ -2407,4 +2407,13 @@ int i_am_a_dummy_function() { 
       return 0;

}



#ifdef __WIN__

char _db_doprnt_;

char _db_enter_;

char _db_pargs_;

char _db_process_;

char _db_push_;

char _db_return_;

#endif /*__WIN__*/



#endif

extra/yassl/src/cert_wrapper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ int CertManager::Validate() 
        TaoCrypt::CertDecoder cert(source, true, &signers_, verifyNone_);



        int err = cert.GetError().What();

        if ( err && err != TaoCrypt::SIG_OTHER_E)

        if ( err )

            return err;



        uint sz = cert.GetPublicKey().size();

include/my_dbug.h

+16 −0
Original line number Diff line number Diff line
@@ -108,6 +108,22 @@ extern FILE *_db_fp_(void); 
#define DBUG_EXPLAIN(buf,len)

#define DBUG_EXPLAIN_INITIAL(buf,len)

#define IF_DBUG(A)



#ifdef __WIN__

/*

   On windows all the dll export has to be declared in the *.def file

   so as we export these symbols in DEBUG mode we have to export

   these in the RELEASE mode also. So below are the dummy symbols

   for the RELEASE export

*/

extern  char _db_doprnt_;

extern  char _db_enter_;

extern  char _db_pargs_;

extern  char _db_process_;

extern  char _db_push_;

extern  char _db_return_;

#endif /*__WIN__*/



#endif

#ifdef	__cplusplus

}

include/my_global.h

+5 −5
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ 
#ifndef _global_h

#define _global_h



#ifndef EMBEDDED_LIBRARY

#define HAVE_REPLICATION

#define HAVE_EXTERNAL_CLIENT

#endif



/*

  InnoDB depends on some MySQL internals which other plugins should not

  need.  This is because of InnoDB's foreign key support, "safe" binlog
@@ -101,6 +96,11 @@ 
#endif

#endif /* !EMBEDDED_LIBRARY */



#ifndef EMBEDDED_LIBRARY

#define HAVE_REPLICATION

#define HAVE_EXTERNAL_CLIENT

#endif



/* Some defines to avoid ifdefs in the code */

#ifndef NETWARE_YIELD

#define NETWARE_YIELD

libmysqld/examples/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ ADD_DEFINITIONS(-DEMBEDDED_LIBRARY) 
ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc

               ../../client/mysql.cc ../../client/readline.cc

               ../../client/sql_string.cc)

TARGET_LINK_LIBRARIES(mysql_embedded mysys yassl taocrypt zlib debug dbug regex strings wsock32)

TARGET_LINK_LIBRARIES(mysql_embedded wsock32)

ADD_DEPENDENCIES(mysql_embedded libmysqld)



ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.c)

TARGET_LINK_LIBRARIES(mysqltest_embedded mysys yassl taocrypt zlib debug dbug regex strings wsock32)

TARGET_LINK_LIBRARIES(mysqltest_embedded wsock32)

ADD_DEPENDENCIES(mysqltest_embedded libmysqld)



ADD_EXECUTABLE(mysql_client_test_embedded ../../tests/mysql_client_test.c)

TARGET_LINK_LIBRARIES(mysql_client_test_embedded debug dbug mysys yassl taocrypt zlib strings wsock32)

TARGET_LINK_LIBRARIES(mysql_client_test_embedded wsock32)

ADD_DEPENDENCIES(mysql_client_test_embedded libmysqld)