database default character set is now stored in database directory

4 files changed, 59 insertions, 4 deletions

diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 4f0bc2fe14a..1d0e3c1a72f 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -289,7 +289,7 @@ inline THD *_current_thd(void)
 
 #define prepare_execute(A) ((A)->command == COM_EXECUTE)
 
-int mysql_create_db(THD *thd, char *db, uint create_info, bool silent);
+int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, bool silent);
 int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent);
 void mysql_binlog_send(THD* thd, char* log_ident, ulong pos, ushort flags);
 int mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists);
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 3f619b70244..5275403db40 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -31,13 +31,15 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp,
 
 /* db-name is already validated when we come here */
 
-int mysql_create_db(THD *thd, char *db, uint create_options, bool silent)
+int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, bool silent)
 {
   char	 path[FN_REFLEN+16];
   MY_DIR *dirp;
   long result=1;
   int error = 0;
   DBUG_ENTER("mysql_create_db");
+  register File file;
+  uint create_options = create_info ? create_info->options : 0;
 
   VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
 
@@ -73,6 +75,37 @@ int mysql_create_db(THD *thd, char *db, uint create_options, bool silent)
     }
   }
 
+  /* 
+    Create database options file:
+    Currently databse default charset is only stored there.
+  */
+
+  strcat(path,"/");
+  unpack_dirname(path,path);
+  strcat(path,"db.opt");
+  if ((file=my_create(path,CREATE_MODE,O_RDWR | O_TRUNC,MYF(MY_WME))) >= 0)
+  {
+    sprintf(path,"CREATE DATABASE %s DEFAULT CHARACTER SET=%s\n",db,
+		  (create_info && create_info->table_charset) 
+		  ? create_info->table_charset->name : "DEFAULT");
+    
+    if (my_write(file,(byte*) path,strlen(path),MYF(MY_NABP+MY_WME)))
+    {
+      // QQ : should we send more suitable error message?
+      my_error(ER_CANT_CREATE_DB,MYF(0),db,my_errno);
+      error = -1;
+      goto exit;
+    }
+    my_close(file,MYF(0));
+  }
+  else
+  {
+    // QQ : should we send more suitable error message?
+    my_error(ER_CANT_CREATE_DB,MYF(0),db,my_errno);
+    error = -1;
+    goto exit;
+  }
+
   if (!silent)
   {
     if (!thd->query)
@@ -104,7 +137,7 @@ exit2:
   DBUG_RETURN(error);
 }
 
-const char *del_exts[]= {".frm", ".BAK", ".TMD", NullS};
+const char *del_exts[]= {".frm", ".BAK", ".TMD",".opt", NullS};
 static TYPELIB deletable_extentions=
 {array_elements(del_exts)-1,"del_exts", del_exts};
 
@@ -333,6 +366,7 @@ bool mysql_change_db(THD *thd,const char *name)
   char	path[FN_REFLEN];
   uint db_access;
   DBUG_ENTER("mysql_change_db");
+  register File file;
 
   if (!dbname || !(db_length=strip_sp(dbname)))
   {
@@ -382,5 +416,25 @@ bool mysql_change_db(THD *thd,const char *name)
   thd->db=dbname;
   thd->db_length=db_length;
   thd->db_access=db_access;
+
+  /* 
+    Load database options file:
+  */
+
+  strcat(path,"/");
+  unpack_dirname(path,path);
+  strcat(path,"db.opt");
+  if ((file=my_open(path,O_RDWR|O_BINARY,MYF(MY_WME))) >= 0)
+  {
+    int nbytes=my_read(file,(byte*) path,sizeof(path),MYF(0));
+    if ( nbytes >= 0 )
+    {
+      path[nbytes]='\0';
+      // BAR TODO: parse create options 
+      // and extract database default charset
+    }
+    my_close(file,MYF(0));
+  }
+
   DBUG_RETURN(0);
 }
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 70f50483114..1f7e05fbae0 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2308,7 +2308,7 @@ mysql_execute_command(void)
     }
     if (check_access(thd,CREATE_ACL,lex->name,0,1))
       break;
-    res=mysql_create_db(thd,lex->name,lex->create_info.options,0);
+    res=mysql_create_db(thd,lex->name,&lex->create_info,0);
     break;
   }
   case SQLCOM_DROP_DB:
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 91c87e9b849..faa63afa6c7 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -798,6 +798,7 @@ create:
 	    lex->sql_command=SQLCOM_CREATE_DB;
 	    lex->name=$4.str;
             lex->create_info.options=$3;
+	    lex->create_info.table_charset=lex->charset;
 	  }
 	| CREATE udf_func_type UDF_SYM ident
 	  {