1. New data types, from the user point of view:

   BINARY(N) and VARBIBARY(N)
2. More 4.0 compatibility and more BINARY keyword consistency:
2a. CREATE TABLE a (a CHAR(N) BINARY) 
    is now synonym for
    CREATE TABLE a (a CHAR(N) COLLATE xxxx_bin)
2b. SELECT BINARY x
    is still synonin for
    SELECT x COLLATE xxxxx_bin.

8 files changed, 38 insertions, 38 deletions

diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index 571ba7429fc..9b90742762e 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -321,7 +321,7 @@ alter table t1 change a a char(10) character set cp1251;
 select a,hex(a) from t1;
 a	hex(a)
 ÔÅÓÔ	F2E5F1F2
-alter table t1 change a a char(10) binary;
+alter table t1 change a a binary(10);
 select a,hex(a) from t1;
 a	hex(a)
 òåñò	F2E5F1F2
diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result
index 877a349d188..cdeb5b3dc21 100644
--- a/mysql-test/r/cast.result
+++ b/mysql-test/r/cast.result
@@ -51,11 +51,11 @@ CONVERT(DATE "2004-01-22 21:45:33",CHAR)
 select CONVERT(DATE "2004-01-22 21:45:33",CHAR(4));
 CONVERT(DATE "2004-01-22 21:45:33",CHAR(4))
 2004
-select CONVERT(DATE "2004-01-22 21:45:33",CHAR(4) BINARY);
-CONVERT(DATE "2004-01-22 21:45:33",CHAR(4) BINARY)
+select CONVERT(DATE "2004-01-22 21:45:33",BINARY(4));
+CONVERT(DATE "2004-01-22 21:45:33",BINARY(4))
 2004
-select CAST(DATE "2004-01-22 21:45:33" AS CHAR(4) BINARY);
-CAST(DATE "2004-01-22 21:45:33" AS CHAR(4) BINARY)
+select CAST(DATE "2004-01-22 21:45:33" AS BINARY(4));
+CAST(DATE "2004-01-22 21:45:33" AS BINARY(4))
 2004
 set names binary;
 select cast(_latin1'test' as char character set latin2);
@@ -91,11 +91,11 @@ ab	a	ab	a	a
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` char(2) binary NOT NULL default '',
-  `c2` char(2) binary NOT NULL default '',
-  `c3` char(2) binary NOT NULL default '',
-  `c4` char(2) binary NOT NULL default '',
-  `c5` char(2) binary NOT NULL default ''
+  `c1` binary(2) NOT NULL default '',
+  `c2` binary(2) NOT NULL default '',
+  `c3` binary(2) NOT NULL default '',
+  `c4` binary(2) NOT NULL default '',
+  `c5` binary(2) NOT NULL default ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index aacd80f19bb..33a7e91fbeb 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -73,7 +73,7 @@ create table t1 select date_format("2004-01-19 10:10:10", "%Y-%m-%d");
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` char(10) binary default NULL
+  `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` binary(10) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 date_format("2004-01-19 10:10:10", "%Y-%m-%d")
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result
index f1582707cf5..fba1d9f47e3 100644
--- a/mysql-test/r/date_formats.result
+++ b/mysql-test/r/date_formats.result
@@ -364,7 +364,7 @@ str_to_date(a,b)
 create table t2 select str_to_date(a,b) from t1;
 describe t2;
 Field	Type	Null	Key	Default	Extra
-str_to_date(a,b)	char(29)	YES		NULL	
+str_to_date(a,b)	binary(29)	YES		NULL	
 select str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:%S.%f") as f1,
 str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:%S") as f2,
 str_to_date("2003-01-02", "%Y-%m-%d") as f3,
diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result
index ab66d786833..d1a5dd00370 100644
--- a/mysql-test/r/range.result
+++ b/mysql-test/r/range.result
@@ -150,7 +150,7 @@ believe in myself
 drop table t1;
 CREATE TABLE t1 (
 t1ID int(10) unsigned NOT NULL auto_increment,
-art char(1) binary NOT NULL default '',
+art binary(1) NOT NULL default '',
 KNR char(5) NOT NULL default '',
 RECHNR char(6) NOT NULL default '',
 POSNR char(2) NOT NULL default '',
diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result
index 8da46564619..d6d9aa1546b 100644
--- a/mysql-test/r/system_mysql_db.result
+++ b/mysql-test/r/system_mysql_db.result
@@ -13,9 +13,9 @@ user
 show create table db;
 Table	Create Table
 db	CREATE TABLE `db` (
-  `Host` char(60) binary NOT NULL default '',
-  `Db` char(64) binary NOT NULL default '',
-  `User` char(16) binary NOT NULL default '',
+  `Host` char(60) character set latin1 collate latin1_bin NOT NULL default '',
+  `Db` char(64) character set latin1 collate latin1_bin NOT NULL default '',
+  `User` char(16) character set latin1 collate latin1_bin NOT NULL default '',
   `Select_priv` enum('N','Y') NOT NULL default 'N',
   `Insert_priv` enum('N','Y') NOT NULL default 'N',
   `Update_priv` enum('N','Y') NOT NULL default 'N',
@@ -34,8 +34,8 @@ db	CREATE TABLE `db` (
 show create table host;
 Table	Create Table
 host	CREATE TABLE `host` (
-  `Host` char(60) binary NOT NULL default '',
-  `Db` char(64) binary NOT NULL default '',
+  `Host` char(60) character set latin1 collate latin1_bin NOT NULL default '',
+  `Db` char(64) character set latin1 collate latin1_bin NOT NULL default '',
   `Select_priv` enum('N','Y') NOT NULL default 'N',
   `Insert_priv` enum('N','Y') NOT NULL default 'N',
   `Update_priv` enum('N','Y') NOT NULL default 'N',
@@ -53,9 +53,9 @@ host	CREATE TABLE `host` (
 show create table user;
 Table	Create Table
 user	CREATE TABLE `user` (
-  `Host` varchar(60) binary NOT NULL default '',
-  `User` varchar(16) binary NOT NULL default '',
-  `Password` varchar(41) binary NOT NULL default '',
+  `Host` varchar(60) character set latin1 collate latin1_bin NOT NULL default '',
+  `User` varchar(16) character set latin1 collate latin1_bin NOT NULL default '',
+  `Password` varchar(41) character set latin1 collate latin1_bin NOT NULL default '',
   `Select_priv` enum('N','Y') NOT NULL default 'N',
   `Insert_priv` enum('N','Y') NOT NULL default 'N',
   `Update_priv` enum('N','Y') NOT NULL default 'N',
@@ -89,7 +89,7 @@ user	CREATE TABLE `user` (
 show create table func;
 Table	Create Table
 func	CREATE TABLE `func` (
-  `name` char(64) binary NOT NULL default '',
+  `name` char(64) character set latin1 collate latin1_bin NOT NULL default '',
   `ret` tinyint(1) NOT NULL default '0',
   `dl` char(128) NOT NULL default '',
   `type` enum('function','aggregate') NOT NULL default 'function',
@@ -98,10 +98,10 @@ func	CREATE TABLE `func` (
 show create table tables_priv;
 Table	Create Table
 tables_priv	CREATE TABLE `tables_priv` (
-  `Host` char(60) binary NOT NULL default '',
-  `Db` char(64) binary NOT NULL default '',
-  `User` char(16) binary NOT NULL default '',
-  `Table_name` char(64) binary NOT NULL default '',
+  `Host` char(60) character set latin1 collate latin1_bin NOT NULL default '',
+  `Db` char(64) character set latin1 collate latin1_bin NOT NULL default '',
+  `User` char(16) character set latin1 collate latin1_bin NOT NULL default '',
+  `Table_name` char(64) character set latin1 collate latin1_bin NOT NULL default '',
   `Grantor` char(77) NOT NULL default '',
   `Timestamp` timestamp NOT NULL,
   `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') NOT NULL default '',
@@ -112,11 +112,11 @@ tables_priv	CREATE TABLE `tables_priv` (
 show create table columns_priv;
 Table	Create Table
 columns_priv	CREATE TABLE `columns_priv` (
-  `Host` char(60) binary NOT NULL default '',
-  `Db` char(64) binary NOT NULL default '',
-  `User` char(16) binary NOT NULL default '',
-  `Table_name` char(64) binary NOT NULL default '',
-  `Column_name` char(64) binary NOT NULL default '',
+  `Host` char(60) character set latin1 collate latin1_bin NOT NULL default '',
+  `Db` char(64) character set latin1 collate latin1_bin NOT NULL default '',
+  `User` char(16) character set latin1 collate latin1_bin NOT NULL default '',
+  `Table_name` char(64) character set latin1 collate latin1_bin NOT NULL default '',
+  `Column_name` char(64) character set latin1 collate latin1_bin NOT NULL default '',
   `Timestamp` timestamp NOT NULL,
   `Column_priv` set('Select','Insert','Update','References') NOT NULL default '',
   PRIMARY KEY  (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result
index d44face6512..e9861266b78 100644
--- a/mysql-test/r/type_blob.result
+++ b/mysql-test/r/type_blob.result
@@ -7,7 +7,7 @@ b	text	YES		NULL
 c	blob	YES		NULL	
 d	mediumtext	YES		NULL	
 e	longtext	YES		NULL	
-CREATE TABLE t2 (a char(257), b varchar(70000) binary, c varchar(70000000));
+CREATE TABLE t2 (a char(257), b varbinary(70000), c varchar(70000000));
 Warnings:
 Warning	1246	Converting column 'a' from CHAR to TEXT
 Warning	1246	Converting column 'b' from CHAR to BLOB
@@ -57,7 +57,7 @@ select * from t1;
 a
 Where
 drop table t1;
-create table t1 (t text,c char(10),b blob, d char(10) binary);
+create table t1 (t text,c char(10),b blob, d binary(10));
 insert into t1 values (NULL,NULL,NULL,NULL);
 insert into t1 values ("","","","");
 insert into t1 values ("hello","hello","hello","hello");
@@ -73,14 +73,14 @@ Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 t	text	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 c	varchar(10)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 b	blob	NULL	YES		NULL		select,insert,update,references	
-d	varchar(10)	binary	YES		NULL		select,insert,update,references	
+d	varbinary(10)	NULL	YES		NULL		select,insert,update,references	
 lock tables t1 WRITE;
 show full fields from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 t	text	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 c	varchar(10)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 b	blob	NULL	YES		NULL		select,insert,update,references	
-d	varchar(10)	binary	YES		NULL		select,insert,update,references	
+d	varbinary(10)	NULL	YES		NULL		select,insert,update,references	
 unlock tables;
 select t from t1 where t like "hello";
 t
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index ece2970198b..8e288f9725f 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -649,7 +649,7 @@ f
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f` char(12) binary default NULL
+  `f` binary(12) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 SELECT y from t2 UNION select da from t2;
@@ -660,7 +660,7 @@ y
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `y` char(10) binary default NULL
+  `y` binary(10) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 SELECT y from t2 UNION select dt from t2;
@@ -671,7 +671,7 @@ y
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `y` char(19) binary default NULL
+  `y` binary(19) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 SELECT da from t2 UNION select dt from t2;