summaryrefslogtreecommitdiff
path: root/sql/sql_view.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-04-11 19:32:55 +0400
committerAlexander Barkov <bar@mariadb.org>2017-04-11 19:32:55 +0400
commit012fbc15cfbd34c218ae50f553d2e2e32301da01 (patch)
tree4c274b2584728a722031da3f9b008b2b63bbbabb /sql/sql_view.cc
parent5bf7046fa762f02c6dde197b99f7615f9a5eda15 (diff)
downloadmariadb-git-012fbc15cfbd34c218ae50f553d2e2e32301da01.tar.gz
MDEV-12478 CONCAT function inside view casts values incorrectly with Oracle sql_mode
Diffstat (limited to 'sql/sql_view.cc')
-rw-r--r--sql/sql_view.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index fb4c2c3d835..1d6fe38b66b 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -1363,7 +1363,7 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table,
* MODE_NO_UNSIGNED_SUBTRACTION affect execution
- MODE_NO_DIR_IN_CREATE affect table creation only
- MODE_POSTGRESQL compounded from other modes
- - MODE_ORACLE compounded from other modes
+ - MODE_ORACLE affects Item creation (e.g for CONCAT)
- MODE_MSSQL compounded from other modes
- MODE_DB2 compounded from other modes
- MODE_MAXDB affect only CREATE TABLE parsing
@@ -1378,7 +1378,8 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table,
+ MODE_NO_BACKSLASH_ESCAPES affect expression parsing
*/
thd->variables.sql_mode&= ~(MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES |
- MODE_IGNORE_SPACE | MODE_NO_BACKSLASH_ESCAPES);
+ MODE_IGNORE_SPACE | MODE_NO_BACKSLASH_ESCAPES |
+ MODE_ORACLE);
/* Parse the query. */