install_test_db.sh:

  install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci
mysqld.cc:
  better error messaging


sql/mysqld.cc:
  better error messaging
mysql-test/install_test_db.sh:
  install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci

mysql-test/install_test_db.sh

@@ -66,7 +66,7 @@ if [ x$BINARY_DIST = x1 ] ; then
 basedir=..
 else
 basedir=.
-EXTRA_ARG="--language=../sql/share/english/"
+EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/"
 fi
 
 mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \

sql/mysqld.cc

@@ -2148,8 +2148,12 @@ static int init_common_variables(const char *conf_file_name, int argc,
   {
     CHARSET_INFO *default_collation;
     default_collation= get_charset_by_name(default_collation_name, MYF(0));
-    if (!default_collation || !my_charset_same(default_charset_info,
-					       default_collation))
+    if (!default_collation)
+    {
+      sql_print_error(ER(ER_UNKNOWN_COLLATION), default_collation_name);
+      return 1;
+    }
+    if (!my_charset_same(default_charset_info, default_collation))
     {
       sql_print_error(ER(ER_COLLATION_CHARSET_MISMATCH),
 		      default_collation_name,