Commit 27da9ccc authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.1 

into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
parents 1898bd95 cb4b456b

mysql-test/r/mysqldump.result

+0 −28
Original line number Diff line number Diff line
@@ -563,11 +563,6 @@ DROP TABLE t1; 
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 @@ INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"), 
/*!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 @@ UNLOCK TABLES; 
/*!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,20 +601,11 @@ UNLOCK TABLES; 
/*!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 */;

INSERT  DELAYED IGNORE INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('0987654321098765432109876543210987654321.00000000000000000000');

mysql-test/t/mysqldump.test

+2 −2
Original line number Diff line number Diff line
@@ -192,6 +192,6 @@ DROP TABLE t1; 
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;