1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
This commit is contained in:
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se 2006-07-28 21:29:05 +02:00
commit 50b09967f2
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extra/yassl/taocrypt/include/asn.hpp
View File

@ -103,7 +103,7 @@ enum Constants
MAX_ALGO_SIZE = 9, MAX_ALGO_SIZE = 9,
MAX_DIGEST_SZ = 25, // SHA + enum(Bit or Octet) + length(4) MAX_DIGEST_SZ = 25, // SHA + enum(Bit or Octet) + length(4)
DSA_SIG_SZ = 40, DSA_SIG_SZ = 40,
NAME_MAX = 512 // max total of all included names ASN_NAME_MAX = 512 // max total of all included names
}; };
@ -216,7 +216,7 @@ enum { SHA_SIZE = 20 };
// A Signing Authority // A Signing Authority
class Signer { class Signer {
PublicKey key_; PublicKey key_;
char name_[NAME_MAX]; char name_[ASN_NAME_MAX];
byte hash_[SHA_SIZE]; byte hash_[SHA_SIZE];
public: public:
Signer(const byte* k, word32 kSz, const char* n, const byte* h); Signer(const byte* k, word32 kSz, const char* n, const byte* h);
@ -270,8 +270,8 @@ private:
byte subjectHash_[SHA_SIZE]; // hash of all Names byte subjectHash_[SHA_SIZE]; // hash of all Names
byte issuerHash_[SHA_SIZE]; // hash of all Names byte issuerHash_[SHA_SIZE]; // hash of all Names
byte* signature_; byte* signature_;
char issuer_[NAME_MAX]; // Names char issuer_[ASN_NAME_MAX]; // Names
char subject_[NAME_MAX]; // Names char subject_[ASN_NAME_MAX]; // Names
char beforeDate_[MAX_DATE_SZ]; // valid before date char beforeDate_[MAX_DATE_SZ]; // valid before date
char afterDate_[MAX_DATE_SZ]; // valid after date char afterDate_[MAX_DATE_SZ]; // valid after date
bool verify_; // Default to yes, but could be off bool verify_; // Default to yes, but could be off

2
extra/yassl/taocrypt/src/asn.cpp
View File

@ -665,7 +665,7 @@ void CertDecoder::GetName(NameType nt)
SHA sha; SHA sha;
word32 length = GetSequence(); // length of all distinguished names word32 length = GetSequence(); // length of all distinguished names
assert (length < NAME_MAX); assert (length < ASN_NAME_MAX);
length += source_.get_index(); length += source_.get_index();
char* ptr = (nt == ISSUER) ? issuer_ : subject_; char* ptr = (nt == ISSUER) ? issuer_ : subject_;

8
sql/sql_select.cc
View File

@ -4131,14 +4131,14 @@ greedy_search(JOIN *join,
double read_time= 0.0; double read_time= 0.0;
uint idx= join->const_tables; // index into 'join->best_ref' uint idx= join->const_tables; // index into 'join->best_ref'
uint best_idx; uint best_idx;
uint rem_size; // cardinality of remaining_tables uint size_remain; // cardinality of remaining_tables
POSITION best_pos; POSITION best_pos;
JOIN_TAB *best_table; // the next plan node to be added to the curr QEP JOIN_TAB *best_table; // the next plan node to be added to the curr QEP
DBUG_ENTER("greedy_search"); DBUG_ENTER("greedy_search");
/* number of tables that remain to be optimized */ /* number of tables that remain to be optimized */
rem_size= my_count_bits(remaining_tables); size_remain= my_count_bits(remaining_tables);
do { do {
/* Find the extension of the current QEP with the lowest cost */ /* Find the extension of the current QEP with the lowest cost */
@ -4146,7 +4146,7 @@ greedy_search(JOIN *join,
best_extension_by_limited_search(join, remaining_tables, idx, record_count, best_extension_by_limited_search(join, remaining_tables, idx, record_count,
read_time, search_depth, prune_level); read_time, search_depth, prune_level);
if (rem_size <= search_depth) if (size_remain <= search_depth)
{ {
/* /*
'join->best_positions' contains a complete optimal extension of the 'join->best_positions' contains a complete optimal extension of the
@ -4182,7 +4182,7 @@ greedy_search(JOIN *join,
read_time+= join->positions[idx].read_time; read_time+= join->positions[idx].read_time;
remaining_tables&= ~(best_table->table->map); remaining_tables&= ~(best_table->table->map);
--rem_size; --size_remain;
++idx; ++idx;
DBUG_EXECUTE("opt", print_plan(join, join->tables, DBUG_EXECUTE("opt", print_plan(join, join->tables,