bk commit into 5.1 tree (bar:1.2208) BUG#14527

[bar]

Below is the list of changes that have just been committed into a local
5.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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2208 06/03/02 12:25:02 bar@stripped +3 -0
    Bug#14527: Partitions: table unreadable if partition name = c-cedilla
  sql_partition.cc:
    Changeing THD charset to utf8 when parsing a frm file.
  partition_charset.test, partition_charset.result:
    new file

  sql/sql_partition.cc
    1.45 06/03/02 12:23:20 bar@stripped +3 -0
    Bug#14527: Partitions: table unreadable if partition name = c-cedilla
    Changering THD charset to utf8 when parsing
    a frm file.

  mysql-test/t/partition_charset.test
    1.1 06/03/02 12:22:58 bar@stripped +21 -0

  mysql-test/r/partition_charset.result
    1.1 06/03/02 12:22:58 bar@stripped +18 -0

  mysql-test/t/partition_charset.test
    1.0 06/03/02 12:22:58 bar@stripped +0 -0
    BitKeeper file /usr/home/bar/mysql-5.1-new/mysql-test/t/partition_charset.test

  mysql-test/r/partition_charset.result
    1.0 06/03/02 12:22:58 bar@stripped +0 -0
    BitKeeper file /usr/home/bar/mysql-5.1-new/mysql-test/r/partition_charset.result

# 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.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1-new
--- New file ---
+++ mysql-test/r/partition_charset.result	06/03/02 12:22:58
drop table if exists t1;
set names utf8;
create table t1 (s1 int)
partition by list (s1)
(partition c values in (1),
partition Ç values in (3));
insert into t1 values (1),(3);
select * from t1;
s1
1
3
flush tables;
set names latin1;
select * from t1;
s1
1
3
drop table t1;

--- New file ---
+++ mysql-test/t/partition_charset.test	06/03/02 12:22:58
#
# Test for character set related things in combination
# with the partition storage engine
# 
-- source include/have_partition.inc

--disable_warnings
drop table if exists t1;
--enable_warnings

set names utf8;
create table t1 (s1 int)
  partition by list (s1)
    (partition c values in (1),
     partition Ç values in (3));
insert into t1 values (1),(3);
select * from t1;
flush tables;
set names latin1;
select * from t1;
drop table t1;


--- 1.44/sql/sql_partition.cc	2006-03-01 12:57:27 +04:00
+++ 1.45/sql/sql_partition.cc	2006-03-02 12:23:20 +04:00
@@ -3630,11 +3630,13 @@
   Item *thd_free_list= thd->free_list;
   bool result= TRUE;
   partition_info *part_info;
+  CHARSET_INFO *old_character_set_client= thd->variables.character_set_client;
   LEX *old_lex= thd->lex;
   LEX lex;
   DBUG_ENTER("mysql_unpack_partition");
 
   thd->lex= &lex;
+  thd->variables.character_set_client= system_charset_info;
   lex_start(thd, part_buf, part_info_len);
   /*
     We need to use the current SELECT_LEX since I need to keep the
@@ -3760,6 +3762,7 @@
 end:
   thd->free_list= thd_free_list;
   thd->lex= old_lex;
+  thd->variables.character_set_client= old_character_set_client;
   DBUG_RETURN(result);
 }