bk commit into 5.1 tree (cmiller:1.2312)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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, 2006-09-05 10:56:32-04:00, cmiller@stripped +4 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
  MERGE: 1.1616.2717.1

  mysql-test/r/ctype_ucs2_def.result@stripped, 2006-09-05 10:55:40-04:00,
cmiller@stripped +0 -3
    Auto merged
    MERGE: 1.1.1.1

  mysql-test/t/ctype_ucs2_def-master.opt@stripped, 2006-09-05 10:55:40-04:00,
cmiller@stripped +0 -1
    Auto merged
    MERGE: 1.1.1.1

  mysql-test/t/ctype_ucs2_def.test@stripped, 2006-09-05 10:55:40-04:00,
cmiller@stripped +0 -5
    Auto merged
    MERGE: 1.1.1.1

  sql/mysqld.cc@stripped, 2006-09-05 10:56:30-04:00, cmiller@stripped +3 -3
    Manual merge.
    MERGE: 1.356.98.28

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-maint/RESYNC

--- 1.579/sql/mysqld.cc	2006-09-05 10:56:36 -04:00
+++ 1.580/sql/mysqld.cc	2006-09-05 10:56:36 -04:00
@@ -508,6 +508,10 @@
 
 const char *opt_date_time_formats[3];
 
+char compiled_default_collation_name[]= MYSQL_DEFAULT_COLLATION_NAME;
+char *language_ptr, *default_collation_name, *default_character_set_name;
+char mysql_data_home_buff[2], *mysql_data_home=mysql_real_data_home;
+struct passwd *user_info;
 char *mysql_data_home= mysql_real_data_home;
 char server_version[SERVER_VERSION_LENGTH];
 char *mysqld_unix_port, *opt_mysql_tmpdir;