Commit 4453dc48 authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 

into  mysql.com:/usr/home/bar/mysql-5.0.b18908


BitKeeper/etc/collapsed:
  auto-union
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
parents 99530d8a 00c1c19e

BitKeeper/etc/collapsed

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ 
4513d8e4Af4dQWuk13sArwofRgFDQw

4519a6c5BVUxEHTf5iJnjZkixMBs8g

451ab499rgdjXyOnUDqHu-wBDoS-OQ

452c6c6dAjuNghfc1ObZ_UQ5SCl85g

mysql-test/include/strict_autoinc.inc

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
# Test for strict-mode autoincrement

#



--disable_warnings

drop table if exists t1;

--enable_warnings



set @org_mode=@@sql_mode;

eval create table t1

(

mysql-test/r/ctype_recoding.result

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ create table t1 (a char(10) character set koi8r, b text character set koi8r); 
insert into t1 values ('test','test');

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

Warnings:

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

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

Warning	1366	Incorrect string value: '\xCA\xC3\xD5\xCB' for column 'a' at row 1

Warning	1366	Incorrect string value: '\xCA\xC3\xD5\xCB' for column 'b' at row 1

drop table t1;

set names koi8r;

create table t1 (a char(10) character set cp1251);

mysql-test/r/ctype_utf8.result

+3 −3
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ drop table t1; 
create table t1 (s1 char(10) character set utf8);

insert into t1 values (0x41FF);

Warnings:

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

Warning	1366	Incorrect string value: '\xFF' for column 's1' at row 1

select hex(s1) from t1;

hex(s1)

41
@@ -205,7 +205,7 @@ drop table t1; 
create table t1 (s1 varchar(10) character set utf8);

insert into t1 values (0x41FF);

Warnings:

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

Warning	1366	Incorrect string value: '\xFF' for column 's1' at row 1

select hex(s1) from t1;

hex(s1)

41
@@ -213,7 +213,7 @@ drop table t1; 
create table t1 (s1 text character set utf8);

insert into t1 values (0x41FF);

Warnings:

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

Warning	1366	Incorrect string value: '\xFF' for column 's1' at row 1

select hex(s1) from t1;

hex(s1)

41

mysql-test/r/fulltext.result

+4 −4
Original line number Diff line number Diff line
@@ -372,10 +372,10 @@ t collation(t) FORMAT(MATCH t AGAINST ('Osnabruck'),6) 
aus Osnabrck	utf8_general_ci	1.591140

alter table t1 modify t varchar(200) collate latin1_german2_ci not null;

Warnings:

Warning	1265	Data truncated for column 't' at row 3

Warning	1265	Data truncated for column 't' at row 4

Warning	1265	Data truncated for column 't' at row 5

Warning	1265	Data truncated for column 't' at row 6

Warning	1366	Incorrect string value: '\xD0\xAD\xD1\x82\xD0\xBE...' for column 't' at row 3

Warning	1366	Incorrect string value: '\xD0\x9E\xD1\x82\xD0\xBB...' for column 't' at row 4

Warning	1366	Incorrect string value: '\xD0\x9D\xD0\xB5 \xD0...' for column 't' at row 5

Warning	1366	Incorrect string value: '\xD0\xB8 \xD0\xB1\xD1...' for column 't' at row 6

SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrck');

t	collation(t)

aus Osnabrck	latin1_german2_ci