Commit 0f7a57cb authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
parents 7c62023b 805b16ad

config/ac-macros/yassl.m4

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    AC_MSG_RESULT([using bundled yaSSL])

    yassl_dir="extra/yassl"

    openssl_libs="\

    \$(top_builddir)/extra/yassl/src/libyassl.a\

    \$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.a"

    -L\$(top_builddir)/extra/yassl/src -lyassl\

    -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt"

    openssl_includes="-I\$(top_srcdir)/extra/yassl/include"

    AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])

  else

extra/yassl/taocrypt/src/integer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -3941,6 +3941,8 @@ Integer CRT(const Integer &xp, const Integer &p, const Integer &xq, 


#ifdef __GNUC__

template unsigned int DivideThreeWordsByTwo<unsigned int, DWord>(unsigned int*, unsigned int, unsigned int, DWord*);

template unsigned int DivideThreeWordsByTwo<unsigned int, Word>(unsigned int*, unsigned int, unsigned int, Word*);

template unsigned long long DivideThreeWordsByTwo<unsigned long long, DWord>(unsigned long long*, unsigned long long, unsigned long long, DWord*);

#endif



} // namespace

extra/yassl/taocrypt/src/template_instnt.cpp

+10 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ template AlignedAllocator<unsigned int>::pointer StdReallocate<unsigned int, Ali 
#endif

template AllocatorWithCleanup<unsigned char>::pointer StdReallocate<unsigned char, AllocatorWithCleanup<unsigned char> >(AllocatorWithCleanup<unsigned char>&, unsigned char*, AllocatorWithCleanup<unsigned char>::size_type, AllocatorWithCleanup<unsigned char>::size_type, bool);

template AllocatorWithCleanup<unsigned int>::pointer StdReallocate<unsigned int, AllocatorWithCleanup<unsigned int> >(AllocatorWithCleanup<unsigned int>&, unsigned int*, AllocatorWithCleanup<unsigned int>::size_type, AllocatorWithCleanup<unsigned int>::size_type, bool);

template AllocatorWithCleanup<unsigned long long>::pointer StdReallocate<unsigned long long, AllocatorWithCleanup<unsigned long long> >(AllocatorWithCleanup<unsigned long long>&, unsigned long long*, AllocatorWithCleanup<unsigned long long>::size_type, AllocatorWithCleanup<unsigned long long>::size_type, bool);

template class RSA_Decryptor<RSA_BlockType2>;

template class RSA_Encryptor<RSA_BlockType1>;

template class RSA_Encryptor<RSA_BlockType2>;
@@ -18,14 +19,19 @@ template class RSA_Encryptor<RSA_BlockType2>; 


namespace mySTL {

template vector<TaoCrypt::Integer>* uninit_fill_n<vector<TaoCrypt::Integer>*, unsigned int, vector<TaoCrypt::Integer> >(vector<TaoCrypt::Integer>*, unsigned int, vector<TaoCrypt::Integer> const&);

template vector<TaoCrypt::Integer>* uninit_fill_n<vector<TaoCrypt::Integer>*, unsigned long, vector<TaoCrypt::Integer> >(vector<TaoCrypt::Integer>*, unsigned long, vector<TaoCrypt::Integer> const&);

template void destroy<vector<TaoCrypt::Integer>*>(vector<TaoCrypt::Integer>*, vector<TaoCrypt::Integer>*);

template TaoCrypt::Integer* uninit_copy<TaoCrypt::Integer*, TaoCrypt::Integer*>(TaoCrypt::Integer*, TaoCrypt::Integer*, TaoCrypt::Integer*);

template TaoCrypt::Integer* uninit_fill_n<TaoCrypt::Integer*, unsigned int, TaoCrypt::Integer>(TaoCrypt::Integer*, unsigned int, TaoCrypt::Integer const&);

template TaoCrypt::Integer* uninit_fill_n<TaoCrypt::Integer*, unsigned long, TaoCrypt::Integer>(TaoCrypt::Integer*, unsigned long, TaoCrypt::Integer const&);

template void destroy<TaoCrypt::Integer*>(TaoCrypt::Integer*, TaoCrypt::Integer*);

}



template void TaoCrypt::tcDelete<TaoCrypt::HASH>(TaoCrypt::HASH*);

template void TaoCrypt::tcArrayDelete<unsigned>(unsigned*);

template void TaoCrypt::tcArrayDelete<unsigned char>(unsigned char*);

template void TaoCrypt::tcArrayDelete<char>(char*);

namespace TaoCrypt {

template void tcDelete<HASH>(HASH*);

template void tcArrayDelete<unsigned>(unsigned*);

template void tcArrayDelete<unsigned long long>(unsigned long long*);

template void tcArrayDelete<unsigned char>(unsigned char*);

template void tcArrayDelete<char>(char*);

}

#endif

ndb/src/mgmclient/CommandInterpreter.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1190,7 +1190,8 @@ CommandInterpreter::executeShow(char* parameters) 
	api_nodes++;

	break;

      case NDB_MGM_NODE_TYPE_NDB:

	if (state->node_states[i].dynamic_id < master_id)

	if (state->node_states[i].dynamic_id &&

	    state->node_states[i].dynamic_id < master_id)

	  master_id= state->node_states[i].dynamic_id;

	ndb_nodes++;

	break;

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -1027,7 +1027,7 @@ Item_field::Item_field(THD *thd, Field *f) 
    structure can go away and pop up again between subsequent executions

    of a prepared statement).

  */

  if (thd->current_arena->is_stmt_prepare())

  if (thd->current_arena->is_stmt_prepare_or_first_sp_execute())

  {

    if (db_name)

      orig_db_name= thd->strdup(db_name);