mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-08 08:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Post-merge fix.

Browse source 
sql/share/estonian/errmsg.txt:
  Auto merged
sql/sql_db.cc:
  Auto merged
This commit is contained in:
unknown 2004-07-23 18:54:01 +02:00
commit 6ab9b7b6b9
125 changed files with 5787 additions and 16732 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/sql_db.cc
View file

@ -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;
}
}
}