Commit 9d38af2c authored by unknown's avatar unknown
Browse files

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 

into  capulet.net:/home/bk/mysql-5.1-rpl
parents 11fa402d bf065810

client/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -96,7 +96,9 @@ DEFS = -DUNDEF_THREADS_HACK \ 
			-DDATADIR="\"$(localstatedir)\""



sql_src=log_event.h mysql_priv.h rpl_constants.h \

	log_event.cc my_decimal.h my_decimal.cc

	log_event.cc my_decimal.h my_decimal.cc \

	log_event_old.h log_event_old.cc \

	rpl_record_old.h rpl_record_old.cc

strings_src=decimal.c



link_sources:

client/mysqlbinlog.cc

+2 −0
Original line number Diff line number Diff line
@@ -1600,10 +1600,12 @@ int main(int argc, char** argv) 
#include "decimal.c"

#include "my_decimal.cpp"

#include "log_event.cpp"

#include "log_event_old.cpp"

#else

#include "my_decimal.h"

#include "decimal.c"

#include "my_decimal.cc"

#include "log_event.cc"

#include "log_event_old.cc"

#endif

client/mysqltest.c

+3 −3
Original line number Diff line number Diff line
@@ -2573,7 +2573,7 @@ int do_save_master_pos() 


    if (have_ndbcluster)

    {

      ulonglong start_epoch= 0, applied_epoch= 0,

      ulonglong start_epoch= 0, handled_epoch= 0,

	latest_epoch=0, latest_trans_epoch=0,

	latest_handled_binlog_epoch= 0, latest_received_binlog_epoch= 0,

	latest_applied_binlog_epoch= 0;
@@ -2676,9 +2676,9 @@ int do_save_master_pos() 
	if (!row)

	  die("result does not contain '%s' in '%s'",

	      binlog, query);

	if (latest_applied_binlog_epoch > applied_epoch)

	if (latest_handled_binlog_epoch > handled_epoch)

	  count= 0;

	applied_epoch= latest_applied_binlog_epoch;

	handled_epoch= latest_handled_binlog_epoch;

	count++;

	if (latest_handled_binlog_epoch >= start_epoch)

          do_continue= 0;

libmysqld/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -53,7 +53,9 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \

	item_geofunc.cc item_subselect.cc item_row.cc\

	item_xmlfunc.cc \

	key.cc lock.cc log.cc log_event.cc sql_state.c \

	key.cc lock.cc log.cc sql_state.c \

	log_event.cc \

	log_event_old.cc rpl_record_old.cc \

	protocol.cc net_serv.cc opt_range.cc \

	opt_sum.cc procedure.cc records.cc sql_acl.cc \

	sql_load.cc discover.cc sql_locale.cc \

mysql-test/r/ctype_utf8.result

+43 −0
Original line number Diff line number Diff line
@@ -1480,6 +1480,49 @@ aa 
xxx

yyy

DROP TABLE t1;

create table t1 (

a varchar(26) not null

) default character set utf8;

insert into t1 (a) values ('abcdefghijklmnopqrstuvwxyz');

select * from t1;

a

abcdefghijklmnopqrstuvwxyz

alter table t1 change a a varchar(20) character set utf8 not null;

Warnings:

Warning	1265	Data truncated for column 'a' at row 1

select * from t1;

a

abcdefghijklmnopqrst

alter table t1 change a a char(15) character set utf8 not null;

Warnings:

Warning	1265	Data truncated for column 'a' at row 1

select * from t1;

a

abcdefghijklmno

alter table t1 change a a char(10) character set utf8 not null;

Warnings:

Warning	1265	Data truncated for column 'a' at row 1

select * from t1;

a

abcdefghij

alter table t1 change a a varchar(5) character set utf8 not null;

Warnings:

Warning	1265	Data truncated for column 'a' at row 1

select * from t1;

a

abcde

drop table t1;

create table t1 (

a varchar(4000) not null

) default character set utf8;

insert into t1 values (repeat('a',4000));

alter table t1 change a a varchar(3000) character set utf8 not null;

Warnings:

Warning	1265	Data truncated for column 'a' at row 1

select length(a) from t1;

length(a)

3000

drop table t1;

set names utf8;

select hex(char(1 using utf8));

hex(char(1 using utf8))