Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1

into mysql.com:/home/gluh/MySQL/Merge/5.1

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/gluh/MySQL/Merge/5.1
a6b880e4 · unknown · 1025a02a · 2252f6a7 · a6b880e4
Commit a6b880e4 authored Jun 14, 2006 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

mysql-test/r/create_not_windows.result mysql-test/r/create_not_windows.result +3 -3

No files found.
--- a/mysql-test/r/create_not_windows.result
+++ b/mysql-test/r/create_not_windows.result
@@ -7,8 +7,8 @@ primary key (_id)
 show create table `about:text`;
 Table	Create Table
 about:text	CREATE TABLE `about:text` (
-  `_id` int(11) NOT NULL auto_increment,
+  `_id` int(11) NOT NULL AUTO_INCREMENT,
-  `about:text` varchar(255) NOT NULL default '',
+  `about:text` varchar(255) NOT NULL DEFAULT '',
  PRIMARY KEY (`_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table `about:text`;