diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2014-11-21 21:44:06 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2014-11-21 21:44:06 +0300 |
| commit | 3c5ce8a0a32a74cd8e0ddc81bcfacf7c85f0d90a (patch) | |
| tree | 317e69c0a49ef95725e2f2c668a66890a834cdcd /mysql-test | |
| parent | 305dd8e5fba804d8006d34ca7cb05bec5a3b45e6 (diff) | |
| download | mariadb-git-3c5ce8a0a32a74cd8e0ddc81bcfacf7c85f0d90a.tar.gz | |
Make testsuite to pass
- Drop all tables in explain_json.test
- Tabular form should print ref='' when type='fulltext' (another peculiarity
of the traditional EXPLAIN format)
- String_list::append_str should allocate memory for \0, too
- Some temporary code for EXPLAIN JSON and join buffering.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/explain_json.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/explain_json.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/explain_json.result b/mysql-test/r/explain_json.result index 2b2a4bf8fc9..7621332f226 100644 --- a/mysql-test/r/explain_json.result +++ b/mysql-test/r/explain_json.result @@ -174,5 +174,5 @@ EXPLAIN } } } -drop table t1; +drop table t1,t2; drop table t0; diff --git a/mysql-test/t/explain_json.test b/mysql-test/t/explain_json.test index 887ef66bff9..0b7bfb030d9 100644 --- a/mysql-test/t/explain_json.test +++ b/mysql-test/t/explain_json.test @@ -38,5 +38,5 @@ explain format=json select * from t2 where a1=1 or (b1=2 and b2=3); explain format=json select * from t0,t2 where t2.b1=t0.a and t2.b2=4; -drop table t1; +drop table t1,t2; drop table t0; |