Merge branch '2.3' into develop

BUILD/install_build_deps.sh

@@ -199,8 +199,9 @@ avro_dir=`echo "$avro_filename" | sed "s/.tar.gz//"`
 tar -axf $avro_filename
 mkdir $avro_dir/build
 pushd $avro_dir/build
-# The -DSNAPPY_FOUND=N is used to prevent the library from linking against libsnappy (MaxScale doesn't link against it)
+# Make sure the library isn't linked against snappy
-cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC -DSNAPPY_FOUND=N
+sed -i 's/find_package(Snappy)//' ../lang/c/CMakeLists.txt
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC
 make
 sudo make install
 popd

Documentation/Release-Notes/MaxScale-2.3.4-Release-Notes.md

@@ -16,6 +16,7 @@ report on [our Jira](https://jira.mariadb.org/projects/MXS).
 
 * [MXS-2322](https://jira.mariadb.org/browse/MXS-2322) Null characters in passwords break maxctrl
 * [MXS-2315](https://jira.mariadb.org/browse/MXS-2315) std::regex_error exception on csmon startup
+* [MXS-2311](https://jira.mariadb.org/browse/MXS-2311) connection_keepalive and error : (4852) Unexpected internal state: received response 0x00 from server
 * [MXS-2310](https://jira.mariadb.org/browse/MXS-2310) Cannot create .avsc files if no database connection
 * [MXS-2305](https://jira.mariadb.org/browse/MXS-2305) UNIX users are not shown in `maxctrl list users`
 * [MXS-2303](https://jira.mariadb.org/browse/MXS-2303) Missing server parameters log wrong error
@@ -26,6 +27,7 @@ report on [our Jira](https://jira.mariadb.org/projects/MXS).
 * [MXS-2265](https://jira.mariadb.org/browse/MXS-2265) Timestamp value '0000-00-00 00:00:00' conversion issue
 * [MXS-2237](https://jira.mariadb.org/browse/MXS-2237) server status labels are not documented
 * [MXS-2038](https://jira.mariadb.org/browse/MXS-2038) debug assert at rwsplit_route_stmt.cc:469 failed: btype != BE_MASTER
+* [MXS-1757](https://jira.mariadb.org/browse/MXS-1757) Problem while linking  libavrorouter.so
 
 ## Known Issues and Limitations
 

maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout

@@ -18,7 +18,7 @@ user=maxskysql
 password=skysql
 slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
 max_slave_connections=1
-connection_keepalive=5
+connection_keepalive=1
 
 [Read-Connection-Router-Slave]
 type=service

maxscale-system-test/mxs827_write_timeout.cpp

@@ -23,14 +23,16 @@ int main(int argc, char* argv[])
 
     create_t1(Test->maxscales->conn_rwsplit[0]);
 
-    for (int i = 0; i < 30; i++)
+    Test->tprintf("Doing reads for 30 seconds");
+    time_t start = time(NULL);
+
+    while (time(NULL) - start < 30)
     {
-        Test->tprintf("Trying query %d\n", i);
         Test->set_timeout(10);
         Test->try_query(Test->maxscales->conn_rwsplit[0], "SELECT 1");
-        sleep(1);
     }
 
+    Test->tprintf("Doing one write");
     Test->try_query(Test->maxscales->conn_rwsplit[0], "INSERT INTO t1 VALUES (1, 1)");
 
     Test->check_maxscale_alive(0);

server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc

@@ -901,7 +901,7 @@ static int gw_read_and_write(DCB* dcb)
     if (proto->ignore_replies > 0)
     {
         /** The reply to a COM_CHANGE_USER is in packet */
-        GWBUF* query = proto->stored_query;
+        GWBUF* query = modutil_get_next_MySQL_packet(&proto->stored_query);
         proto->stored_query = NULL;
         proto->ignore_replies--;
         mxb_assert(proto->ignore_replies >= 0);

server/modules/routing/readwritesplit/rwsplit_route_stmt.cc

@@ -514,7 +514,8 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
         }
     }
 
-    if (m_config.max_sescmd_history > 0 && m_sescmd_list.size() > m_config.max_sescmd_history)
+    if (m_config.max_sescmd_history > 0 && m_sescmd_list.size() >= m_config.max_sescmd_history
+        && !m_config.prune_sescmd_history)
     {
         static bool warn_history_exceeded = true;
         if (warn_history_exceeded)
@@ -537,7 +538,7 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
     }
 
     if (m_config.prune_sescmd_history && !m_sescmd_list.empty()
-        && m_sescmd_list.size() + 1 > m_config.max_sescmd_history)
+        && m_sescmd_list.size() >= m_config.max_sescmd_history)
     {
         // Close to the history limit, remove the oldest command
         prune_to_position(m_sescmd_list.front()->get_position());