bzr push into mysql-5.5 branch (jon.hauglid:3969 to 3970) WL#6454

[Jon Olav Hauglid]

 3970 Jon Olav Hauglid	2012-09-11
      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.

    modified:
      mysql-test/r/contributors.result
      mysql-test/r/show_check.result
      mysql-test/t/show_check.test
      sql/sql_yacc.yy
 3969 Georgi Kodinov	2012-08-24
      Bug #14181049: MYSQL_INSTALL_DB.PL CREATES EMPTY SYSTEM TABLES FOR MYSQL 
      
      The script is different from what's used on unixes.
      It was not playing the table insertion script (mysql_system_tables_data.sql),
      although it was checking for the presence of this script.
      Fixed by re-enabling the lookup for this file and replaying it at bootstrap
      time. Note that on the Unixes "SELECT @@hostname" does return a fully qualified
      name, whereas on Windows it returns only a hostname.
      So by default we're filtering records in the mysql.user table until we ensure
      this is fixed.

    modified:
      scripts/mysql_install_db.pl.in
=== modified file 'mysql-test/r/contributors.result'
--- a/mysql-test/r/contributors.result	2006-05-03 00:53:26 +0000
+++ b/mysql-test/r/contributors.result	2012-09-11 14:29:51 +0000
@@ -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.

=== modified file 'mysql-test/r/show_check.result'
--- a/mysql-test/r/show_check.result	2011-09-27 12:14:31 +0000
+++ b/mysql-test/r/show_check.result	2012-09-11 14:29:51 +0000
@@ -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.

=== modified file 'mysql-test/t/show_check.test'
--- a/mysql-test/t/show_check.test	2011-10-19 21:44:17 +0000
+++ b/mysql-test/t/show_check.test	2012-09-11 14:29:51 +0000
@@ -1371,3 +1371,17 @@ SELECT RELEASE_LOCK('t');
 --connection default
 SET NAMES latin1;
 
+
+--echo #
+--echo # WL#6454: Deprecate SHOW AUTHORS and SHOW CONTRIBUTORS
+--echo #
+
+--disable_result_log
+SHOW AUTHORS;
+--enable_result_log
+SHOW WARNINGS;
+
+--disable_result_log
+SHOW CONTRIBUTORS;
+--enable_result_log
+SHOW WARNINGS;

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2012-06-29 14:38:29 +0000
+++ b/sql/sql_yacc.yy	2012-09-11 14:29:51 +0000
@@ -11010,11 +11010,19 @@ show_param:
           {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_AUTHORS;
+            push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
+                                ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
+                                ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
+                                "SHOW AUTHORS");
           }
         | CONTRIBUTORS_SYM
           {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_CONTRIBUTORS;
+            push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
+                                ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
+                                ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
+                                "SHOW CONTRIBUTORS");
           }
         | PRIVILEGES
           {

No bundle (reason: useless for push emails).