bk commit into 4.1 tree

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1371 02/10/30 13:05:27 bar@xxxxxxxxxxxxxxxx +4 -0
  Preparation to thread specific default charset

  sql/sql_yacc.yy
    1.198 02/10/30 13:05:25 bar@xxxxxxxxxxxxxxxx +2 -2
    Preparation to thread specific default charset

  sql/sql_db.cc
    1.53 02/10/30 13:05:25 bar@xxxxxxxxxxxxxxxx +1 -1
    Preparation to thread specific default charset

  sql/sql_class.h
    1.136 02/10/30 13:05:25 bar@xxxxxxxxxxxxxxxx +1 -0
    Preparation to thread specific default charset

  sql/sql_class.cc
    1.98 02/10/30 13:05:25 bar@xxxxxxxxxxxxxxxx +1 -0
    Preparation to thread specific default charset

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: bar
# Host: bar.mysql.r18.ru
# Root: /usr/home/bar/mysql-4.1.wrk

--- 1.97/sql/sql_class.cc       Sat Oct 26 03:07:00 2002
+++ 1.98/sql/sql_class.cc       Wed Oct 30 13:05:25 2002
@@ -108,6 +108,7 @@
   file_id = 0;
   cond_count=0;
   db_charset=default_charset_info;
+  thd_charset=default_charset_info;
   mysys_var=0;
 #ifndef DBUG_OFF
   dbug_sentry=THD_SENTRY_MAGIC;

--- 1.135/sql/sql_class.h       Sat Oct 26 03:07:00 2002
+++ 1.136/sql/sql_class.h       Wed Oct 30 13:05:25 2002
@@ -481,6 +481,7 @@
   table_map  used_tables;
   USER_CONN *user_connect;
   CHARSET_INFO *db_charset;   
+  CHARSET_INFO *thd_charset;
   List      <MYSQL_ERROR> warn_list;  
   uint      warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_END];
   uint      total_warn_count, old_total_warn_count;

--- 1.52/sql/sql_db.cc  Wed Oct 16 21:30:21 2002
+++ 1.53/sql/sql_db.cc  Wed Oct 30 13:05:25 2002
@@ -592,7 +592,7 @@
   strmov(path+unpack_dirname(path,path), MY_DB_OPT_FILE);
   load_db_opt(path, &create);
   thd->db_charset=create.table_charset;
-
+  thd->thd_charset=thd->db_charset ? thd->db_charset : default_charset_info;
   DBUG_RETURN(0);
 }
 

--- 1.197/sql/sql_yacc.yy       Mon Oct 28 17:43:44 2002
+++ 1.198/sql/sql_yacc.yy       Wed Oct 30 13:05:25 2002
@@ -3309,13 +3309,13 @@
 /* Common definitions */
 
 text_literal:
-       TEXT_STRING { $$ = new 
Item_string($1.str,$1.length,default_charset_info); }
+       TEXT_STRING { $$ = new 
Item_string($1.str,$1.length,current_thd->thd_charset); }
        | UNDERSCORE_CHARSET TEXT_STRING { $$ = new 
Item_string($2.str,$2.length,Lex->charset); }
        | text_literal TEXT_STRING
        { ((Item_string*) $1)->append($2.str,$2.length); };
 
 text_string:
-       TEXT_STRING     { $$=  new 
String($1.str,$1.length,default_charset_info); }
+       TEXT_STRING     { $$=  new 
String($1.str,$1.length,current_thd->thd_charset); }
        | HEX_NUM
          {
            Item *tmp = new Item_varbinary($1.str,$1.length);

---------------------------------------------------------------------
Before posting, please check:
   http://www.mysql.com/manual.php   (the manual)
   http://lists.mysql.com/           (the list archive)

To request this thread, e-mail internals-thread5188@xxxxxxxxxxxxxxx
To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>