Commit 80bb69ed authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


sql/mysqld.cc:
  Auto merged
parents 9d7799e7 d3ff1c2f

mysql-test/r/ctype_ucs2_def.result

+3 −0
Original line number Diff line number Diff line 
show variables like 'collation_server';

Variable_name	Value

collation_server	ucs2_unicode_ci

show variables like "%character_set_ser%";

Variable_name	Value

character_set_server	ucs2

mysql-test/r/variables.result

+22 −0
Original line number Diff line number Diff line
@@ -421,6 +421,28 @@ set tmp_table_size=100; 
set tx_isolation="READ-COMMITTED";

set wait_timeout=100;

set log_warnings=1;

select @@session.insert_id;

@@session.insert_id

1

set @save_insert_id=@@session.insert_id;

set session insert_id=20;

select @@session.insert_id;

@@session.insert_id

20

set session last_insert_id=100;

select @@session.insert_id;

@@session.insert_id

20

select @@session.last_insert_id;

@@session.last_insert_id

100

select @@session.insert_id;

@@session.insert_id

20

set @@session.insert_id=@save_insert_id;

select @@session.insert_id;

@@session.insert_id

1

create table t1 (a int not null auto_increment, primary key(a));

create table t2 (a int not null auto_increment, primary key(a));

insert into t1 values(null),(null),(null);

mysql-test/t/ctype_ucs2_def-master.opt

+1 −1
Original line number Diff line number Diff line 
--default-character-set=ucs2 --default-collation=ucs2_unicode_ci
 
--default-collation=ucs2_unicode_ci --default-character-set=ucs2

mysql-test/t/ctype_ucs2_def.test

+5 −0
Original line number Diff line number Diff line 
#

# MySQL Bug#15276: MySQL ignores collation-server

#

show variables like 'collation_server';



#

# Bug#18004 Connecting crashes server when default charset is UCS2

#

mysql-test/t/variables.test

+16 −0
Original line number Diff line number Diff line
@@ -301,6 +301,22 @@ set tx_isolation="READ-COMMITTED"; 
set wait_timeout=100;

set log_warnings=1;



#

# Bugs: #20392: INSERT_ID session variable has weird value

#

select @@session.insert_id;

set @save_insert_id=@@session.insert_id;

set session insert_id=20;

select @@session.insert_id;



set session last_insert_id=100;

select @@session.insert_id;

select @@session.last_insert_id;

select @@session.insert_id;



set @@session.insert_id=@save_insert_id;

select @@session.insert_id;



#

# key buffer

#