diff options
| author | unknown <pem@mysql.com> | 2004-07-23 18:54:01 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2004-07-23 18:54:01 +0200 |
| commit | 6ab9b7b6b91ccba17a7431c7366ac030bbdf6d83 (patch) | |
| tree | 7084123a00378c00f7a67da32f9ffe811f8676e3 /sql/sql_db.cc | |
| parent | 3783a74dcd1447579dfa4d876a58a5842b03c797 (diff) | |
| parent | 129bc589e18944c7628e8142067605c4f66c4539 (diff) | |
| download | mariadb-git-6ab9b7b6b91ccba17a7431c7366ac030bbdf6d83.tar.gz | |
Post-merge fix.
sql/share/estonian/errmsg.txt:
Auto merged
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index c898c46a3f0..905398378b8 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -328,6 +328,7 @@ bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create) { sql_print_error("Error while loading database options: '%s':",path); sql_print_error(ER(ER_UNKNOWN_CHARACTER_SET),pos+1); + create->default_table_charset= default_charset_info; } } else if (!strncmp(buf,"default-collation", (pos-buf))) @@ -337,6 +338,7 @@ bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create) { sql_print_error("Error while loading database options: '%s':",path); sql_print_error(ER(ER_UNKNOWN_COLLATION),pos+1); + create->default_table_charset= default_charset_info; } } } |