Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

configure.in

@@ -1814,23 +1814,23 @@ fi
 AC_SUBST(readline_dir)
 AC_SUBST(readline_link)
 
-# Choose a character set
-dnl in order to add new charset, you must add charset name to
-dnl CHARSETS_AVAILABLE list and add the charset name to
-dnl sql/share/charsets/Index.  If the character set uses strcoll
-dnl or other special handling, you must also create
-dnl strings/ctype-$charset_name.c
+dnl In order to add new charset, you must add charset name to
+dnl this CHARSETS_AVAILABLE list and sql/share/charsets/Index.
+dnl If the character set uses strcoll or other special handling,
+dnl you must also create strings/ctype-$charset_name.c
 
-CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 latin5 swe7 usa7 win1250 win1251 win1251ukr ujis sjis tis620"
-DEFAULT_CHARSET=latin1
-
-dnl win1251 is deprecated - it's available, but not listed here in the help
-AC_ARG_WITH(charset,
-  [  --with-charset=CHARSET  Use CHARSET by default (one of: big5 cp1251 cp1257
+AC_DIVERT_PUSH(0)
+CHARSETS_AVAILABLE="big5 cp1251 cp1257
                           croat czech danish dec8 dos estonia euc_kr gb2312 gbk
                           german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr
-                          latin1 latin2 latin5 swe7 usa7 win1250 win1251ukr
-                          ujis sjis tis620; Default is latin1)],
+                          latin1 latin1_de latin2 latin5 sjis swe7 tis620 ujis
+                          usa7 win1250 win1251ukr"
+CHARSETS_DEPRECATED="win1251"
+DEFAULT_CHARSET=latin1_de
+AC_DIVERT_POP
+
+AC_ARG_WITH(charset,
+  [  --with-charset=CHARSET  Use CHARSET by default (one of: $CHARSETS_AVAILABLE; Default is $DEFAULT_CHARSET)],
   [default_charset="$withval"],
   [default_charset="$DEFAULT_CHARSET"])
 
@@ -1851,7 +1851,7 @@ elif test "$extra_charsets" = complex; then
   CHARSETS=`echo $CHARSETS`     # get rid of line breaks
 else
   if test "$extra_charsets" = all; then
-    CHARSETS="$CHARSETS_AVAILABLE"
+    CHARSETS="$CHARSETS_AVAILABLE $CHARSETS_DEPRECATED"
   else
     CHARSETS=`echo $extra_charsets | sed -e 's/,/ /g'`
   fi
@@ -1872,7 +1872,7 @@ CHARSETS=$TMP_CHARSETS
 for cs in $CHARSETS
 do
   charset_okay=0
-  for charset in $CHARSETS_AVAILABLE
+  for charset in $CHARSETS_AVAILABLE $CHARSETS_DEPRECATED
   do
     if test $cs = $charset; then charset_okay=1; fi
   done

libmysql/Makefile.shared

@@ -58,12 +58,6 @@ mysysobjects1 =		my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
                         charset.lo hash.lo mf_iocache.lo my_seek.lo \
 			my_pread.lo mf_cache.lo my_vsnprintf.lo
 
-link_sources:
-	for f in $(mysys_src); do \
-	rm -f $$f; \
-	@LN_CP_F@ ../mysys/$$f $$f; \
-	done;
-
 # Not needed in the minimum library
 mysysobjects2 =		getopt.lo getopt1.lo getvar.lo my_lib.lo
 mysysobjects =		$(mysysobjects1) $(mysysobjects2)

mysql-test/mysql-test-run.sh

@@ -128,6 +128,7 @@ DO_GDB=""
 DO_DDD=""
 DO_CLIENT_GDB=""
 SLEEP_TIME=2
+CHARACTER_SET=latin1_de
 DBUSER=""
 
 while test $# -gt 0; do
@@ -277,6 +278,7 @@ if [ x$SOURCE_DIST = x1 ] ; then
  MYSQLADMIN="$BASEDIR/client/mysqladmin"
  MYSQL="$BASEDIR/client/mysql"
  LANGUAGE="$BASEDIR/sql/share/english/"
+ CHARSETSDIR="$BASEDIR/sql/share/charsets"
  INSTALL_DB="./install_test_db"
 else
  MYSQLD="$BASEDIR/bin/mysqld"
@@ -287,8 +289,10 @@ else
  if test -d "$BASEDIR/share/mysql/english" 
  then
    LANGUAGE="$BASEDIR/share/mysql/english/"
+   CHARSETSDIR="$BASEDIR/share/mysql/charsets"
  else
    LANGUAGE="$BASEDIR/share/english/"
+   CHARSETSDIR="$BASEDIR/share/charsets"
   fi
 fi
 
@@ -506,7 +510,9 @@ start_master()
             --datadir=$MASTER_MYDDIR \
 	    --pid-file=$MASTER_MYPID \
 	    --socket=$MASTER_MYSOCK \
-            --log=$MASTER_MYLOG --default-character-set=latin1 \
+            --log=$MASTER_MYLOG \
+	    --character-sets-dir=$CHARSETSDIR \
+	    --default-character-set=$CHARACTER_SET \
 	    --tmpdir=$MYSQL_TMP_DIR \
 	    --language=$LANGUAGE \
             --innodb_data_file_path=ibdata1:50M \
@@ -519,7 +525,8 @@ start_master()
             --datadir=$MASTER_MYDDIR \
 	    --pid-file=$MASTER_MYPID \
 	    --socket=$MASTER_MYSOCK \
-            --default-character-set=latin1 \
+	    --character-sets-dir=$CHARSETSDIR \
+            --default-character-set=$CHARACTER_SET \
 	    --core \
 	    --tmpdir=$MYSQL_TMP_DIR \
 	    --language=$LANGUAGE \
@@ -575,7 +582,9 @@ start_slave()
 	    --pid-file=$SLAVE_MYPID \
 	    --port=$SLAVE_MYPORT \
 	    --socket=$SLAVE_MYSOCK \
-            --log=$SLAVE_MYLOG --default-character-set=latin1 \
+            --log=$SLAVE_MYLOG \
+	    --character-sets-dir=$CHARSETSDIR \
+	    --default-character-set=$CHARACTER_SET \
 	    --core \
 	    --tmpdir=$MYSQL_TMP_DIR \
             --language=$LANGUAGE \

sql/share/charsets/Index

 # sql/share/charsets/Index
 #
-# This file lists all of the available character sets.
+# This file lists all of the available character sets.  Please keep this
+# file sorted by character set number.
 
 
 big5 		   1
@@ -34,3 +35,4 @@ croat 		  27
 gbk 		  28
 cp1257		  29
 latin5		  30
+latin1_de	  31