bk commit into 4.1 tree (lenz:1.2250)

[lenz]

Below is the list of changes that have just been committed into a local
4.1 repository of lenz. When lenz 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.2250 05/05/09 09:25:47 lenz@stripped +2 -0
  - added "--skip-comments" to the "mysqldump" test to avoid printing comments that
include 
    version-dependent information (which causes test failures when running the test with a
    different version string)

  mysql-test/t/mysqldump.test
    1.30 05/05/09 09:25:42 lenz@stripped +2 -2
    - added "--skip-comments" to avoid printing comments that include version-dependent
information
      (which causes test failures when running the test with a different version string)

  mysql-test/r/mysqldump.result
    1.42 05/05/09 09:25:42 lenz@stripped +0 -28
    - fixed the results (removed the version-dependent comments to avoid a test failure)

# 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:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.1-build

--- 1.41/mysql-test/r/mysqldump.result	2005-05-07 18:23:13 +02:00
+++ 1.42/mysql-test/r/mysqldump.result	2005-05-09 09:25:42 +02:00
@@ -563,11 +563,6 @@
 CREATE TABLE t1 (a decimal(240, 20));
 INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
 ("0987654321098765432109876543210987654321");
--- MySQL dump 10.9
---
--- Host: localhost    Database: test
--- ------------------------------------------------------
--- Server version	4.1.12-debug-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -577,20 +572,11 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `t1`
---
-
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `a` decimal(240,20) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
---
--- Dumping data for table `t1`
---
-
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 LOCK TABLES `t1` WRITE;
@@ -606,11 +592,6 @@
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- MySQL dump 10.9
---
--- Host: localhost    Database: test
--- ------------------------------------------------------
--- Server version	4.1.12-debug-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -620,19 +601,10 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `t1`
---
-
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `a` decimal(240,20) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `t1`
---
 
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;

--- 1.29/mysql-test/t/mysqldump.test	2005-05-07 18:23:14 +02:00
+++ 1.30/mysql-test/t/mysqldump.test	2005-05-09 09:25:42 +02:00
@@ -192,6 +192,6 @@
 CREATE TABLE t1 (a decimal(240, 20));
 INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
 ("0987654321098765432109876543210987654321");
---exec $MYSQL_DUMP --insert-ignore test t1
---exec $MYSQL_DUMP --insert-ignore --delayed-insert test t1
+--exec $MYSQL_DUMP --insert-ignore --skip-comments test t1
+--exec $MYSQL_DUMP --insert-ignore --skip-comments --delayed-insert test t1
 DROP TABLE t1;