Commit 6ce9ed78 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 71da21b2 d1e4a1f1

mysql-test/r/ctype_ucs.result

+15 −0
Original line number Diff line number Diff line
@@ -487,3 +487,18 @@ prepare stmt1 from @str2; 
execute stmt1 using @ivar;

?

1234

SET TIMESTAMP=10000;

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

show binlog events from 79;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	79	User var	1	79	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

master-bin.000001	119	Query	1	119	use `test`; insert into t2 values (@v)

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci;

use test;

SET TIMESTAMP=10000;

insert into t2 values (@v);

drop table t2;

mysql-test/r/user_var.result

+1 −12
Original line number Diff line number Diff line
@@ -169,18 +169,12 @@ SET @`a b`='hello'; 
INSERT INTO t1 VALUES(@`a b`);

set @var1= "';aaa";

insert into t1 values (@var1);

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

insert into t2 values (@v);

show binlog events from 79;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	79	User var	1	79	@`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci

master-bin.000001	120	Query	1	120	use `test`; INSERT INTO t1 VALUES(@`a b`)

master-bin.000001	184	User var	1	184	@`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci

master-bin.000001	226	Query	1	226	use `test`; insert into t1 values (@var1)

master-bin.000001	290	Query	1	290	use `test`; create table t2 (c char(30)) charset=ucs2

master-bin.000001	366	User var	1	366	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

master-bin.000001	406	Query	1	406	use `test`; insert into t2 values (@v)

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

SET @`a b`:=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci;

use test;
@@ -189,12 +183,7 @@ INSERT INTO t1 VALUES(@`a b`); 
SET @`var1`:=_latin1 0x273B616161 COLLATE latin1_swedish_ci;

SET TIMESTAMP=10000;

insert into t1 values (@var1);

SET TIMESTAMP=10000;

create table t2 (c char(30)) charset=ucs2;

SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci;

SET TIMESTAMP=10000;

insert into t2 values (@v);

drop table t1, t2;

drop table t1;

set @var= NULL ;

select FIELD( @var,'1it','Hit') as my_column;

my_column

mysql-test/t/ctype_ucs.test

+16 −0
Original line number Diff line number Diff line
@@ -323,3 +323,19 @@ set @str1 = 'select ?'; 
set @str2 = convert(@str1 using ucs2);

prepare stmt1 from @str2;

execute stmt1 using @ivar;



#

# Check correct binlogging of UCS2 user variables (BUG#3875)

#

SET TIMESTAMP=10000;

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

show binlog events from 79;

# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we

# absolutely need variables names to be quoted and strings to be

# escaped).

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 

drop table t2;

mysql-test/t/user_var.test

+1 −4
Original line number Diff line number Diff line
@@ -108,16 +108,13 @@ SET @`a b`='hello'; 
INSERT INTO t1 VALUES(@`a b`);

set @var1= "';aaa";

insert into t1 values (@var1);

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

insert into t2 values (@v);

show binlog events from 79;

# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we

# absolutely need variables names to be quoted and strings to be

# escaped).

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 

drop table t1, t2;

drop table t1;





#

sql/slave.cc

+2 −2
Original line number Diff line number Diff line
@@ -1032,7 +1032,7 @@ bool net_request_file(NET* net, const char* fname) 
}





const char *rewrite_db(const char* db, uint *new_len)

const char *rewrite_db(const char* db, uint32 *new_len)

{

  if (replicate_rewrite_db.is_empty() || !db)

    return db;
@@ -1043,7 +1043,7 @@ const char *rewrite_db(const char* db, uint *new_len) 
  {

    if (!strcmp(tmp->key, db))

    {

      *new_len= strlen(tmp->val);

      *new_len= (uint32)strlen(tmp->val);

      return tmp->val;

    }

  }