Commit 36aeee36 authored by unknown's avatar unknown
Browse files

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

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NodeFailRep.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/ndbapi/Makefile.am:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/src/NdbBackup.cpp:
  Auto merged
parents de82d9ee 057855a3

BitKeeper/etc/RESYNC_TREE

0 → 100644
+0 −0

Empty file added.

client/mysqlimport.c

+2 −1
Original line number Diff line number Diff line
@@ -37,8 +37,9 @@ static char *add_load_option(char *ptr,const char *object, 
			     const char *statement);



static my_bool	verbose=0,lock_tables=0,ignore_errors=0,opt_delete=0,

		replace=0,silent=0,ignore=0,opt_compress=0,opt_local_file=0,

		replace=0,silent=0,ignore=0,opt_compress=0,

                opt_low_priority= 0, tty_password= 0;

static uint     opt_local_file=0;

static MYSQL	mysql_connection;

static char	*opt_password=0, *current_user=0,

		*current_host=0, *current_db=0, *fields_terminated=0,

extra/yassl/taocrypt/include/misc.hpp

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public: 




// no gas on these systems ?, disable for now

#if defined(__sun__) || defined (__QNX__)

#if defined(__sun__) || defined (__QNX__) || defined (__APPLE__)

    #define TAOCRYPT_DISABLE_X86ASM

#endif

extra/yassl/taocrypt/include/runtime.hpp

+3 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 






#if !defined(yaSSL_NEW_HPP) && defined(__GNUC__) && !defined(__ICC)

#if !defined(yaSSL_NEW_HPP) && defined(__GNUC__) 

#if !(defined(__ICC) || defined(__INTEL_COMPILER))



#define yaSSL_NEW_HPP
@@ -46,5 +47,6 @@ static int __cxa_pure_virtual() 
} // extern "C"



#endif // __GNUC__ > 2

#endif // ! _ICC

#endif // yaSSL_NEW_HPP && __GNUC__

extra/yassl/taocrypt/include/types.hpp

+2 −1
Original line number Diff line number Diff line
@@ -61,9 +61,10 @@ typedef unsigned int word32; 


// compilers we've found 64-bit multiply insructions for

#if defined(__GNUC__) || defined(_MSC_VER) || defined(__DECCXX)

#if !(defined(__ICC) || defined(__INTEL_COMPILER))

    #define HAVE_64_MULTIPLY

#endif



#endif

    

#if defined(HAVE_64_MULTIPLY) && (defined(__alpha__) || defined(__ia64__) \

    || defined(_ARCH_PPC64) || defined(__mips64)  || defined(__x86_64__))