diff options
| author | unknown <guilhem@gbichot4.local> | 2008-02-18 23:36:57 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2008-02-18 23:36:57 +0100 |
| commit | ae25da10a371db0d530ccc2225a730ebc38f8db1 (patch) | |
| tree | eb84c87b6b3703ffc18f62934e35f2c3a7986c4a /vio | |
| parent | 41b01b7f2142159c17c0180194f1adda8857d5c6 (diff) | |
| parent | 85213f6235aa344f7861cc2f9a151869e041cb9e (diff) | |
| download | mariadb-git-ae25da10a371db0d530ccc2225a730ebc38f8db1.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into gbichot4.local:/home/mysql_src/mysql-5.1-build-gca
client/mysqltest.c:
Auto merged
include/my_sys.h:
Auto merged
mysys/thr_lock.c:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosslfactories.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index d7e4f380bc1..9ffe600beb8 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -17,8 +17,8 @@ #ifdef HAVE_OPENSSL -static bool ssl_algorithms_added = FALSE; -static bool ssl_error_strings_loaded= FALSE; +static my_bool ssl_algorithms_added = FALSE; +static my_bool ssl_error_strings_loaded= FALSE; static int verify_depth = 0; static unsigned char dh512_p[]= |