Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/work-select_lex-4.1


sql/sql_yacc.yy:
  Auto merged

7 files changed, 39 insertions, 14 deletions

diff --git a/sql/handler.h b/sql/handler.h
index 45865c39154..7260e8f2f8c 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -137,6 +137,7 @@ enum row_type { ROW_TYPE_NOT_USED=-1, ROW_TYPE_DEFAULT, ROW_TYPE_FIXED,
 #define HA_CREATE_USED_MAX_ROWS		32
 #define HA_CREATE_USED_AVG_ROW_LENGTH	64
 #define HA_CREATE_USED_PACK_KEYS	128
+#define HA_CREATE_USED_CHARSET		256
 
 typedef struct st_thd_trans {
   void *bdb_tid;
diff --git a/sql/lex.h b/sql/lex.h
index da0a71a135e..4af36df58af 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -82,6 +82,7 @@ static SYMBOL symbols[] = {
   { "CASE",		SYM(CASE_SYM),0,0},
   { "CHAR",		SYM(CHAR_SYM),0,0},
   { "CHARACTER",	SYM(CHAR_SYM),0,0},
+  { "CHARSET",		SYM(CHARSET),0,0},
   { "CHANGE",		SYM(CHANGE),0,0},
   { "CHANGED",		SYM(CHANGED),0,0},
   { "CHECK",		SYM(CHECK_SYM),0,0},
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 48d6bc7471f..494607c7fff 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1156,6 +1156,12 @@ store_create_info(THD *thd, TABLE *table, String *packet)
   char buff[128];
   char* p;
 
+  if (table->table_charset)
+  {
+    packet->append(" CHARSET=");
+    packet->append(table->table_charset->name);
+  }
+
   if (table->min_rows)
   {
     packet->append(" MIN_ROWS=");
@@ -1386,7 +1392,7 @@ int mysqld_show_charsets(THD *thd, const char *wild)
       net_store_data(&packet2,(uint32) cs->mbmaxlen);
 
       if (my_net_write(&thd->net, (char*) packet2.ptr(),packet2.length()))
-         goto err;                               /* purecov: inspected */
+         goto err;
     }
   }
   send_eof(&thd->net); 
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index f4f4dd212bd..3a6ff3d6b16 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -375,6 +375,9 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
     sql_field->offset= pos;
     if (MTYP_TYPENR(sql_field->unireg_check) == Field::NEXT_NUMBER)
       auto_increment++;
+    if(!sql_field->charset)
+      sql_field->charset = create_info->table_charset ?
+			     create_info->table_charset : default_charset_info;
     pos+=sql_field->pack_length;
   }
   if (auto_increment > 1)
@@ -1645,6 +1648,8 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
     create_info->max_rows=table->max_rows;
   if (!(used_fields & HA_CREATE_USED_AVG_ROW_LENGTH))
     create_info->avg_row_length=table->avg_row_length;
+  if (!(used_fields & HA_CREATE_USED_CHARSET))
+    create_info->table_charset=table->table_charset;
 
   table->file->update_create_info(create_info);
   if ((create_info->table_options &
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 9e9a243ddfb..c2ae300f021 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -162,6 +162,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token	CACHE_SYM
 %token	CASCADE
 %token	CAST_SYM
+%token	CHARSET
 %token	CHECKSUM_SYM
 %token	CHECK_SYM
 %token	CIPHER
@@ -768,7 +769,7 @@ create:
 	  bzero((char*) &lex->create_info,sizeof(lex->create_info));
 	  lex->create_info.options=$2 | $4;
 	  lex->create_info.db_type= default_table_type;
-	  lex->create_info.table_charset=default_charset_info;
+	  lex->create_info.table_charset=NULL;
 	}
 	create2
 
@@ -882,6 +883,17 @@ create_table_option:
 	    table_list->next=0;
 	    lex->create_info.used_fields|= HA_CREATE_USED_UNION;
 	  }
+	| CHARSET EQ ident
+	  { 
+	    CHARSET_INFO *cs=get_charset_by_name($3.str,MYF(MY_WME));
+	    if (!cs)
+	    {
+	      net_printf(&current_thd->net,ER_UNKNOWN_CHARACTER_SET,$3);
+	      YYABORT;
+	    }
+	    Lex->create_info.table_charset=cs;
+	    Lex->create_info.used_fields|= HA_CREATE_USED_CHARSET;
+	  }
 	| INSERT_METHOD EQ merge_insert_types   { Lex->create_info.merge_insert_method= $3; Lex->create_info.used_fields|= HA_CREATE_USED_INSERT_METHOD;}
 	| DATA_SYM DIRECTORY_SYM EQ TEXT_STRING	{ Lex->create_info.data_file_name= $4.str; }
 	| INDEX DIRECTORY_SYM EQ TEXT_STRING	{ Lex->create_info.index_file_name= $4.str; };
@@ -966,7 +978,7 @@ field_spec:
 	   LEX *lex=Lex;
 	   lex->length=lex->dec=0; lex->type=0; lex->interval=0;
 	   lex->default_value=lex->comment=0;
-	   lex->charset=default_charset_info;
+	   lex->charset=NULL;
 	 }
 	type opt_attribute
 	{
@@ -1117,8 +1129,8 @@ attribute:
 	| COMMENT_SYM text_literal { Lex->comment= $2; };
 
 opt_binary:
-	/* empty */		{ Lex->charset=default_charset_info; }
-	| BINARY		{ Lex->type|=BINARY_FLAG; Lex->charset=default_charset_info; }
+	/* empty */		{ Lex->charset=NULL; }
+	| BINARY		{ Lex->type|=BINARY_FLAG; Lex->charset=NULL; }
 	| CHAR_SYM SET ident
 	  {
 	    CHARSET_INFO *cs=get_charset_by_name($3.str,MYF(MY_WME));
@@ -1131,7 +1143,7 @@ opt_binary:
 	  };
 
 default_charset:
-	/* empty */			{ Lex->charset-default_charset_info; }
+	/* empty */			{ Lex->charset=NULL; }
 	| DEFAULT CHAR_SYM SET ident
 	  {
 	    CHARSET_INFO *cs=get_charset_by_name($4.str,MYF(MY_WME));
@@ -1260,7 +1272,7 @@ alter:
     	  bzero((char*) &lex->create_info,sizeof(lex->create_info));
 	  lex->create_info.db_type= DB_TYPE_DEFAULT;
 	  lex->create_info.row_type= ROW_TYPE_NOT_USED;
-	  lex->create_info.table_charset=default_charset_info;
+	  lex->create_info.table_charset=NULL;
           lex->alter_keys_onoff=LEAVE_AS_IS;
           lex->simple_alter=1;
 	}
diff --git a/sql/table.cc b/sql/table.cc
index 201b67032bf..8a7604687e7 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -118,7 +118,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
     outparam->raid_chunks= head[42];
     outparam->raid_chunksize= uint4korr(head+43);
     if (!(outparam->table_charset=get_charset((uint) head[38],MYF(0))))
-      outparam->table_charset=default_charset_info;
+      outparam->table_charset=NULL; // QQ display error message?
     null_field_first=1;
   }
   outparam->db_record_offset=1;
@@ -358,7 +358,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
       uint comment_length=uint2korr(strpos+13);
       field_type=(enum_field_types) (uint) strpos[11];
       if (!(charset=get_charset((uint) strpos[12], MYF(0))))
-	charset=outparam->table_charset;
+	charset=outparam->table_charset?outparam->table_charset:default_charset_info;
       if (!comment_length)
       {
 	comment.str= (char*) "";
@@ -375,7 +375,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
     {
       /* old frm file */
       field_type= (enum_field_types) f_packtype(pack_flag);
-      charset=outparam->table_charset;
+      charset=outparam->table_charset?outparam->table_charset:default_charset_info;
       bzero((char*) &comment, sizeof(comment));
     }
     *field_ptr=reg_field=
@@ -1041,7 +1041,7 @@ File create_frm(register my_string name, uint reclength, uchar *fileinfo,
     int2store(fileinfo+30,create_info->table_options);
     fileinfo[32]=0;				// No filename anymore
     int4store(fileinfo+34,create_info->avg_row_length);
-    fileinfo[38]= create_info->table_charset->number;
+    fileinfo[38]= create_info->table_charset?create_info->table_charset->number:0;
     fileinfo[40]= (uchar) create_info->row_type;
     fileinfo[41]= (uchar) create_info->raid_type;
     fileinfo[42]= (uchar) create_info->raid_chunks;
@@ -1072,6 +1072,7 @@ void update_create_info_from_table(HA_CREATE_INFO *create_info, TABLE *table)
   create_info->raid_type=table->raid_type;
   create_info->raid_chunks=table->raid_chunks;
   create_info->raid_chunksize=table->raid_chunksize;
+  create_info->table_charset=table->table_charset;
   DBUG_VOID_RETURN;
 }
 
@@ -1094,7 +1095,7 @@ char *get_field(MEM_ROOT *mem, TABLE *table, uint fieldnr)
 {
   Field *field=table->field[fieldnr];
   char buff[MAX_FIELD_WIDTH];
-  String str(buff,sizeof(buff),table->table_charset);
+  String str(buff,sizeof(buff),default_charset_info);
   field->val_str(&str,&str);
   uint length=str.length();
   if (!length)
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 863f71d1cce..f2d8d6532a9 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -459,8 +459,7 @@ static bool pack_fields(File file,List<create_field> &create_fields)
     int2store(buff+8,field->unireg_check);
     buff[10]= (uchar) field->interval_id;
     buff[11]= (uchar) field->sql_type; 
-    buff[12]= (uchar) (field->charset ? field->charset->number :
-		       default_charset_info->number);
+    buff[12]= (uchar) field->charset->number;
     int2store(buff+13, field->comment.length);
     comment_length+= field->comment.length;
     set_if_bigger(int_count,field->interval_id);