bk commit into 5.0 tree (df:1.2530)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.0 repository of df. When df does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-15 11:28:15+02:00, df@stripped +1 -0
  follow-up fix

  include/violite.h@stripped, 2007-06-15 11:28:13+02:00, df@stripped +2 -0
    this may already be defined

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	df
# Host:	pippilotta.erinye.com
# Root:	/shared/home/df/mysql/build/mysql-5.0-build

--- 1.51/include/violite.h	2007-05-24 11:21:22 +02:00
+++ 1.52/include/violite.h	2007-06-15 11:28:13 +02:00
@@ -100,7 +100,9 @@
 
 #define HEADER_DES_LOCL_H dummy_something
 #define YASSL_MYSQL_COMPATIBLE
+#ifndef YASSL_PREFIX
 #define YASSL_PREFIX
+#endif
 /* Set yaSSL to use same type as MySQL do for socket handles */
 typedef my_socket YASSL_SOCKET_T;
 #define YASSL_SOCKET_T_DEFINED