[Commits] b1f765d: Adjusted result files.

IgorBabaev igor at mariadb.com
Fri Apr 6 18:50:32 EEST 2018


revision-id: b1f765d14b3bd0e3e2dbc874293dad77d5ad791c (mariadb-10.3.5-111-gb1f765d)
parent(s): b32031991e4ba270f5c221f7f6068732d09efd53
author: Igor Babaev
committer: Igor Babaev
timestamp: 2018-04-06 08:50:32 -0700
message:

Adjusted result files.

---
 mysql-test/main/derived_cond_pushdown.result | 6 +++---
 mysql-test/main/sql_mode.result              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mysql-test/main/derived_cond_pushdown.result b/mysql-test/main/derived_cond_pushdown.result
index dd5abde..5affcb9 100644
--- a/mysql-test/main/derived_cond_pushdown.result
+++ b/mysql-test/main/derived_cond_pushdown.result
@@ -8935,7 +8935,7 @@ EXPLAIN
                     "access_type": "ALL",
                     "rows": 18,
                     "filtered": 100,
-                    "attached_condition": "__3.a > 5 and __3.c > 200",
+                    "attached_condition": "__5.a > 5 and __5.c > 200",
                     "materialized": {
                       "query_block": {
                         "union_result": {
@@ -9561,7 +9561,7 @@ EXPLAIN
                     "access_type": "ALL",
                     "rows": 18,
                     "filtered": 100,
-                    "attached_condition": "__3.a > 4 and __3.c < 130",
+                    "attached_condition": "__5.a > 4 and __5.c < 130",
                     "materialized": {
                       "query_block": {
                         "union_result": {
@@ -9707,7 +9707,7 @@ EXPLAIN
                     "access_type": "ALL",
                     "rows": 18,
                     "filtered": 100,
-                    "attached_condition": "__3.a > 4 and __3.c < 130",
+                    "attached_condition": "__6.a > 4 and __6.c < 130",
                     "materialized": {
                       "query_block": {
                         "union_result": {
diff --git a/mysql-test/main/sql_mode.result b/mysql-test/main/sql_mode.result
index bb12569..54de837 100644
--- a/mysql-test/main/sql_mode.result
+++ b/mysql-test/main/sql_mode.result
@@ -72,10 +72,10 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`a`),
   UNIQUE KEY `email` (`email`)
 ) TYPE=MEMORY ROW_FORMAT=DYNAMIC
-set sql_mode="postgresql,oracle,mssql,db2,maxdb";
+set sql_mode="postgresql,mssql,db2,maxdb";
 select @@sql_mode;
 @@sql_mode
-PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER,SIMULTANEOUS_ASSIGNMENT
+PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,POSTGRESQL,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,NO_AUTO_CREATE_USER
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE "t1" (


More information about the commits mailing list