do not call get_charset_by_name() with string "DEFAULT"

88e9a0bf · bar@bar.mysql.r18.ru · a89df5a0 · 88e9a0bf
Commit 88e9a0bf authored Jan 09, 2003 by bar@bar.mysql.r18.ru
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

sql/sql_db.cc sql/sql_db.cc +5 -3

No files found.
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -113,11 +113,13 @@ static bool load_db_opt(const char *path, HA_CREATE_INFO *create)
      if ((pos= strchr(buf, '=')))
      {
 	if (!strncmp(buf,"default-character-set", (pos-buf)))
+	{
+	  if (strcmp(pos+1,"DEFAULT"))
 	  {
 	    if (!(create->table_charset=get_charset_by_name(pos+1, MYF(0))))
 	    {
-	    sql_print_error(ER(ER_UNKNOWN_CHARACTER_SET),
+	      sql_print_error(ER(ER_UNKNOWN_CHARACTER_SET),pos+1);
-			    pos+1);
+	    }
 	  }
 	}
      }