bk commit into 5.1 tree (msvensson:1.2379)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2379 06/05/10 20:39:26 msvensson@neptunus.(none) +2 -0
  Update test results for 5.1

  mysql-test/r/auto_increment.result
    1.39 06/05/10 20:39:20 msvensson@neptunus.(none) +3 -3
    Update test results for 5.1

  mysql-test/r/ansi.result
    1.9 06/05/10 20:39:20 msvensson@neptunus.(none) +7 -7
    Update test results for 5.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1

--- 1.38/mysql-test/r/auto_increment.result	2006-05-10 15:47:13 +02:00
+++ 1.39/mysql-test/r/auto_increment.result	2006-05-10 20:39:20 +02:00
@@ -372,9 +372,9 @@
 SHOW CREATE TABLE `t1`;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `t1_name` varchar(255) default NULL,
-  `t1_id` int(10) unsigned NOT NULL auto_increment,
-  PRIMARY KEY  (`t1_id`),
+  `t1_name` varchar(255) DEFAULT NULL,
+  `t1_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  PRIMARY KEY (`t1_id`),
   KEY `t1_name` (`t1_name`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1
 DROP TABLE `t1`;

--- 1.8/mysql-test/r/ansi.result	2006-05-04 17:35:52 +02:00
+++ 1.9/mysql-test/r/ansi.result	2006-05-10 20:39:20 +02:00
@@ -21,28 +21,28 @@
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL auto_increment,
-  PRIMARY KEY  (`i`)
+  `i` int(11) NOT NULL AUTO_INCREMENT,
+  PRIMARY KEY (`i`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SET @@SQL_MODE="MYSQL323";
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL auto_increment,
-  PRIMARY KEY  (`i`)
+  `i` int(11) NOT NULL AUTO_INCREMENT,
+  PRIMARY KEY (`i`)
 ) TYPE=MyISAM
 SET @@SQL_MODE="MYSQL40";
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) NOT NULL auto_increment,
-  PRIMARY KEY  (`i`)
+  `i` int(11) NOT NULL AUTO_INCREMENT,
+  PRIMARY KEY (`i`)
 ) TYPE=MyISAM
 SET @@SQL_MODE="NO_FIELD_OPTIONS";
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) NOT NULL,
-  PRIMARY KEY  (`i`)
+  PRIMARY KEY (`i`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;