bk commit into 5.1 tree (gluh:1.2549) BUG#28580

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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@stripped, 2007-06-06 15:59:20+05:00, gluh@stripped +3 -0
  Bug#28580 Repeatation of status variables
  removed duplicated variable declarations

  mysql-test/r/variables.result@stripped, 2007-06-06 15:59:18+05:00, gluh@stripped +5 -0
    test result

  mysql-test/t/variables.test@stripped, 2007-06-06 15:59:18+05:00, gluh@stripped +6 -0
    test case

  sql/set_var.cc@stripped, 2007-06-06 15:59:18+05:00, gluh@stripped +0 -2
    removed duplicated variable declarations

# 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:	gluh
# Host:	eagle.(none)
# Root:	/home/gluh/MySQL/Merge/5.1-opt

--- 1.98/mysql-test/r/variables.result	2007-04-27 22:03:47 +05:00
+++ 1.99/mysql-test/r/variables.result	2007-06-06 15:59:18 +05:00
@@ -970,3 +970,8 @@ set global server_id                 =@m
 set global slow_launch_time          =@my_slow_launch_time;
 set global storage_engine            =@my_storage_engine;
 set global thread_cache_size         =@my_thread_cache_size;
+show global variables where Variable_name='table_definition_cache' or
+Variable_name='table_lock_wait_timeout';
+Variable_name	Value
+table_definition_cache	#
+table_lock_wait_timeout	#

--- 1.70/mysql-test/t/variables.test	2007-04-27 22:03:48 +05:00
+++ 1.71/mysql-test/t/variables.test	2007-06-06 15:59:18 +05:00
@@ -760,3 +760,9 @@ set global slow_launch_time          =@m
 set global storage_engine            =@my_storage_engine;
 set global thread_cache_size         =@my_thread_cache_size;
 
+#
+# Bug#28580 Repeatation of status variables
+#
+--replace_column 2 #
+show global variables where Variable_name='table_definition_cache' or
+Variable_name='table_lock_wait_timeout';

--- 1.236/sql/set_var.cc	2007-06-04 15:14:18 +05:00
+++ 1.237/sql/set_var.cc	2007-06-06 15:59:18 +05:00
@@ -699,8 +699,6 @@ static SHOW_VAR fixed_vars[]= {
 #ifdef HAVE_SYS_UN_H
   {"socket",                  (char*) &mysqld_unix_port,            SHOW_CHAR_PTR},
 #endif
-  {"table_definition_cache",  (char*) &table_def_size,              SHOW_LONG},
-  {"table_lock_wait_timeout", (char*) &table_lock_wait_timeout,     SHOW_LONG },
 #ifdef HAVE_THR_SETCONCURRENCY
   {"thread_concurrency",      (char*) &concurrency,                 SHOW_LONG},
 #endif