bk commit into 5.0 tree (lars:1.2153) BUG#17201

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann 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.2153 06/06/15 11:55:53 lars@stripped +2 -0
  BUG#17201: Removed version number from test case output

  mysql-test/t/mysqldump.test
    1.88 06/06/15 11:55:43 lars@stripped +1 -1
    Remove comments in mysqldump output

  mysql-test/r/mysqldump.result
    1.96 06/06/15 11:55:42 lars@stripped +0 -28
    Remove comments in mysqldump output

# 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:	lars
# Host:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.0-rpl

--- 1.95/mysql-test/r/mysqldump.result	2006-05-26 03:05:53 +02:00
+++ 1.96/mysql-test/r/mysqldump.result	2006-06-15 11:55:42 +02:00
@@ -2727,11 +2727,6 @@
 insert into t1 values (4711);
 insert into t1 values (3231);
 insert into t1 values (0815);
--- MySQL dump 10.10
---
--- Host: localhost    Database: test
--- ------------------------------------------------------
--- Server version	5.0.22-debug-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2744,50 +2739,27 @@
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
---
--- Current Database: `test`
---
-
 /*!40000 DROP DATABASE IF EXISTS `test`*/;
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
 
 USE `test`;
-
---
--- Table structure for table `t1`
---
-
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `id` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
---
--- Dumping data for table `t1`
---
-
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 LOCK TABLES `t1` WRITE;
 INSERT INTO `t1` VALUES (1232131),(4711),(3231),(815);
 UNLOCK TABLES;
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
-
---
--- Temporary table structure for view `v1`
---
-
 DROP TABLE IF EXISTS `v1`;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 CREATE TABLE `v1` (
   `id` int(11)
 ) */;
-
---
--- Final view structure for view `v1`
---
-
 /*!50001 DROP TABLE IF EXISTS `v1`*/;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 CREATE ALGORITHM=UNDEFINED */

--- 1.87/mysql-test/t/mysqldump.test	2006-05-26 03:05:28 +02:00
+++ 1.88/mysql-test/t/mysqldump.test	2006-06-15 11:55:43 +02:00
@@ -1157,5 +1157,5 @@
 insert into t1 values (4711);
 insert into t1 values (3231);
 insert into t1 values (0815);
---exec $MYSQL_DUMP --add-drop-database --databases test
+--exec $MYSQL_DUMP --skip-comments --add-drop-database --databases test
 drop view v1;