Commit 95fa0d99 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
parents 4ebb0979 7bdd452d

include/hash.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ my_bool _hash_init(HASH *hash, CHARSET_INFO *charset, 
		   uint key_length, hash_get_key get_key,

		   void (*free_element)(void*), uint flags CALLER_INFO_PROTO);

void hash_free(HASH *tree);

void hash_reset(HASH *hash);

void my_hash_reset(HASH *hash);

byte *hash_element(HASH *hash,uint idx);

gptr hash_search(HASH *info,const byte *key,uint length);

gptr hash_next(HASH *info,const byte *key,uint length);

mysql-test/r/bdb.result

+2 −2
Original line number Diff line number Diff line
@@ -1300,7 +1300,7 @@ insert into t1 values('+ ', '+ ', '+ '); 
set @a=repeat(' ',20);

insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));

Warnings:

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

Note	1265	Data truncated for column 'v' at row 1

select concat('*',v,'*',c,'*',t,'*') from t1;

concat('*',v,'*',c,'*',t,'*')

*+ *+*+ *
@@ -1346,7 +1346,7 @@ t1 CREATE TABLE `t1` ( 
) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1

alter table t1 modify t varchar(10);

Warnings:

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

Note	1265	Data truncated for column 't' at row 2

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

mysql-test/r/heap.result

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ insert into t1 values('+ ', '+ ', '+ '); 
set @a=repeat(' ',20);

insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));

Warnings:

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

Note	1265	Data truncated for column 'v' at row 1

select concat('*',v,'*',c,'*',t,'*') from t1;

concat('*',v,'*',c,'*',t,'*')

*+ *+*+ *

mysql-test/r/myisam.result

+2 −2
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ insert into t1 values('+ ', '+ ', '+ '); 
set @a=repeat(' ',20);

insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));

Warnings:

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

Note	1265	Data truncated for column 'v' at row 1

select concat('*',v,'*',c,'*',t,'*') from t1;

concat('*',v,'*',c,'*',t,'*')

*+ *+*+ *
@@ -617,7 +617,7 @@ t1 CREATE TABLE `t1` ( 
) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1 modify t varchar(10);

Warnings:

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

Note	1265	Data truncated for column 't' at row 2

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

mysql-test/r/strict.result

+1 −1
Original line number Diff line number Diff line
@@ -818,7 +818,6 @@ ERROR 01000: Data truncated for column 'col1' at row 1 
INSERT INTO t1 (col2) VALUES ('hellobob');

ERROR 01000: Data truncated for column 'col2' at row 1

INSERT INTO t1 (col2) VALUES ('hello  ');

ERROR 01000: Data truncated for column 'col2' at row 1

UPDATE t1 SET col1 ='hellobob' WHERE col1 ='he';

ERROR 01000: Data truncated for column 'col1' at row 2

UPDATE t1 SET col2 ='hellobob' WHERE col2 ='he';
@@ -835,6 +834,7 @@ col1 col2 
hello	hello

he	hellot

hello	hello 

NULL	hello 

hello	hellob

DROP TABLE t1;

CREATE TABLE t1 (col1 enum('red','blue','green'));