database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source 
Revert commit db0917f68f, because the fix for MDEV-12696
is coming from 5.5 and 10.1 in this merge.
This commit is contained in:
Sergei Golubchik
2017-05-09 13:24:52 +02:00
parent 2645bda5f2 c92168fcd2
commit c91ecf9e9b
84 changed files with 1292 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/explain_json.result
View File

@ -825,7 +825,7 @@ EXPLAIN
"buffer_type": "flat",
"buffer_size": "256Kb",
"join_type": "BNL",
"attached_condition": "t2.b <> outer_t1.a and trigcond(<cache>(outer_t1.a) = t1.a or t1.a is null)"
"attached_condition": "t2.b <> outer_t1.a"
}
}
}
@ -1573,7 +1573,7 @@ EXPLAIN
"access_type": "ALL",
"rows": 10,
"filtered": 100,
"attached_condition": "t0.a < 5 and t1.b < t0.a"
"attached_condition": "t1.b < t0.a"
}
}
}