diff options
| author | monty@donna.mysql.com <> | 2000-11-18 23:13:48 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-11-18 23:13:48 +0200 |
| commit | b31d0768794e964852562c0ba307e6eea35f101b (patch) | |
| tree | 287897ebd815b64a05c0ca7076beccd5245a2f8d /vio | |
| parent | 23dc1a6b8568eab379492213be67d11c99522eca (diff) | |
| download | mariadb-git-b31d0768794e964852562c0ba307e6eea35f101b.tar.gz | |
Fixed some reported bugs
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/VioFd.cc | 4 | ||||
| -rw-r--r-- | vio/VioSSL.cc | 4 | ||||
| -rw-r--r-- | vio/VioSSLFactoriesFd.cc | 4 | ||||
| -rw-r--r-- | vio/VioSocket.cc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/vio/VioFd.cc b/vio/VioFd.cc index 3c6b0108fee..da59798fc25 100644 --- a/vio/VioFd.cc +++ b/vio/VioFd.cc @@ -82,13 +82,13 @@ VioFd::keepalive(boolonoff) bool VioFd::fcntl() const { - return false; + return FALSE; } bool VioFd::should_retry() const { - return false; + return FALSE; } int diff --git a/vio/VioSSL.cc b/vio/VioSSL.cc index a8efacf912f..15964c09aba 100644 --- a/vio/VioSSL.cc +++ b/vio/VioSSL.cc @@ -48,7 +48,7 @@ report_errors() VioSSL::VioSSL(int fd, vio_ptr ssl_context, int state) - : bio_(0), ssl_con_(0), open_(false), sd_(new VioSocket(fd)) + : bio_(0), ssl_con_(0), open_(FALSE), sd_(new VioSocket(fd)) { DBUG_ENTER("VioSSL::VioSSL"); DBUG_PRINT("enter", ("this=%p, fd=%d, ssl_context=%p, state=%d", @@ -66,7 +66,7 @@ VioSSL::VioSSL(int fd, VioSSL::VioSSL(VioSocket* sd, vio_ptr ssl_context, int state) - :bio_(0), ssl_con_(0), open_(false), sd_(sd) + :bio_(0), ssl_con_(0), open_(FALSE), sd_(sd) { DBUG_ENTER("VioSSL::VioSSL"); DBUG_PRINT("enter", diff --git a/vio/VioSSLFactoriesFd.cc b/vio/VioSSLFactoriesFd.cc index 3fa660c049c..bd64202770a 100644 --- a/vio/VioSSLFactoriesFd.cc +++ b/vio/VioSSLFactoriesFd.cc @@ -24,8 +24,8 @@ VIO_NS_BEGIN #define this_ssl_context my_static_cast(SSL_CTX*)(this->ssl_context_) typedef unsigned char* ssl_data_ptr_t; -static bool ssl_algorithms_added = false; -static bool ssl_error_strings_loaded= false; +static bool ssl_algorithms_added = FALSE; +static bool ssl_error_strings_loaded= FALSE; static int verify_depth = 0; static int verify_error = X509_V_OK; diff --git a/vio/VioSocket.cc b/vio/VioSocket.cc index cefb0b4bdc1..e8390edb98a 100644 --- a/vio/VioSocket.cc +++ b/vio/VioSocket.cc @@ -73,7 +73,7 @@ VIO_NS_BEGIN VioSocket::VioSocket(vio_socket sd, enum_vio_type type, bool localhost) :sd_(sd), localhost_(localhost), fcntl_(0), - fcntl_set_(false), cipher_description_(0) + fcntl_set_(FALSE), cipher_description_(0) { DBUG_ENTER("VioSocket::VioSocket"); DBUG_PRINT("enter", ("sd=%d", sd)); |