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

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
parents db1a2d2d e403f0e7

extra/yassl/src/ssl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ int read_file(SSL_CTX* ctx, const char* file, int format, CertType type) 
                EVP_BytesToKey(info.name, "MD5", info.iv, (byte*)password,

                               passwordSz, 1, key, iv);



                STL::auto_ptr<BulkCipher> cipher;

                mySTL::auto_ptr<BulkCipher> cipher;

                if (strncmp(info.name, "DES-CBC", 7) == 0)

                    cipher.reset(NEW_YS DES);

                else if (strncmp(info.name, "DES-EDE3-CBC", 13) == 0)
@@ -138,7 +138,7 @@ int read_file(SSL_CTX* ctx, const char* file, int format, CertType type) 
                    return SSL_BAD_FILE;

                }

                cipher->set_decryptKey(key, info.iv);

                STL::auto_ptr<x509> newx(NEW_YS x509(x->get_length()));   

                mySTL::auto_ptr<x509> newx(NEW_YS x509(x->get_length()));   

                cipher->decrypt(newx->use_buffer(), x->get_buffer(),

                                x->get_length());

                ysDelete(x);

include/my_pthread.h

+8 −6
Original line number Diff line number Diff line
@@ -94,17 +94,19 @@ typedef void * (__cdecl *pthread_handler)(void *); 
  __int64 i64;

 };

struct timespec {

  union ft64 start;

  union ft64 tv;

  /* The max timeout value in millisecond for pthread_cond_timedwait */

  long timeout_msec;

  long max_timeout_msec;

};

#define set_timespec(ABSTIME,SEC) { \

  GetSystemTimeAsFileTime(&((ABSTIME).start.ft)); \

  (ABSTIME).timeout_msec= (long)((SEC)*1000); \

  GetSystemTimeAsFileTime(&((ABSTIME).tv.ft)); \

  (ABSTIME).tv.i64+= (__int64)(SEC)*10000000; \

  (ABSTIME).max_timeout_msec= (long)((SEC)*1000); \

}

#define set_timespec_nsec(ABSTIME,NSEC) { \

  GetSystemTimeAsFileTime(&((ABSTIME).start.ft)); \

  (ABSTIME).timeout_msec= (long)((NSEC)/1000000); \

  GetSystemTimeAsFileTime(&((ABSTIME).tv.ft)); \

  (ABSTIME).tv.i64+= (__int64)(NSEC)/100; \

  (ABSTIME).max_timeout_msec= (long)((NSEC)/1000000); \

}



void win_pthread_init(void);

mysql-test/r/myisam.result

+2 −0
Original line number Diff line number Diff line
@@ -922,6 +922,7 @@ SET @@myisam_repair_threads=1; 
SHOW VARIABLES LIKE 'myisam_repair%';

Variable_name	Value

myisam_repair_threads	1

End of 4.1 tests

set storage_engine=MyISAM;

drop table if exists t1,t2,t3;

--- Testing varchar ---
@@ -1608,3 +1609,4 @@ create table t3 (c1 int) engine=myisam pack_keys=default; 
create table t4 (c1 int) engine=myisam pack_keys=2;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2' at line 1

drop table t1, t2, t3;

End of 5.0 tests

mysql-test/r/symlink.result

+4 −2
Original line number Diff line number Diff line
@@ -115,12 +115,12 @@ show create table t1; 
Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/log/'

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/log/'

create table t1 (a int) engine=myisam select 42 a;

select * from t1;

a
@@ -132,3 +132,5 @@ select * from t1; 
a

42

drop table t1;

End of 4.1 tests

End of 5.0 tests

mysql-test/t/myisam.test

+5 −1
Original line number Diff line number Diff line
@@ -846,6 +846,10 @@ DROP TABLE t1; 
#

SET @@myisam_repair_threads=1;

SHOW VARIABLES LIKE 'myisam_repair%';



--echo End of 4.1 tests





# Test varchar

#
@@ -970,4 +974,4 @@ create table t3 (c1 int) engine=myisam pack_keys=default; 
create table t4 (c1 int) engine=myisam pack_keys=2;

drop table t1, t2, t3;



# End of 4.1 tests
 
--echo End of 5.0 tests