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

into  arthur.local:/home/my/mysql-5.0-clean

mysql-test/r/create.result

@@ -773,17 +773,3 @@ Warnings:
 Warning	1071	Specified key was too long; max key length is 765 bytes
 insert into t1 values('aaa');
 drop table t1;
-drop table if exists `about:text`;
-create table `about:text` ( 
-_id int not null auto_increment,
-`about:text` varchar(255) not null default '',
-primary key (_id)
-);
-show create table `about:text`;
-Table	Create Table
-about:text	CREATE TABLE `about:text` (
-  `_id` int(11) NOT NULL auto_increment,
-  `about:text` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-drop table `about:text`;

mysql-test/r/create_not_windows.result

+drop table if exists `about:text`;
+create table `about:text` ( 
+_id int not null auto_increment,
+`about:text` varchar(255) not null default '',
+primary key (_id)
+);
+show create table `about:text`;
+Table	Create Table
+about:text	CREATE TABLE `about:text` (
+  `_id` int(11) NOT NULL auto_increment,
+  `about:text` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table `about:text`;

mysql-test/t/create.test

@@ -674,19 +674,4 @@ create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb
 insert into t1 values('aaa');
 drop table t1;
 
-#
-# Bug#19479:mysqldump creates invalid dump
-#
---disable_warnings
-drop table if exists `about:text`;
---enable_warnings
-create table `about:text` ( 
-_id int not null auto_increment,
-`about:text` varchar(255) not null default '',
-primary key (_id)
-);
-
-show create table `about:text`; 
-drop table `about:text`;
-
 # End of 5.0 tests

mysql-test/t/create_not_windows.test

+# Non-windows specific create tests.
+
+--source include/not_windows.inc
+
+#
+# Bug#19479:mysqldump creates invalid dump
+#
+--disable_warnings
+drop table if exists `about:text`;
+--enable_warnings
+create table `about:text` ( 
+_id int not null auto_increment,
+`about:text` varchar(255) not null default '',
+primary key (_id)
+);
+
+show create table `about:text`; 
+drop table `about:text`;
+
+# End of 5.0 tests