hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MySQL authentication with user@host, resolved compile errors

Browse Source 
MySQL authentication with user@host, resolved compile errors
This commit is contained in:
MassimilianoPinto
2014-02-14 17:27:17 +01:00
parent 6a12e99001
commit 9b6ad904f6
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/poll.c
View File

@ -45,7 +45,7 @@ extern int lm_enabled_logfiles_bitmask;
*/ */
static int epoll_fd = -1; /*< The epoll file descriptor */ static int epoll_fd = -1; /*< The epoll file descriptor */
static int shutdown = 0; /*< Flag the shutdown of the poll subsystem */ static int do_shutdown = 0; /*< Flag the shutdown of the poll subsystem */
static GWBITMASK poll_mask; static GWBITMASK poll_mask;
static simple_mutex_t epoll_wait_mutex; /*< serializes calls to epoll_wait */ static simple_mutex_t epoll_wait_mutex; /*< serializes calls to epoll_wait */
@ -490,7 +490,7 @@ poll_waitevents(void *arg)
process_zombies_only = false; process_zombies_only = false;
} }
if (shutdown) if (do_shutdown)
{ {
/*< /*<
* Remove the thread from the bitmask of running * Remove the thread from the bitmask of running
@ -508,7 +508,7 @@ poll_waitevents(void *arg)
void void
poll_shutdown() poll_shutdown()
{ {
shutdown = 1; do_shutdown = 1;
} }
/** /**

1
server/include/dbusers.h
View File

@ -18,7 +18,6 @@
* Copyright SkySQL Ab 2013 * Copyright SkySQL Ab 2013
*/ */
#include <service.h> #include <service.h>
#include <gw.h>
/** /**

3
server/include/dcb.h
View File

@ -21,6 +21,7 @@
#include <buffer.h> #include <buffer.h>
#include <gwbitmask.h> #include <gwbitmask.h>
#include <skygw_utils.h> #include <skygw_utils.h>
#include <netinet/in.h>
struct session; struct session;
struct server; struct server;
@ -46,6 +47,7 @@ struct service;
* 12/07/2013 Massimiliano Pinto Added auth entry point * 12/07/2013 Massimiliano Pinto Added auth entry point
* 15/07/2013 Massimiliano Pinto Added session entry point * 15/07/2013 Massimiliano Pinto Added session entry point
* 16/07/2013 Massimiliano Pinto Added command type for dcb * 16/07/2013 Massimiliano Pinto Added command type for dcb
* 07/02/2014 Massimiliano Pinto Added ipv4 data struct into for dcb
* *
* @endverbatim * @endverbatim
*/ */
@ -165,6 +167,7 @@ typedef struct dcb {
int fd; /**< The descriptor */ int fd; /**< The descriptor */
dcb_state_t state; /**< Current descriptor state */ dcb_state_t state; /**< Current descriptor state */
char *remote; /**< Address of remote end */ char *remote; /**< Address of remote end */
struct sockaddr_in ipv4; /**< remote end IPv4 address */
void *protocol; /**< The protocol specific state */ void *protocol; /**< The protocol specific state */
struct session *session; /**< The owning session */ struct session *session; /**< The owning session */
GWPROTOCOL func; /**< The functions for this descriptor */ GWPROTOCOL func; /**< The functions for this descriptor */

2
server/include/gw.h
View File

@ -53,8 +53,6 @@ char *gw_strend(register const char *s);
int do_read_dcb(DCB *dcb); int do_read_dcb(DCB *dcb);
int do_read_10(DCB *dcb, uint8_t *buffer); int do_read_10(DCB *dcb, uint8_t *buffer);
int MySQLWrite(DCB *dcb, GWBUF *queue); int MySQLWrite(DCB *dcb, GWBUF *queue);
int gw_write_backend_event(DCB *dcb);
int gw_read_backend_event(DCB *dcb);
int setnonblocking(int fd); int setnonblocking(int fd);
int gw_write(int fd, const void* buf, size_t nbytes); int gw_write(int fd, const void* buf, size_t nbytes);
int gw_getsockerrno(int fd); int gw_getsockerrno(int fd);

1
server/modules/include/mysql_client_server_protocol.h
View File

@ -51,6 +51,7 @@
#include <router.h> #include <router.h>
#include <poll.h> #include <poll.h>
#include <users.h> #include <users.h>
#include <dbusers.h>
#include <version.h> #include <version.h>
#define GW_MYSQL_VERSION "MaxScale " MAXSCALE_VERSION #define GW_MYSQL_VERSION "MaxScale " MAXSCALE_VERSION