bk commit into 5.0 tree (msvensson:1.2483)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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-05-11 14:33:50+02:00, msvensson@stripped +1 -0
  Group the calculation of how many items there are in the
  load_default_groups list to the place  where it's used

  sql/mysqld.cc@stripped, 2007-05-11 14:33:49+02:00, msvensson@stripped +4 -5
    Group the calculation of how many items there are in the
    load_default_groups list to the place  where it's used

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.613/sql/mysqld.cc	2007-05-11 14:31:52 +02:00
+++ 1.614/sql/mysqld.cc	2007-05-11 14:33:49 +02:00
@@ -2555,11 +2555,6 @@ static const char *load_default_groups[]
 #endif
 "mysqld","server", MYSQL_BASE_VERSION, 0, 0};
 
-#if defined(__WIN__) && !defined(EMBEDDED_LIBRARY)
-static const int load_default_groups_sz=
-sizeof(load_default_groups)/sizeof(load_default_groups[0]);
-#endif
-
 
 /*
   Initialize one of the global date/time format variables
@@ -3709,6 +3704,10 @@ static char *add_quoted_string(char *to,
     return strnmov(to, from, length);
   return strxnmov(to, length, "\"", from, "\"", NullS);
 }
+
+
+static const int load_default_groups_sz=
+sizeof(load_default_groups)/sizeof(load_default_groups[0]);
 
 
 /*