Commit d38743ff authored by unknown's avatar unknown
Browse files

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

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


configure.in:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/ndb/include/kernel/ndb_limits.h:
  Auto merged
storage/ndb/include/kernel/signaldata/GetTabInfo.hpp:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/include/ndbapi/ndbapi_limits.h:
  Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
parents d454da56 3034935a

extra/yassl/src/cert_wrapper.cpp

+2 −2
Original line number Diff line number Diff line
@@ -273,8 +273,8 @@ int CertManager::SetPrivateKey(const x509& key) 
    privateKey_.assign(key.get_buffer(), key.get_length());



    // set key type

    if (x509* cert = list_.front()) {

        TaoCrypt::Source source(cert->get_buffer(), cert->get_length());

    if (x509* cert509 = list_.front()) {

        TaoCrypt::Source source(cert509->get_buffer(), cert509->get_length());

        TaoCrypt::CertDecoder cert(source, false);

        cert.DecodeToKey();

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

extra/yassl/taocrypt/include/error.hpp

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ UNKOWN_HASH_E = 1034, // "unknown hash OID" 
DSA_SZ_E        = 1035, // "bad DSA r or s size"

BEFORE_DATE_E   = 1036, // "before date in the future"

AFTER_DATE_E    = 1037, // "after date in the past"

SIG_CONFIRM_E   = 1038, // "bad signature confirmation"

SIG_CONFIRM_E   = 1038  // "bad signature confirmation"



};

extra/yassl/taocrypt/include/misc.hpp

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ typedef unsigned int word32; 
            typedef word32 word;

            typedef word64 dword;

    #else

            typedef word8  hword;

            typedef byte   hword;

            typedef word16 word;

            typedef word32 dword;

    #endif

mysql-test/r/func_math.result

+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ ASIN(0.8+0.2) 
SELECT ASIN(1.2-0.2);

ASIN(1.2-0.2)

1.5707963267949

select format(4.55, 1), format(4.551, 1);

format(4.55, 1)	format(4.551, 1)

4.6	4.6

explain extended select degrees(pi()),radians(360);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

mysql-test/r/ndb_basic.result

+6 −0
Original line number Diff line number Diff line
@@ -667,3 +667,9 @@ counter datavalue 
57	newval

58	newval

drop table t1;

create table atablewithareallylongandirritatingname (a int);

insert into atablewithareallylongandirritatingname values (2);

select * from atablewithareallylongandirritatingname;

a

2

drop table atablewithareallylongandirritatingname;