From 9993e3c0f8131f390f01e45b3191e061494b8882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Tue, 7 Jul 2015 17:50:07 +0000 Subject: [PATCH] Renamed async_status in async_exit_status --- include/mysql_connection.h | 3 ++- lib/MySQL_Session.cpp | 8 ++++---- lib/MySQL_Thread.cpp | 2 +- lib/mysql_connection.cpp | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/mysql_connection.h b/include/mysql_connection.h index ac6f54e8e..20b8b2b46 100644 --- a/include/mysql_connection.h +++ b/include/mysql_connection.h @@ -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 { diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp index ca393eade..cfbb908ee 100644 --- a/lib/MySQL_Session.cpp +++ b/lib/MySQL_Session.cpp @@ -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; diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp index 44bdc61f9..72dc5a039 100644 --- a/lib/MySQL_Thread.cpp +++ b/lib/MySQL_Thread.cpp @@ -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(); diff --git a/lib/mysql_connection.cpp b/lib/mysql_connection.cpp index 1b4cbcb63..5d6c22ae5 100644 --- a/lib/mysql_connection.cpp +++ b/lib/mysql_connection.cpp @@ -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); }