After merge fixes

Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings


BitKeeper/deleted/.del-convert.result~a3b56e1db6f498e9:
  Delete: mysql-test/r/convert.result
BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72:
  Delete: mysql-test/t/convert.test
BitKeeper/deleted/.del-make_win_src_distribution.old~5c9ebdc4a852b43b:
  Delete: scripts/make_win_src_distribution.old
client/mysql.cc:
  Use server character set if --default-character-set is not used
client/mysqltest.c:
  Code cleanup (merge identical code)
  More debug messages
heap/hp_create.c:
  After merge fix
include/m_ctype.h:
  After merge fix
include/my_global.h:
  Remove size_str (we already have size_s)
include/mysql_com.h:
  After merge fix
libmysql/libmysql.c:
  After merge fix
libmysqld/Makefile.am:
  After merge fix
mysql-test/r/auto_increment.result:
  After merge fix
mysql-test/r/create.result:
  After merge fix
mysql-test/r/ctype_latin1_de.result:
  After merge fix
mysql-test/r/distinct.result:
  After merge fix
mysql-test/r/drop.result:
  After merge fix
mysql-test/r/fulltext.result:
  After merge fix
mysql-test/r/func_gconcat.result:
  After merge fix
mysql-test/r/func_str.result:
  After merge fix
mysql-test/r/func_test.result:
  After merge fix
mysql-test/r/grant.result:
  After merge fix
mysql-test/r/group_by.result:
  After merge fix
mysql-test/r/handler.result:
  After merge fix
mysql-test/r/heap.result:
  After merge fix
mysql-test/r/heap_btree.result:
  After merge fix
mysql-test/r/heap_hash.result:
  After merge fix
mysql-test/r/innodb.result:
  After merge fix
mysql-test/r/insert.result:
  After merge fix
mysql-test/r/insert_select.result:
  After merge fix
mysql-test/r/join_outer.result:
  After merge fix
mysql-test/r/key.result:
  After merge fix
mysql-test/r/key_cache.result:
  After merge fix
mysql-test/r/loaddata.result:
  After merge fix
mysql-test/r/myisam.result:
  After merge fix
mysql-test/r/null.result:
  After merge fix
mysql-test/r/null_key.result:
  After merge fix
mysql-test/r/order_by.result:
  After merge fix
mysql-test/r/rpl_do_grant.result:
  After merge fix
mysql-test/r/rpl_error_ignored_table.result:
  After merge fix
mysql-test/r/rpl_ignore_grant.result:
  After merge fix
mysql-test/r/rpl_loaddata.result:
  After merge fix
mysql-test/r/rpl_log.result:
  After merge fix
mysql-test/r/rpl_log_pos.result:
  After merge fix
mysql-test/r/rpl_max_relay_size.result:
  After merge fix
mysql-test/r/rpl_replicate_do.result:
  After merge fix
mysql-test/r/rpl_reset_slave.result:
  After merge fix
mysql-test/r/rpl_rotate_logs.result:
  After merge fix
mysql-test/r/rpl_user_variables.result:
  After merge fix
mysql-test/r/select.result:
  After merge fix
mysql-test/r/select_safe.result:
  After merge fix
mysql-test/r/subselect.result:
  After merge fix
mysql-test/r/type_blob.result:
  After merge fix
mysql-test/r/type_decimal.result:
  After merge fix
mysql-test/r/type_float.result:
  After merge fix
mysql-test/r/type_ranges.result:
  After merge fix
mysql-test/r/type_time.result:
  After merge fix
mysql-test/r/type_uint.result:
  After merge fix
mysql-test/r/union.result:
  After merge fix
mysql-test/r/warnings.result:
  After merge fix
mysql-test/t/auto_increment.test:
  After merge fix
mysql-test/t/case.test:
  After merge fix
mysql-test/t/ctype_collate.test:
  After merge fix
mysql-test/t/ctype_latin1_de.test:
  After merge fix
mysql-test/t/drop.test:
  After merge fix
mysql-test/t/func_in.test:
  After merge fix
mysql-test/t/func_set.test:
  After merge fix
mysql-test/t/func_str.test:
  After merge fix
mysql-test/t/func_test.test:
  After merge fix
mysql-test/t/grant.test:
  After merge fix
mysql-test/t/group_by.test:
  After merge fix
mysql-test/t/handler.test:
  After merge fix
mysql-test/t/heap.test:
  After merge fix
mysql-test/t/heap_btree.test:
  After merge fix
mysql-test/t/heap_hash.test:
  After merge fix
mysql-test/t/innodb.test:
  After merge fix
mysql-test/t/insert_select.test:
  After merge fix
mysql-test/t/key.test:
  After merge fix
mysql-test/t/key_cache.test:
  After merge fix
mysql-test/t/lock_tables_lost_commit-master.opt:
  After merge fix
mysql-test/t/lock_tables_lost_commit.test:
  After merge fix
mysql-test/t/myisam.test:
  After merge fix
mysql-test/t/row.test:
  After merge fix
mysql-test/t/subselect.test:
  After merge fix
mysql-test/t/type_decimal.test:
  After merge fix
mysql-test/t/type_ranges.test:
  After merge fix
mysql-test/t/type_uint.test:
  After merge fix
mysql-test/t/variables.test:
  After merge fix
mysql-test/t/warnings.test:
  After merge fix
scripts/make_win_src_distribution.sh:
  after merge fixes
sql-common/client.c:
  After merge fix
  Change my_connect() to use poll()
  If character set is not given, use servers character set.
sql/field.cc:
  After merge fix
  Don't give warnings when storing data in fields in optimizer.
sql/ha_myisammrg.h:
  After merge fix
sql/log.cc:
  After merge fix
sql/log_event.cc:
  After merge fix
sql/mysqld.cc:
  After merge fix
sql/opt_range.cc:
  After merge fix
sql/set_var.cc:
  Code cleanup
  Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps
sql/set_var.h:
  Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps
sql/slave.cc:
  After merge fix
sql/sql_acl.cc:
  After merge fix
  Code cleanup
sql/sql_class.cc:
  Added convert_string() for more efficient alloc+character-set convert of strings
  Add cached flags to avoid calling mysql_charset_same() during parsing.
sql/sql_class.h:
  Added convert_string() for more efficient alloc+character-set convert of strings
  Add cached flags to avoid calling mysql_charset_same() during parsing.
sql/sql_handler.cc:
  After merge fix
sql/sql_lex.h:
  After merge fix
sql/sql_parse.cc:
  Optimize and fix memory reference errors reported by valgrind
sql/sql_repl.cc:
  After merge fix
sql/sql_yacc.yy:
  After merge fix
  Avoid calling mysql_charset_same() when parsing identifiers
strings/ctype-latin1.c:
  Port latin_de conversion code from 4.0

1 files changed, 43 insertions, 53 deletions

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index f3631263735..a40dcc42183 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -67,9 +67,9 @@ inline Item *or_or_concat(THD *thd, Item* A, Item* B)
   TABLE_LIST *table_list;
   udf_func *udf;
   LEX_USER *lex_user;
-  sys_var *variable;
+  struct sys_var_with_base variable;
   Key::Keytype key_type;
-  enum ha_key_alg  key_alg;
+  enum ha_key_alg key_alg;
   enum db_type db_type;
   enum row_type row_type;
   enum ha_rkey_function ha_rkey_mode;
@@ -879,7 +879,7 @@ create:
 	  lex->name=0;
 	}
 	create2
-	  { Lex->select= &Lex->select_lex; }
+	  { Lex->current_select= &Lex->select_lex; }
 	| CREATE opt_unique_or_fulltext INDEX ident key_alg ON table_ident
 	  {
 	    LEX *lex=Lex;
@@ -942,15 +942,15 @@ create2:
 
 create2a:
         field_list ')' opt_create_table_options create3 {}
-	|  create_select ')' { Select->braces= 1;} union_opt {}
+	|  create_select ')' { Select->set_braces(1);} union_opt {}
         ;
 
 create3:
 	/* empty */ {}
 	| opt_duplicate opt_as     create_select
-          { Select->braces= 0;} opt_union {}
+          { Select->set_braces(0);} union_clause {}
 	| opt_duplicate opt_as '(' create_select ')'
-          { Select->braces= 1;} union_opt {}
+          { Select->set_braces(1);} union_opt {}
         ;
 
 create_select:
@@ -962,7 +962,7 @@ create_select:
 	      lex->sql_command= SQLCOM_INSERT_SELECT;
 	    else if (lex->sql_command == SQLCOM_REPLACE)
 	      lex->sql_command= SQLCOM_REPLACE_SELECT;
-	    lex->select->table_list.save_and_clear(&lex->save_list);
+	    lex->current_select->select_lex()->table_list.save_and_clear(&lex->save_list);
 	    mysql_init_select(lex);
 	    lex->current_select->parsing_place= SELECT_LEX_NODE::SELECT_LIST;
           }
@@ -971,7 +971,7 @@ create_select:
 	    Select->parsing_place= SELECT_LEX_NODE::NO_MATTER;
 	  }
 	  opt_select_from
-	  { Lex->select->table_list.push_front(&Lex->save_list); }
+	  { Lex->current_select->select_lex()->table_list.push_front(&Lex->save_list); }
         ;
 
 opt_as:
@@ -3434,7 +3434,7 @@ insert:
 	opt_ignore insert2
 	{
 	  Select->set_lock_for_tables($3);
-	  Lex->select= &Lex->select_lex;
+	  Lex->current_select= &Lex->select_lex;
 	}
 	insert_field_spec opt_insert_update
 	{}
@@ -3451,7 +3451,7 @@ replace:
 	replace_lock_option insert2
 	{
 	  Select->set_lock_for_tables($3);
-	  Lex->select= &Lex->select_lex;
+	  Lex->current_select= &Lex->select_lex;
 	}
 	insert_field_spec
 	{}
@@ -3507,8 +3507,8 @@ fields:
 insert_values:
 	VALUES	values_list  {}
 	| VALUE_SYM values_list  {}
-	|     create_select     { Select->braces= 0;} opt_union {}
-	| '(' create_select ')' { Select->braces= 1;} union_opt {}
+	|     create_select     { Select->set_braces(0);} union_clause {}
+	| '(' create_select ')' { Select->set_braces(1);} union_opt {}
         ;
 
 values_list:
@@ -4266,17 +4266,11 @@ IDENT_sys:
 	IDENT
 	{
 	  THD *thd= YYTHD;
-	  if (my_charset_same(thd->charset(),system_charset_info))
-	  {
-	    $$=$1;
-	  }
+	  if (thd->charset_is_system_charset)
+	    $$= $1;
 	  else
-	  {
-	    String ident;
-	    ident.copy($1.str,$1.length,thd->charset(),system_charset_info);
-	    $$.str= thd->strmake(ident.ptr(),ident.length());
-	    $$.length= ident.length();
-	  }
+	    thd->convert_string(&$$, system_charset_info,
+				$1.str, $1.length, thd->charset());
 	}
 	;
 
@@ -4284,17 +4278,11 @@ TEXT_STRING_sys:
 	TEXT_STRING
 	{
 	  THD *thd= YYTHD;
-	  if (my_charset_same(thd->charset(),system_charset_info))
-	  {
-	    $$=$1;
-	  }
+	  if (thd->charset_is_system_charset)
+	    $$= $1;
 	  else
-	  {
-	    String ident;
-	    ident.copy($1.str,$1.length,thd->charset(),system_charset_info);
-	    $$.str= thd->strmake(ident.ptr(),ident.length());
-	    $$.length= ident.length();
-	  }
+	    thd->convert_string(&$$, system_charset_info,
+				$1.str, $1.length, thd->charset());
 	}
 	;
 
@@ -4302,17 +4290,11 @@ TEXT_STRING_literal:
 	TEXT_STRING
 	{
 	  THD *thd= YYTHD;
-	  if (my_charset_same(thd->charset(),thd->variables.collation_connection))
-	  {
-	    $$=$1;
-	  }
+	  if (thd->charset_is_collation_connection)
+	    $$= $1;
 	  else
-	  {
-	    String ident;
-	    ident.copy($1.str,$1.length,thd->charset(),thd->variables.collation_connection);
-	    $$.str= thd->strmake(ident.ptr(),ident.length());
-	    $$.length= ident.length();
-	  }
+	    thd->convert_string(&$$, thd->variables.collation_connection,
+				$1.str, $1.length, thd->charset());
 	}
 	;
 
@@ -4321,9 +4303,9 @@ ident:
 	IDENT_sys	    { $$=$1; }
 	| keyword
 	{
-	  LEX *lex= Lex;
-	  $$.str= lex->thd->strmake($1.str,$1.length);
-	  $$.length=$1.length;
+	  THD *thd= YYTHD;
+	  $$.str=    thd->strmake($1.str, $1.length);
+	  $$.length= $1.length;
 	}
 	;
 
@@ -4590,18 +4572,24 @@ option_value:
 	| internal_variable_name equal set_expr_or_default
 	  {
 	    LEX *lex=Lex;
-	    lex->var_list.push_back(new set_var(lex->option_type, $1, $3));
+	    lex->var_list.push_back(new set_var(lex->option_type, $1.var,
+						&$1.base_name, $3));
 	  }
 	| '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default
 	  {
 	    LEX *lex=Lex;
-	    lex->var_list.push_back(new set_var((enum_var_type) $3, $4, $6));
+	    lex->var_list.push_back(new set_var((enum_var_type) $3, $4.var,
+						&$4.base_name, $6));
 	  }
 	| TRANSACTION_SYM ISOLATION LEVEL_SYM isolation_types
 	  {
 	    LEX *lex=Lex;
+	    LEX_STRING tmp;
+	    tmp.str=0;
+	    tmp.length=0;
 	    lex->var_list.push_back(new set_var(lex->option_type,
 						find_sys_var("tx_isolation"),
+						&tmp,
 						new Item_int((int32) $4)));
 	  }
 	| charset old_or_new_charset_name_or_default
@@ -4646,7 +4634,9 @@ internal_variable_name:
 	  sys_var *tmp=find_sys_var($1.str, $1.length);
 	  if (!tmp)
 	    YYABORT;
-	  $$=tmp;
+	  $$.var= tmp;
+	  $$.base_name.str=0;
+	  $$.base_name.length=0;
 	}
 	| ident '.' ident
 	  {
@@ -4655,8 +4645,8 @@ internal_variable_name:
 	      YYABORT;
 	    if (!tmp->is_struct())
 	      net_printf(YYTHD, ER_VARIABLE_IS_NOT_STRUCT, $3.str);
-	    tmp->base_name= $1;
-	    $$=tmp;
+	    $$.var= tmp;
+	    $$.base_name= $1;
 	  }
 	| DEFAULT '.' ident
 	  {
@@ -4665,9 +4655,9 @@ internal_variable_name:
 	      YYABORT;
 	    if (!tmp->is_struct())
 	      net_printf(YYTHD, ER_VARIABLE_IS_NOT_STRUCT, $3.str);
-	    tmp->base_name.str= (char*) "default";
-	    tmp->base_name.length= 7;
-	    $$=tmp;
+	    $$.var= tmp;
+	    $$.base_name.str=    (char*) "default";
+	    $$.base_name.length= 7;
 	  }
         ;