Commit 56ecc18f authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 

into  chilla.local:/home/mydev/mysql-5.0-bug23139
parents c631beed 403fa254

mysql-test/r/federated.result

+2 −2
Original line number Diff line number Diff line
@@ -1821,11 +1821,11 @@ insert into federated.t1 values (0x6DC3A56E6164); 
select hex(a) from federated.t1;

hex(a)

6DC3A56E6164

set names utf8;

create table federated.t1 (a varchar(64))

ENGINE=FEDERATED 

CONNECTION='mysql://root@127.0.0.1:9308/federated/t1'

connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1'

DEFAULT CHARSET=utf8;

set names utf8;

select hex(a) from federated.t1;

hex(a)

6DC3A56E6164

mysql-test/t/federated.test

+3 −2
Original line number Diff line number Diff line
@@ -1555,11 +1555,12 @@ insert into federated.t1 values (0x6DC3A56E6164); 
select hex(a) from federated.t1;



connection master;

set names utf8;

--replace_result $SLAVE_MYPORT SLAVE_PORT

eval create table federated.t1 (a varchar(64))

ENGINE=FEDERATED 

CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1'

connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1'

DEFAULT CHARSET=utf8;

set names utf8;

select hex(a) from federated.t1;

insert into federated.t1 values (0xC3A4C3B6C3BCC39F);

insert into federated.t1 values (0xD18DD184D184D0B5D0BAD182D0B8D0B2D0BDD183D18E);