diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-04-07 00:54:39 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-04-07 00:54:39 +0300 |
| commit | 59e5f5b47e1f12a1426319a905dbc8cc55219c0d (patch) | |
| tree | b2095faf431949d31e2ea69200bea27a8cf2f629 /mysql-test/r/analyze_format_json.result | |
| parent | 306de8a927916db98c67fa338b5a275735f78240 (diff) | |
| parent | 89b744eb6c2484412f476a53087cea7bf28dc917 (diff) | |
| download | mariadb-git-59e5f5b47e1f12a1426319a905dbc8cc55219c0d.tar.gz | |
Merge branch '10.2' into bb-10.2-mdev9543
- Make Window Functions errors use the MariaDB's extra error range.
- Fix a trivial bug in check_error_mesg
Diffstat (limited to 'mysql-test/r/analyze_format_json.result')
| -rw-r--r-- | mysql-test/r/analyze_format_json.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/analyze_format_json.result b/mysql-test/r/analyze_format_json.result index f58b651464e..fadbe705f99 100644 --- a/mysql-test/r/analyze_format_json.result +++ b/mysql-test/r/analyze_format_json.result @@ -242,6 +242,8 @@ insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); select database(); database() test +connect con1,localhost,root,,*NO-ONE*; +connection con1; select database(); database() NULL @@ -265,6 +267,8 @@ ANALYZE } } } +disconnect con1; +connection default; drop table t1; # # MDEV-7812: ANALYZE FORMAT=JSON UPDATE/DELETE doesnt print |