Skip to content

Commit

Permalink
Remove hardcoded capabilities that the client uses
Browse files Browse the repository at this point in the history
These hardcoded capabilities end up being set on all backend connections
ProxySQL makes. We don't want CLIENT_MULTI_RESULTS &
CLIENT_PS_MULTI_RESULTS to be enabled hardcoded, but they should be
dependent on the client connecting to ProxySQL.

Having this mismatch meant that any connection that was not setting
these flags would not be multiplexed with subsequent connections as the
client of client flags would not match.
  • Loading branch information
dbussink committed Aug 16, 2019
1 parent 7409b83 commit ce338bd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions deps/Makefile
Expand Up @@ -105,6 +105,7 @@ mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a: libssl/open
cd mariadb-client-library/mariadb_client && patch libmariadb/ma_password.c < ../ma_password.c.patch
# cd mariadb-client-library/mariadb_client && patch libmariadb/ma_secure.c < ../ma_secure.c.patch
cd mariadb-client-library/mariadb_client && patch include/mysql.h < ../mysql.h.patch
cd mariadb-client-library/mariadb_client && patch include/mariadb_com.h < ../mariadb_com.h.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/ma_alloc.c < ../ma_alloc.c.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/ma_charset.c < ../ma_charset.c.patch
cd mariadb-client-library/mariadb_client && patch libmariadb/ma_pvio.c < ../ma_pvio.c.patch
Expand Down
11 changes: 11 additions & 0 deletions deps/mariadb-client-library/mariadb_com.h.patch
@@ -0,0 +1,11 @@
--- include/mariadb_com.h.old 2019-08-16 10:31:33.982265001 +0000
+++ include/mariadb_com.h 2019-08-16 10:32:03.048790998 +0000
@@ -206,8 +206,6 @@
CLIENT_LONG_FLAG |\
CLIENT_TRANSACTIONS |\
CLIENT_SECURE_CONNECTION |\
- CLIENT_MULTI_RESULTS | \
- CLIENT_PS_MULTI_RESULTS |\
CLIENT_PROTOCOL_41 |\
CLIENT_PLUGIN_AUTH |\
CLIENT_SESSION_TRACKING |\

0 comments on commit ce338bd

Please sign in to comment.