Commit 04bddf75 authored by unknown's avatar unknown
Browse files

Merge heikki@build.mysql.com:/home/bk/mysql-4.0 

into hundin.mysql.fi:/home/heikki/mysql-4.0
parents a7139dd2 82472a06

include/violite.h

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ void vio_timeout(Vio *vio,uint timeout); 
#define DES_cblock des_cblock

#define DES_key_schedule des_key_schedule

#define DES_set_key_unchecked(k,ks) des_set_key_unchecked((k),*(ks))

#define DES_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e) des_ede3_cbc_encrypt((i),(o),(

#define DES_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e) des_ede3_cbc_encrypt((i),(o),(l),*(k1),*(k2),*(k3),(iv),(e))

#endif



#define HEADER_DES_LOCL_H dummy_something