List:Internals« Previous MessageNext Message »
From:sinisa Date:March 5 2005 8:06pm
Subject:bk commit into 4.1 tree (Sinisa:1.2199) BUG#8830
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.2199 05/03/05 22:06:07 Sinisa@stripped +4 -0
  A fix for a bug #8830, which  occured  when binary data from  blob was
  dumped with --hex-blob and --skip-extended-insert options.

  mysql-test/t/mysqldump.test
    1.25 05/03/05 22:05:59 Sinisa@stripped +10 -0
    Test case for bug #8830.

  mysql-test/r/mysqldump.result
    1.38 05/03/05 22:05:59 Sinisa@stripped +46 -0
    A result for   test case for bug #8830.

  client/mysqldump.c
    1.178 05/03/05 22:05:59 Sinisa@stripped +1 -1
    A fix for a bug #8830. All that was necessary was to use unsigned  char
    instead of signed  char.

  BitKeeper/etc/ignore
    1.226 05/03/05 22:05:59 Sinisa@stripped +1 -0
    Added support-files/ndb-config-2-node.ini to the ignore list

# 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.177/client/mysqldump.c	Fri Feb 25 16:11:40 2005
+++ 1.178/client/mysqldump.c	Sat Mar  5 22:05:59 2005
@@ -1790,7 +1790,7 @@
                 char *ptr= row[i], *end= ptr+ lengths[i];
                 fputs("0x", md_result_file);
                 for (; ptr < end ; ptr++)
-                  fprintf(md_result_file, "%02X", *ptr);
+		  fprintf(md_result_file, "%02X", *((uchar *)ptr));
               }
               else
                 unescape(md_result_file, row[i], lengths[i]);

--- 1.37/mysql-test/r/mysqldump.result	Tue Feb 22 13:40:26 2005
+++ 1.38/mysql-test/r/mysqldump.result	Sat Mar  5 22:05:59 2005
@@ -549,3 +549,49 @@
 
 DROP TABLE t1;
 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 */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!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 */;
+LOCK TABLES `t1` WRITE;
+INSERT INTO `t1` VALUES (0x602010000280100005E71A);
+UNLOCK TABLES;
+/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+DROP TABLE t1;

--- 1.24/mysql-test/t/mysqldump.test	Mon Dec 27 20:10:26 2004
+++ 1.25/mysql-test/t/mysqldump.test	Sat Mar  5 22:05:59 2005
@@ -165,3 +165,13 @@
 --exec $MYSQL_DUMP --skip-comments --ignore-table=test.t1 test
 DROP TABLE t1;
 DROP TABLE t2;
+
+#
+#  Bug  #8830
+#
+
+CREATE TABLE t1 (`b` blob);
+INSERT INTO `t1` VALUES (0x602010000280100005E71A);
+--exec $MYSQL_DUMP --skip-extended-insert --hex-blob test t1
+DROP TABLE t1;
+

--- 1.225/BitKeeper/etc/ignore	Fri Feb 25 12:45:29 2005
+++ 1.226/BitKeeper/etc/ignore	Sat Mar  5 22:05:59 2005
@@ -1052,3 +1052,4 @@
 ndb/tools/ndb_show_tables.dsp
 ndb/tools/ndb_select_all.dsp
 ndb/tools/ndb_select_count.dsp
+support-files/ndb-config-2-node.ini
Thread
bk commit into 4.1 tree (Sinisa:1.2199) BUG#8830sinisa5 Mar