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

MXS-1278: Change modes when 'set sql_mode=' is encountered.

Browse Source 
The initial setting of sql_mode affects how MaxScale initially
behaves with respect to autocommit.

When 'set sql_mode=[default|oracle];" is encountered, the query
classifier and autocommit modes are adjusted accordingly.
This commit is contained in:
Johan Wikman
2017-06-13 15:27:41 +03:00
parent 8128c74341
commit bea551092d
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/Getting-Started/Configuration-Guide.md
View File

@ -534,6 +534,9 @@ sql_mode=oracle
The default value is `default`. The default value is `default`.
**NOTE** If `sql_mode` is set to `oracle`, then MaxScale will also assume
that `autocommit` initially is off.
At runtime, MariaDB MaxScale will recognize statements like At runtime, MariaDB MaxScale will recognize statements like
``` ```
set sql_mode=oracle; set sql_mode=oracle;
@ -544,6 +547,11 @@ set sql_mode=default;
``` ```
and change mode accordingly. and change mode accordingly.
**NOTE** If `set sql_mode=oracle;` is encountered, then MaxScale will also
behave as if `autocommit` had been turned off and conversely, if
`set sql_mode=default;` is encountered, then MaxScale will also behave
as if `autocommit` had been turned on.
Note that MariaDB MaxScale is **not** explicitly aware of the sql mode of Note that MariaDB MaxScale is **not** explicitly aware of the sql mode of
the server, so the value of `sql_mode` should reflect the sql mode used the server, so the value of `sql_mode` should reflect the sql mode used
when the server is started. when the server is started.

6
server/core/session.c
View File

@ -112,6 +112,12 @@ session_alloc(SERVICE *service, DCB *client_dcb)
session->stats.connect = time(0); session->stats.connect = time(0);
session->stmt.buffer = NULL; session->stmt.buffer = NULL;
session->stmt.target = NULL; session->stmt.target = NULL;
MXS_CONFIG *config = config_get_global_options();
// If MaxScale is running in Oracle mode, then autocommit needs to
// initially be off.
bool autocommit = (config->qc_sql_mode == QC_SQL_MODE_ORACLE) ? false : true;
session_set_autocommit(session, autocommit);
/*< /*<
* Associate the session to the client DCB and set the reference count on * Associate the session to the client DCB and set the reference count on
* the session to indicate that there is a single reference to the * the session to indicate that there is a single reference to the

2
server/modules/protocol/MySQL/MySQLClient/mysql_client.cc
View File

@ -888,10 +888,12 @@ void set_qc_mode(MXS_SESSION* session, GWBUF** read_buffer)
switch (sql_mode) switch (sql_mode)
{ {
case SetSqlModeParser::ORACLE: case SetSqlModeParser::ORACLE:
session_set_autocommit(session, false);
session->client_protocol_data = QC_SQL_MODE_ORACLE; session->client_protocol_data = QC_SQL_MODE_ORACLE;
break; break;
case SetSqlModeParser::DEFAULT: case SetSqlModeParser::DEFAULT:
session_set_autocommit(session, true);
session->client_protocol_data = QC_SQL_MODE_DEFAULT; session->client_protocol_data = QC_SQL_MODE_DEFAULT;
break; break;