diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2003-12-24 16:04:25 +0400 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2003-12-24 16:04:25 +0400 |
| commit | b72efef6f8eccdb7e47bac298668f31086853657 (patch) | |
| tree | 50daadcb17d6fdea20393609e318bd007e2fb884 /sql/mysqld.cc | |
| parent | 20a1da7864056c9bfcd5c18891c8598c74ab700a (diff) | |
| download | mariadb-git-b72efef6f8eccdb7e47bac298668f31086853657.tar.gz | |
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
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index bf57f9fb8f4..e81113f6111 100644 --- a/sql/mysqld.cc +++ b/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, |