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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2020-11-17 10:54:58 +02:00
parent fa0b9d8df1 f577d09829
commit 10582a02fe
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/maxscale/protocol/mysql.hh
View File

@ -270,6 +270,9 @@ typedef enum
#define MXS_MARIA_CAP_COM_MULTI (1 << 1)
#define MXS_MARIA_CAP_STMT_BULK_OPERATIONS (1 << 2)
// Only bulk operations are supported
#define MXS_MARIADB_CAP_SERVER MXS_MARIA_CAP_STMT_BULK_OPERATIONS
typedef enum
{
MXS_COM_SLEEP = 0,

3
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -693,7 +693,8 @@ static void store_client_information(DCB* dcb, GWBUF* buffer)
* there are extra capabilities stored in the last 4 bytes of the 23 byte filler. */
if ((proto->client_capabilities & GW_MYSQL_CAPABILITIES_CLIENT_MYSQL) == 0)
{
proto->extra_capabilities = gw_mysql_get_byte4(data + MARIADB_CAP_OFFSET);
uint32_t caps = gw_mysql_get_byte4(data + MARIADB_CAP_OFFSET);
proto->extra_capabilities = caps & MXS_MARIADB_CAP_SERVER;
}
if (len > MYSQL_AUTH_PACKET_BASE_SIZE)

17
system-test/create_user.sh
View File

@ -1,10 +1,15 @@
#!/bin/bash
# The following environment variables are used:
# node_user - A custom user to create
# node_password - The password for the user
# require_ssl - Require SSL for all users except the replication user
mysql --force $1 <<EOF >& /dev/null
DROP USER IF EXISTS '$node_user'@'%';
CREATE USER '$node_user'@'%' IDENTIFIED BY '$node_password';
GRANT ALL PRIVILEGES ON *.* TO '$node_user'@'%' WITH GRANT OPTION;
GRANT ALL PRIVILEGES ON *.* TO '$node_user'@'%' $require_ssl WITH GRANT OPTION;
DROP USER IF EXISTS 'repl'@'%';
CREATE USER 'repl'@'%' IDENTIFIED BY 'repl';
@ -16,25 +21,25 @@ GRANT ALL ON *.* TO 'repl'@'localhost' WITH GRANT OPTION;
DROP USER IF EXISTS 'skysql'@'%';
CREATE USER 'skysql'@'%' IDENTIFIED BY 'skysql';
GRANT ALL ON *.* TO 'skysql'@'%' WITH GRANT OPTION;
GRANT ALL ON *.* TO 'skysql'@'%' $require_ssl WITH GRANT OPTION;
DROP USER IF EXISTS 'skysql'@'localhost';
DROP USER IF EXISTS 'maxskysql'@'%';
CREATE USER 'maxskysql'@'%' IDENTIFIED BY 'skysql';
GRANT ALL ON *.* TO 'maxskysql'@'%' WITH GRANT OPTION;
GRANT ALL ON *.* TO 'maxskysql'@'%' $require_ssl WITH GRANT OPTION;
DROP USER IF EXISTS 'maxskysql'@'localhost';
CREATE USER 'maxskysql'@'localhost' IDENTIFIED BY 'skysql';
GRANT ALL ON *.* TO 'maxskysql'@'localhost' WITH GRANT OPTION;
GRANT ALL ON *.* TO 'maxskysql'@'localhost' $require_ssl WITH GRANT OPTION;
DROP USER IF EXISTS 'maxuser'@'%';
CREATE USER 'maxuser'@'%' IDENTIFIED BY 'maxpwd';
GRANT ALL ON *.* TO 'maxuser'@'%' WITH GRANT OPTION;
GRANT ALL ON *.* TO 'maxuser'@'%' $require_ssl WITH GRANT OPTION;
DROP USER IF EXISTS 'maxuser'@'localhost';
CREATE USER 'maxuser'@'localhost' IDENTIFIED BY 'maxpwd';
GRANT ALL ON *.* TO 'maxuser'@'localhost' WITH GRANT OPTION;
GRANT ALL ON *.* TO 'maxuser'@'localhost' $require_ssl WITH GRANT OPTION;
RESET MASTER;
EOF

11
system-test/create_user_ssl.sh
View File

@ -1,11 +1,4 @@
#!/bin/bash
echo "DROP USER '$node_user'@'%'" | sudo mysql $1
echo "grant all privileges on *.* to '$node_user'@'%' identified by '$node_password' require ssl WITH GRANT OPTION"
echo "grant all privileges on *.* to '$node_user'@'%' identified by '$node_password' require ssl WITH GRANT OPTION" | sudo mysql $1
echo "drop user '$node_user'@'localhost'" | sudo mysql $1
echo "grant all privileges on *.* to 'maxskysql'@'%' identified by 'skysql' require ssl WITH GRANT OPTION" | sudo mysql $1
echo "grant all privileges on *.* to 'maxuser'@'%' identified by 'maxpwd' require ssl WITH GRANT OPTION" | sudo mysql $1
echo "grant all privileges on *.* to 'maxskysql'@'localhost' identified by 'skysql' require ssl WITH GRANT OPTION" | sudo mysql $1
echo "grant all privileges on *.* to 'maxuser'@'localhost' identified by 'maxpwd' require ssl WITH GRANT OPTION" | sudo mysql $1
export require_ssl="REQUIRE SSL"
./create_user.sh $1

2
system-test/mxs1926_killed_server.cpp
View File

@ -54,7 +54,7 @@ void tune_rowcount(TestConnections& test)
remove(filename.c_str());
int orig = ROWCOUNT;
ROWCOUNT = orig / dur.count() * 10000;
ROWCOUNT = orig / (dur.count() + 1) * 10000;
test.tprintf("Loading %d rows took %ld ms, setting row count to %d",
orig,
dur.count(),