aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed async_status in async_exit_status

Browse Source
pull/317/head
René Cannaò 11 years ago
parent 3874c0d981
commit 9993e3c0f8
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File

3
include/mysql_connection.h
Unescape View File

@ -34,7 +34,8 @@ class MySQL_Connection {
public:
int fd;
char scramble_buff[40];
int async_status;
int async_exit_status; // exit status of MariaDB Client Library Non blocking API
int async_state_machine; // Async state machine
MYSQL *mysql;
MYSQL *ret_mysql;
struct {

8
lib/MySQL_Session.cpp
Unescape View File

@ -454,8 +454,8 @@ __exit_DSS__STATE_NOT_INITIALIZED:
if (myds->revents & POLLOUT) ms_status |= MYSQL_WAIT_WRITE;
if (myds->revents & POLLPRI) ms_status |= MYSQL_WAIT_EXCEPT;
if (ms_status) {
myconn->async_status = mysql_real_connect_cont(&myconn->ret_mysql, myconn->mysql, ms_status);
if (myconn->async_status==0) {
myconn->async_exit_status = mysql_real_connect_cont(&myconn->ret_mysql, myconn->mysql, ms_status);
if (myconn->async_exit_status==0) {
if (myconn->ret_mysql) {
myds->myds_type=MYDS_BACKEND;
myds->DSS=STATE_READY;
@ -1303,9 +1303,9 @@ void MySQL_Session::handler___client_DSS_QUERY_SENT___server_DSS_NOT_INITIALIZED
if (myconn->parent->port) {
myconn->async_status=mysql_real_connect_start(&myconn->ret_mysql,myconn->mysql, myconn->parent->address, myconn->userinfo->username, myconn->userinfo->password, myconn->userinfo->schemaname, myconn->parent->port, NULL, 0);
myconn->async_exit_status=mysql_real_connect_start(&myconn->ret_mysql,myconn->mysql, myconn->parent->address, myconn->userinfo->username, myconn->userinfo->password, myconn->userinfo->schemaname, myconn->parent->port, NULL, 0);
} else {
myconn->async_status=mysql_real_connect_start(&myconn->ret_mysql,myconn->mysql, "localhost", myconn->userinfo->username, myconn->userinfo->password, myconn->userinfo->schemaname, myconn->parent->port, myconn->parent->address, 0);
myconn->async_exit_status=mysql_real_connect_start(&myconn->ret_mysql,myconn->mysql, "localhost", myconn->userinfo->username, myconn->userinfo->password, myconn->userinfo->schemaname, myconn->parent->port, myconn->parent->address, 0);
}
myconn->fd=mysql_get_socket(myconn->mysql);
mybe->server_myds->fd=myconn->fd;

2
lib/MySQL_Thread.cpp
Unescape View File

@ -992,7 +992,7 @@ void MySQL_Thread::run() {
// mypolls.myds[n]->set_pollout();
if (mypolls.myds[n]->DSS > STATE_MARIADB_BEGIN && mypolls.myds[n]->DSS < STATE_MARIADB_END) {
mypolls.fds[n].events = POLLIN;
if (mypolls.myds[n]->myconn->async_status & MYSQL_WAIT_WRITE)
if (mypolls.myds[n]->myconn->async_exit_status & MYSQL_WAIT_WRITE)
mypolls.fds[n].events |= POLLOUT;
} else {
mypolls.myds[n]->set_pollout();

4
lib/mysql_connection.cpp
Unescape View File

@ -202,9 +202,9 @@ bool MySQL_Connection::get_status_prepared_statement() {
// non blocking API
void MySQL_Connection::connect_start() {
if (parent->port) {
async_status=mysql_real_connect_start(&ret_mysql, mysql, parent->address, userinfo->username, userinfo->password, userinfo->schemaname, parent->port, NULL, 0);
async_exit_status=mysql_real_connect_start(&ret_mysql, mysql, parent->address, userinfo->username, userinfo->password, userinfo->schemaname, parent->port, NULL, 0);
} else {
async_status=mysql_real_connect_start(&ret_mysql, mysql, "localhost", userinfo->username, userinfo->password, userinfo->schemaname, parent->port, parent->address, 0);
async_exit_status=mysql_real_connect_start(&ret_mysql, mysql, "localhost", userinfo->username, userinfo->password, userinfo->schemaname, parent->port, parent->address, 0);
}
fd=mysql_get_socket(mysql);
}

Write Preview
Loading…
Cancel
Save