summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2012-09-11 16:29:51 +0200
committerJon Olav Hauglid <jon.hauglid@oracle.com>2012-09-11 16:29:51 +0200
commit8c641484dc43571b16edeb9780a587472fc1f14b (patch)
tree734c8ecd1bddeee2d5b287f4e0052d63383f6742 /mysql-test/r
parentaa624daf8be6d826398020913f859adcf6159f2c (diff)
downloadmariadb-git-8c641484dc43571b16edeb9780a587472fc1f14b.tar.gz
WL#6454: Deprecate SHOW AUTHORS and SHOW CONTRIBUTORS
Added deprecation warning for SHOW AUTHORS and SHOW CONTRIBUTORS. This is the 5.5 version of the patch.
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/contributors.result2
-rw-r--r--mysql-test/r/show_check.result11
2 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/contributors.result b/mysql-test/r/contributors.result
index 5739c2244c3..19fdd96b4fb 100644
--- a/mysql-test/r/contributors.result
+++ b/mysql-test/r/contributors.result
@@ -3,3 +3,5 @@ Name Location Comment
Ronald Bradford Brisbane, Australia EFF contribution for UC2006 Auction
Sheeri Kritzer Boston, Mass. USA EFF contribution for UC2006 Auction
Mark Shuttleworth London, UK. EFF contribution for UC2006 Auction
+Warnings:
+Warning 1681 'SHOW CONTRIBUTORS' is deprecated and will be removed in a future release.
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index fb15f7e9a4e..1d4202efc18 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -1552,3 +1552,14 @@ RELEASE_LOCK('t')
óóóó
1
SET NAMES latin1;
+#
+# WL#6454: Deprecate SHOW AUTHORS and SHOW CONTRIBUTORS
+#
+SHOW AUTHORS;
+SHOW WARNINGS;
+Level Code Message
+Warning 1681 'SHOW AUTHORS' is deprecated and will be removed in a future release.
+SHOW CONTRIBUTORS;
+SHOW WARNINGS;
+Level Code Message
+Warning 1681 'SHOW CONTRIBUTORS' is deprecated and will be removed in a future release.