database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

A small fix to understand 4.1.0 format.

Browse Source
This commit is contained in:
bar@mysql.com
2004-07-27 18:43:40 +05:00
parent 51fbc5831c
commit 7f58bb793e
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_db.cc
View File

@@ -320,10 +320,17 @@ bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create)
{ {
if (!strncmp(buf,"default-character-set", (pos-buf))) if (!strncmp(buf,"default-character-set", (pos-buf)))
{ {
/*
Try character set name, and if it fails
try collation name, probably it's an old
4.1.0 db.opt file, which didn't have
separate default-character-set and
default-collation commands.
*/
if (!(create->default_table_charset= if (!(create->default_table_charset=
get_charset_by_csname(pos+1, get_charset_by_csname(pos+1, MY_CS_PRIMARY, MYF(0))) &&
MY_CS_PRIMARY, !(create->default_table_charset=
MYF(0)))) get_charset_by_name(pos+1, MYF(0))))
{ {
sql_print_error("Error while loading database options: '%s':",path); sql_print_error("Error while loading database options: '%s':",path);
sql_print_error(ER(ER_UNKNOWN_CHARACTER_SET),pos+1); sql_print_error(ER(ER_UNKNOWN_CHARACTER_SET),pos+1);