Commit 3fda4f1f authored by unknown's avatar unknown
Browse files

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

into hundin.mysql.fi:/home/heikki/mysql-5.0
parents a93d5b2c ee987331

innobase/include/data0type.ic

+2 −1
Original line number Diff line number Diff line
@@ -195,7 +195,8 @@ dtype_get_pad_char( 
	    || type->mtype == DATA_BINARY

	    || type->mtype == DATA_FIXBINARY

	    || type->mtype == DATA_MYSQL

	    || type->mtype == DATA_VARMYSQL) {

	    || type->mtype == DATA_VARMYSQL

	    || type->mtype == DATA_BLOB) {



		/* Space is the padding character for all char and binary

	        strings */

mysql-test/r/endspace.result

+2 −0
Original line number Diff line number Diff line
@@ -201,10 +201,12 @@ teststring 
select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%';

text1	length(text1)

teststring		11

teststring	10

teststring 	11

select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t';

text1	length(text1)

teststring		11

teststring	10

teststring 	11

select concat('|', text1, '|') from t1 order by text1;

concat('|', text1, '|')