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

Completing fix to bug #565, http://bugs.mariadb.com/show_bug.cgi?id=565

Browse Source 
Client's flags are also used when changing the user inside the session.
This commit is contained in:
VilhoRaatikka
2014-10-09 16:37:26 +03:00
parent 85b15cf5ce
commit d16bb227e9
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
server/modules/protocol/mysql_common.c
View File

@ -550,8 +550,8 @@ int gw_send_authentication_to_backend(
long bytes; long bytes;
uint8_t client_scramble[GW_MYSQL_SCRAMBLE_SIZE]; uint8_t client_scramble[GW_MYSQL_SCRAMBLE_SIZE];
uint8_t client_capabilities[4]; uint8_t client_capabilities[4];
uint32_t server_capabilities; uint32_t server_capabilities = 0;
uint32_t final_capabilities; uint32_t final_capabilities = 0;
char dbpass[MYSQL_USER_MAXLEN + 1]=""; char dbpass[MYSQL_USER_MAXLEN + 1]="";
GWBUF *buffer; GWBUF *buffer;
DCB *dcb; DCB *dcb;
@ -566,12 +566,8 @@ int gw_send_authentication_to_backend(
curr_passwd = passwd; curr_passwd = passwd;
dcb = conn->owner_dcb; dcb = conn->owner_dcb;
// Zero the vars
memset(&server_capabilities, '\0', sizeof(server_capabilities));
memset(&final_capabilities, '\0', sizeof(final_capabilities));
final_capabilities = gw_mysql_get_byte4((uint8_t *)&server_capabilities); final_capabilities = gw_mysql_get_byte4((uint8_t *)&server_capabilities);
/** Copy client's flags to backend */ /** Copy client's flags to backend */
final_capabilities |= conn->client_capabilities;; final_capabilities |= conn->client_capabilities;;
@ -1030,19 +1026,24 @@ int mysql_send_custom_error (
* @param passwd The SHA1(real_password): Note real_password is unknown * @param passwd The SHA1(real_password): Note real_password is unknown
* @return 1 on success, 0 on failure * @return 1 on success, 0 on failure
*/ */
int gw_send_change_user_to_backend(char *dbname, char *user, uint8_t *passwd, MySQLProtocol *conn) { int gw_send_change_user_to_backend(
int compress = 0; char *dbname,
int rv; char *user,
uint8_t *payload = NULL; uint8_t *passwd,
uint8_t *payload_start = NULL; MySQLProtocol *conn)
long bytes; {
uint8_t client_scramble[GW_MYSQL_SCRAMBLE_SIZE]; int compress = 0;
uint8_t client_capabilities[4]; int rv;
uint32_t server_capabilities; uint8_t *payload = NULL;
uint32_t final_capabilities; uint8_t *payload_start = NULL;
char dbpass[MYSQL_USER_MAXLEN + 1]=""; long bytes;
GWBUF *buffer; uint8_t client_scramble[GW_MYSQL_SCRAMBLE_SIZE];
DCB *dcb; uint8_t client_capabilities[4];
uint32_t server_capabilities = 0;
uint32_t final_capabilities = 0;
char dbpass[MYSQL_USER_MAXLEN + 1]="";
GWBUF *buffer;
DCB *dcb;
char *curr_db = NULL; char *curr_db = NULL;
uint8_t *curr_passwd = NULL; uint8_t *curr_passwd = NULL;
@ -1055,14 +1056,10 @@ int gw_send_change_user_to_backend(char *dbname, char *user, uint8_t *passwd, My
dcb = conn->owner_dcb; dcb = conn->owner_dcb;
// Zero the vars final_capabilities = gw_mysql_get_byte4((uint8_t *)&server_capabilities);
memset(&server_capabilities, '\0', sizeof(server_capabilities));
memset(&final_capabilities, '\0', sizeof(final_capabilities));
final_capabilities = gw_mysql_get_byte4((uint8_t *)&server_capabilities); /** Copy client's flags to backend */
final_capabilities |= conn->client_capabilities;;
final_capabilities |= GW_MYSQL_CAPABILITIES_PROTOCOL_41;
final_capabilities |= GW_MYSQL_CAPABILITIES_CLIENT;
if (compress) { if (compress) {
final_capabilities |= GW_MYSQL_CAPABILITIES_COMPRESS; final_capabilities |= GW_MYSQL_CAPABILITIES_COMPRESS;