bk commit into 5.0 tree (iggy:1.2127) BUG#19093

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.0 repository of iggy. When iggy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2127 06/05/19 13:11:07 iggy@stripped +2 -0
  BUG#19093 SHOW STATUS now defaults to SHOW GLOBAL STATUS as opposed to SHOW SESSION STATUS.  This was done to restore backward compatibility from previous versions to prevent legacy applications from breaking.  This requires an update to the DOC.

  sql/sql_yacc.yy
    1.467 06/05/19 13:11:03 iggy@stripped +9 -2
    Defined a seperate symbol for SHOW STATUS commands.  Defaulated /*empty*/ modifier to GLOBAL.

  mysql-test/r/count_distinct2.result
    1.10 06/05/19 13:11:03 iggy@stripped +2 -2
    Updated test file to reflect new output.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/mysql-5.0-maint

--- 1.466/sql/sql_yacc.yy	2006-04-23 00:11:24 -04:00
+++ 1.467/sql/sql_yacc.yy	2006-05-19 13:11:03 -04:00
@@ -739,7 +739,7 @@
 	ident_list ident_list_arg
 
 %type <var_type>
-        option_type opt_var_type opt_var_ident_type
+        option_type opt_var_type opt_var_ident_type opt_stat_type
 
 %type <key_type>
 	key_type opt_unique_or_fulltext constraint_key_type
@@ -6413,7 +6413,7 @@
           { Lex->sql_command = SQLCOM_SHOW_WARNS;}
         | ERRORS opt_limit_clause_init
           { Lex->sql_command = SQLCOM_SHOW_ERRORS;}
-        | opt_var_type STATUS_SYM wild_and_where
+        | opt_stat_type STATUS_SYM wild_and_where
           {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SELECT;
@@ -7806,6 +7806,13 @@
 
 opt_var_type:
 	/* empty */	{ $$=OPT_SESSION; }
+	| GLOBAL_SYM	{ $$=OPT_GLOBAL; }
+	| LOCAL_SYM	{ $$=OPT_SESSION; }
+	| SESSION_SYM	{ $$=OPT_SESSION; }
+	;
+
+opt_stat_type:
+	/* empty */	{ $$=OPT_GLOBAL; }
 	| GLOBAL_SYM	{ $$=OPT_GLOBAL; }
 	| LOCAL_SYM	{ $$=OPT_SESSION; }
 	| SESSION_SYM	{ $$=OPT_SESSION; }

--- 1.9/mysql-test/r/count_distinct2.result	2005-03-14 19:46:13 -05:00
+++ 1.10/mysql-test/r/count_distinct2.result	2006-05-19 13:11:03 -04:00
@@ -116,7 +116,7 @@
 5000
 show status like 'Created_tmp_disk_tables';
 Variable_name	Value
-Created_tmp_disk_tables	0
+Created_tmp_disk_tables	4
 drop table t1;
 create table t1 (s text);
 flush status;
@@ -125,5 +125,5 @@
 5000
 show status like 'Created_tmp_disk_tables';
 Variable_name	Value
-Created_tmp_disk_tables	1
+Created_tmp_disk_tables	5
 drop table t1;