mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge build:/home/bk/mysql-4.1

Browse source 
into build.mysql.com:/users/tsmith/m/41/mysql-4.1
This commit is contained in:
tsmith@build.mysql.com 2004-05-11 14:44:25 +02:00
commit 6ad9691dc8
4 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View file

@ -163,6 +163,7 @@ tonu@hundin.mysql.fi
tonu@volk.internalnet tonu@volk.internalnet
tonu@x153.internalnet tonu@x153.internalnet
tonu@x3.internalnet tonu@x3.internalnet
tsmith@build.mysql.com
ulli@morbus.(none) ulli@morbus.(none)
venu@hundin.mysql.fi venu@hundin.mysql.fi
venu@myvenu.com venu@myvenu.com

7
mysql-test/r/ctype_recoding.result
View file

@ -82,6 +82,13 @@ Field Type Null Key Default Extra
SET CHARACTER SET koi8r; SET CHARACTER SET koi8r;
DROP TABLE ÔÁÂÌÉÃÁ; DROP TABLE ÔÁÂÌÉÃÁ;
SET CHARACTER SET default; SET CHARACTER SET default;
SET NAMES UTF8;
CREATE TABLE t1 (t text) DEFAULT CHARSET UTF8;
INSERT INTO t1 (t) VALUES ('x');
SELECT 1 FROM t1 WHERE CONCAT(_latin1'x') = t;
1
1
DROP TABLE t1;
SET CHARACTER SET koi8r; SET CHARACTER SET koi8r;
CREATE DATABASE ÔÅÓÔ; CREATE DATABASE ÔÅÓÔ;
USE ÔÅÓÔ; USE ÔÅÓÔ;

8
mysql-test/t/ctype_recoding.test
View file

@ -56,6 +56,13 @@ SET CHARACTER SET koi8r;
DROP TABLE ÔÁÂÌÉÃÁ; DROP TABLE ÔÁÂÌÉÃÁ;
SET CHARACTER SET default; SET CHARACTER SET default;
# Test for Item_func_conv_charset::fix_fields (bug #3704)
SET NAMES UTF8;
CREATE TABLE t1 (t text) DEFAULT CHARSET UTF8;
INSERT INTO t1 (t) VALUES ('x');
SELECT 1 FROM t1 WHERE CONCAT(_latin1'x') = t;
DROP TABLE t1;
SET CHARACTER SET koi8r; SET CHARACTER SET koi8r;
CREATE DATABASE ÔÅÓÔ; CREATE DATABASE ÔÅÓÔ;
USE ÔÅÓÔ; USE ÔÅÓÔ;
@ -71,4 +78,3 @@ SET NAMES koi8r;
SELECT hex('ÔÅÓÔ'); SELECT hex('ÔÅÓÔ');
SET character_set_connection=cp1251; SET character_set_connection=cp1251;
SELECT hex('ÔÅÓÔ'); SELECT hex('ÔÅÓÔ');

1
sql/item_cmpfunc.cc
View file

@ -221,6 +221,7 @@ void Item_bool_func2::fix_length_and_dec()
{ {
conv= new Item_func_conv_charset(args[weak],args[strong]->collation.collation); conv= new Item_func_conv_charset(args[weak],args[strong]->collation.collation);
conv->collation.set(args[weak]->collation.derivation); conv->collation.set(args[weak]->collation.derivation);
conv->fix_fields(current_thd, 0, &conv);
} }
args[weak]= conv ? conv : args[weak]; args[weak]= conv ? conv : args[weak];
} }