Fixes for gcc 3.1

Fixed bug in new code for regexp LIKE NULL


BUILD/SETUP.sh:
  Fixes for gcc 3.1
BUILD/compile-solaris-sparc-debug:
  Fixes for gcc 3.1
BUILD/compile-solaris-sparc-purify:
  Fixes for gcc 3.1
BUILD/compile-solaris-sparc:
  Fixes for gcc 3.1
Docs/manual.texi:
  Fixed typo
include/violite.h:
  Fixes for gcc 3.1
mysql-test/r/func_concat.result:
  Updated test results
sql/item_cmpfunc.cc:
  Fixed bug in new code for regexp LIKE NULL

1 files changed, 8 insertions, 8 deletions

diff --git a/include/violite.h b/include/violite.h
index 0f36e493b57..40da31ee1b6 100644
--- a/include/violite.h
+++ b/include/violite.h
@@ -153,27 +153,27 @@ my_bool vio_ssl_peer_addr(Vio* vio, char *buf);
 void vio_ssl_in_addr(Vio *vio, struct in_addr *in);
 
 /* Single copy for server */
+enum vio_ssl_acceptorfd_state
+{
+  state_connect       = 1,
+  state_accept        = 2
+};
+
 struct st_VioSSLAcceptorFd 
 {
   SSL_CTX* ssl_context_;
   SSL_METHOD* ssl_method_;
   struct st_VioSSLAcceptorFd* session_id_context_;
-  enum {
-    state_connect       = 1,
-    state_accept        = 2
-  };
-
-  /* function pointers which are only once for SSL server 
-  Vio*(*sslaccept)(struct st_VioSSLAcceptorFd*,Vio*); */
 };
 
 /* One copy for client */
 struct st_VioSSLConnectorFd
 {
   SSL_CTX* ssl_context_;
-  SSL_METHOD* ssl_method_;
   /* function pointers which are only once for SSL client */ 
+  SSL_METHOD* ssl_method_;
 };
+
 void sslaccept(struct st_VioSSLAcceptorFd*, Vio*, long timeout);
 void sslconnect(struct st_VioSSLConnectorFd*, Vio*, long timeout);