List:Internals« Previous MessageNext Message »
From:sinisa Date:March 8 2005 6:06pm
Subject:bk commit into 4.1 tree (Sinisa:1.2095)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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.2095 05/03/08 20:06:08 Sinisa@stripped +2 -0
  Fix to make builds possible

  mysql-test/t/mysqldump.test
    1.27 05/03/08 20:06:00 Sinisa@stripped +1 -1
    Fix for avoiding version text

  mysql-test/r/mysqldump.result
    1.40 05/03/08 20:06:00 Sinisa@stripped +0 -14
    Fix for avoiding version text

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.39/mysql-test/r/mysqldump.result	Mon Mar  7 16:23:29 2005
+++ 1.40/mysql-test/r/mysqldump.result	Tue Mar  8 20:06:00 2005
@@ -530,11 +530,6 @@
 DROP TABLE t2;
 CREATE TABLE t1 (`b` blob);
 INSERT INTO `t1` VALUES (0x602010000280100005E71A);
--- MySQL dump 10.9
---
--- Host: localhost    Database: test
--- ------------------------------------------------------
--- Server version	4.1.11-debug-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -544,19 +539,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` (
   `b` blob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `t1`
---
 
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;

--- 1.26/mysql-test/t/mysqldump.test	Mon Mar  7 16:23:29 2005
+++ 1.27/mysql-test/t/mysqldump.test	Tue Mar  8 20:06:00 2005
@@ -179,6 +179,6 @@
 
 CREATE TABLE t1 (`b` blob);
 INSERT INTO `t1` VALUES (0x602010000280100005E71A);
---exec $MYSQL_DUMP --skip-extended-insert --hex-blob test t1
+--exec $MYSQL_DUMP --skip-extended-insert --hex-blob test --skip-comments t1
 DROP TABLE t1;
 
Thread
bk commit into 4.1 tree (Sinisa:1.2095)sinisa8 Mar