Commit 3790b5fd authored by unknown's avatar unknown
Browse files

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

into mysql.com:/usr/home/bar/mysql-4.1
parents cf41c306 b670ccac

mysql-test/r/binary.result

+7 −0
Original line number Diff line number Diff line
@@ -134,3 +134,10 @@ select * from t1 where firstname='john' and firstname like binary 'John'; 
firstname	lastname

John	Doe

drop table t1;

create table t1 (a binary);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` binary(1) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

mysql-test/t/binary.test

+7 −0
Original line number Diff line number Diff line
@@ -80,3 +80,10 @@ select * from t1 where firstname='john' and firstname = binary 'john'; 
select * from t1 where firstname='John' and firstname like binary 'john';

select * from t1 where firstname='john' and firstname like binary 'John';

drop table t1;



#

# Bug #6552 CHAR column w/o length is legal, BINARY w/o length is not

#

create table t1 (a binary);

show create table t1;

drop table t1;

sql/sql_yacc.yy

+3 −0
Original line number Diff line number Diff line
@@ -1402,6 +1402,9 @@ type: 
	| BINARY '(' NUM ')'		{ Lex->length=$3.str;

					  Lex->charset=&my_charset_bin;

					  $$=FIELD_TYPE_STRING; }

	| BINARY			{ Lex->length= (char*) "1";

					  Lex->charset=&my_charset_bin;

					  $$=FIELD_TYPE_STRING; }

	| varchar '(' NUM ')' opt_binary { Lex->length=$3.str;

					  $$=FIELD_TYPE_VAR_STRING; }

	| nvarchar '(' NUM ')'		{ Lex->length=$3.str;