bk commit into 5.0 tree (bar:1.2535) BUG#29675

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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-10-02 15:20:45+05:00, bar@stripped +1 -0
  Bug#29675 collation_connection is defined twice for the same value
  Removing redundant initialization.

  sql/mysqld.cc@stripped, 2007-10-02 15:20:43+05:00, bar@stripped +0 -1
    Removing redundant variable initialization.

diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2007-08-16 19:25:45 +05:00
+++ b/sql/mysqld.cc	2007-10-02 15:20:43 +05:00
@@ -2849,7 +2849,6 @@ static int init_common_variables(const c
   global_system_variables.collation_connection=  default_charset_info;
   global_system_variables.character_set_results= default_charset_info;
   global_system_variables.character_set_client= default_charset_info;
-  global_system_variables.collation_connection= default_charset_info;
 
   if (!(character_set_filesystem=
         get_charset_by_csname(character_set_filesystem_name,