diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-04-08 10:36:34 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-04-08 10:36:34 -0400 |
| commit | 421326310168e2b0a83eddcf9520336e1d58ea42 (patch) | |
| tree | 9ec49ac74c451cf03581a619eb92a7afae1c5eef /mysql-test/r/show_check.result | |
| parent | 9d2e90f379654fb65c0eab006213d772302bcff7 (diff) | |
| parent | 41a2ca5c16636c12d5c2adce70ec7ddb7a2fc711 (diff) | |
| download | mariadb-git-421326310168e2b0a83eddcf9520336e1d58ea42.tar.gz | |
Merging mariadb-10.0.10.
* bzr merge -rtag:mariadb-10.0.10 maria/10.0.
Diffstat (limited to 'mysql-test/r/show_check.result')
| -rw-r--r-- | mysql-test/r/show_check.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 723d54f9b5f..690905153f8 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -1553,7 +1553,7 @@ RELEASE_LOCK('t') 1 SET NAMES latin1; # -# WL#6454: Deprecate SHOW AUTHORS and SHOW CONTRIBUTORS +# Test SHOW AUTHORS and SHOW CONTRIBUTORS # SHOW AUTHORS; SHOW WARNINGS; |