mariadb/mysql-test/r/mysqldump.result

DROP TABLE IF EXISTS t1, `"t"1`;
CREATE TABLE t1(a int);
INSERT INTO t1 VALUES (1), (2);
<?xml version="1.0"?>
<mysqldump>
<database name="test">
	<table_structure name="t1">
		<field Field="a" Type="int(11)" Null="YES" Key="" Extra="" />
	</table_structure>
	<table_data name="t1">
	<row>
		<field name="a">1</field>
	</row>
	<row>
		<field name="a">2</field>
	</row>
	</table_data>
</database>
</mysqldump>
DROP TABLE t1;
CREATE TABLE t1 (a decimal(240, 20));
INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
("0987654321098765432109876543210987654321");
CREATE TABLE `t1` (
  `a` decimal(240,20) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('0987654321098765432109876543210987654321.00000000000000000000');
DROP TABLE t1;
CREATE TABLE t1 (a double);
INSERT INTO t1 VALUES (-9e999999);
CREATE TABLE `t1` (
  `a` double default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
INSERT INTO `t1` VALUES (RES);
DROP TABLE t1;
CREATE TABLE t1 (a DECIMAL(10,5), b FLOAT);
INSERT INTO t1 VALUES (1.2345, 2.3456);
INSERT INTO t1 VALUES ('1.2345', 2.3456);
INSERT INTO t1 VALUES ("1.2345", 2.3456);
SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ANSI_QUOTES';
INSERT INTO t1 VALUES (1.2345, 2.3456);
INSERT INTO t1 VALUES ('1.2345', 2.3456);
INSERT INTO t1 VALUES ("1.2345", 2.3456);
ERROR 42S22: Unknown column '1.2345' in 'field list'
SET SQL_MODE=@OLD_SQL_MODE;
CREATE TABLE `t1` (
  `a` decimal(10,5) default NULL,
  `b` float default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
CREATE TABLE `t1` (
  `a` decimal(10,5) default NULL,
  `b` float default NULL
);
INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);

/*!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 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
  `a` decimal(10,5) default NULL,
  `b` float default NULL
);


/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
LOCK TABLES `t1` WRITE;
INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
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 */;

/*!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 */;
CREATE TABLE `t1` (
  `a` decimal(10,5) default NULL,
  `b` float default NULL
);

INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);

/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

DROP TABLE t1;
CREATE TABLE t1(a int, b text, c varchar(3));
INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES");
<?xml version="1.0"?>
<mysqldump>
<database name="test">
	<table_structure name="t1">
		<field Field="a" Type="int(11)" Null="YES" Key="" Extra="" />
		<field Field="b" Type="text" Null="YES" Key="" Extra="" />
		<field Field="c" Type="char(3)" Null="YES" Key="" Extra="" />
	</table_structure>
	<table_data name="t1">
	<row>
		<field name="a">1</field>
		<field name="b">test</field>
		<field name="c">tes</field>
	</row>
	<row>
		<field name="a">2</field>
		<field name="b">TEST</field>
		<field name="c">TES</field>
	</row>
	</table_data>
</database>
</mysqldump>
DROP TABLE t1;
CREATE TABLE t1 (`a"b"` char(2));
INSERT INTO t1 VALUES ("1\""), ("\"2");
<?xml version="1.0"?>
<mysqldump>
<database name="test">
	<table_structure name="t1">
		<field Field="a&quot;b&quot;" Type="char(2)" Null="YES" Key="" Extra="" />
	</table_structure>
	<table_data name="t1">
	<row>
		<field name="a&quot;b&quot;">1&quot;</field>
	</row>
	<row>
		<field name="a&quot;b&quot;">&quot;2</field>
	</row>
	</table_data>
</database>
</mysqldump>
DROP TABLE t1;
CREATE TABLE t1 (a  VARCHAR(255)) DEFAULT CHARSET koi8r;
INSERT INTO t1  VALUES (_koi8r x'C1C2C3C4C5'), (NULL);

/*!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 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
  `a` varchar(255) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=koi8r;


/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
LOCK TABLES `t1` WRITE;
INSERT INTO `t1` VALUES ('абцде');
INSERT INTO `t1` VALUES (NULL);
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;
CREATE TABLE t1 (a int) ENGINE=MYISAM;
INSERT INTO t1 VALUES (1), (2);
/*!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,MYSQL40' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
  `a` int(11) default NULL
) TYPE=MyISAM;


/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
LOCK TABLES `t1` WRITE;
INSERT INTO `t1` VALUES (1),(2);
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 */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

/*!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,MYSQL323' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
  `a` int(11) default NULL
) TYPE=MyISAM;


/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
LOCK TABLES `t1` WRITE;
INSERT INTO `t1` VALUES (1),(2);
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 */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

DROP TABLE t1;
create table ```a` (i int);
CREATE TABLE ```a` (
  `i` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
drop table ```a`;
create table t1(a int);

/*!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 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
  `a` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;


/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
LOCK TABLES `t1` WRITE;
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 */;

/*!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,ANSI' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
DROP TABLE IF EXISTS "t1";
CREATE TABLE "t1" (
  "a" int(11) default NULL
);


/*!40000 ALTER TABLE "t1" DISABLE KEYS */;
LOCK TABLES "t1" WRITE;
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 */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

set global sql_mode='ANSI_QUOTES';

/*!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 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
  `a` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;


/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
LOCK TABLES `t1` WRITE;
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 */;

/*!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,ANSI' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
DROP TABLE IF EXISTS "t1";
CREATE TABLE "t1" (
  "a" int(11) default NULL
);


/*!40000 ALTER TABLE "t1" DISABLE KEYS */;
LOCK TABLES "t1" WRITE;
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 */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

set global sql_mode='';
drop table t1;
create table t1(a int);
insert into t1 values (1),(2),(3);

/*!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 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
  `a` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;


/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!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 */;

1
2
3
drop table t1;

/*!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 */;

CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;

USE `test`;

/*!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 */;

create database mysqldump_test_db character set latin2 collate latin2_bin;

/*!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 */;

CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CHARACTER SET latin2 COLLATE latin2_bin */;

USE `mysqldump_test_db`;

/*!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 database mysqldump_test_db;
CREATE TABLE t1 (a  CHAR(10));
INSERT INTO t1  VALUES (_latin1 '<27><><EFBFBD><EFBFBD>');

/*!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 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
  `a` char(10) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;


/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
LOCK TABLES `t1` WRITE;
INSERT INTO `t1` VALUES ('ÄÖÜß');
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 */;

/*!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,MYSQL323' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
  `a` char(10) default NULL
) TYPE=MyISAM;


/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
LOCK TABLES `t1` WRITE;
INSERT INTO `t1` VALUES ('<27><><EFBFBD><EFBFBD>');
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 */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

/*!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,MYSQL323' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
  `a` char(10) default NULL
) TYPE=MyISAM;


/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
LOCK TABLES `t1` WRITE;
INSERT INTO `t1` VALUES ('<27><><EFBFBD><EFBFBD>');
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 */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

/*!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,MYSQL323' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
  `a` char(10) default NULL
) TYPE=MyISAM;


/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
LOCK TABLES `t1` WRITE;
INSERT INTO `t1` VALUES ('ÄÖÜß');
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 */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

DROP TABLE t1;
CREATE TABLE t1 (a int);
CREATE TABLE t2 (a int);
INSERT INTO t1 VALUES (1),(2),(3);
INSERT INTO t2 VALUES (4),(5),(6);

/*!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 */;
DROP TABLE IF EXISTS `t2`;
CREATE TABLE `t2` (
  `a` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;


/*!40000 ALTER TABLE `t2` DISABLE KEYS */;
LOCK TABLES `t2` WRITE;
INSERT INTO `t2` VALUES (4),(5),(6);
UNLOCK TABLES;
/*!40000 ALTER TABLE `t2` 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;
DROP TABLE t2;
CREATE TABLE t1 (`b` blob);
INSERT INTO `t1` VALUES (0x602010000280100005E71A);

/*!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 */;
DROP TABLE IF EXISTS `t1`;
CREATE TABLE `t1` (
  `b` blob
) ENGINE=MyISAM DEFAULT CHARSET=latin1;


/*!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;
-												Fixes for mysql tests.


mysql-test/r/mysqlbinlog.result:
  fixes for mysql tests.
mysql-test/r/mysqldump.result:
  fixes for mysql tests.
mysql-test/r/negation_elimination.result:
  fixes for mysql tests.
mysql-test/t/mysqlbinlog.test:
  fixes for mysql tests.
mysql-test/t/mysqldump.test:
  fixes for mysql tests.

											
										
										
											2003-10-31 13:37:36 +01:00
+								DROP TABLE IF EXISTS t1, `"t"1`;
-												Test for mysqldump




											
										
										
											2003-09-19 11:02:49 +02:00
+								CREATE TABLE t1(a int);
 								INSERT INTO t1 VALUES (1), (2);
 								<?xml version="1.0"?>
 								<mysqldump>
 								<database name="test">
-												new mysqldump -X test (bug #1707)




											
										
										
											2003-10-31 08:29:57 +01:00
+									<table_structure name="t1">
-												WL  #1279: Add table description to xml dump
changes after montys review




											
										
										
											2003-11-03 13:49:39 +01:00
+										<field Field="a" Type="int(11)" Null="YES" Key="" Extra="" />
-												new mysqldump -X test (bug #1707)




											
										
										
											2003-10-31 08:29:57 +01:00
+									</table_structure>
 									<table_data name="t1">
-												Test for mysqldump




											
										
										
											2003-09-19 11:02:49 +02:00
+									<row>
 										<field name="a">1</field>
 									</row>
 									<row>
 										<field name="a">2</field>
 									</row>
-												new mysqldump -X test (bug #1707)




											
										
										
											2003-10-31 08:29:57 +01:00
+									</table_data>
-												Test for mysqldump




											
										
										
											2003-09-19 11:02:49 +02:00
+								</database>
 								</mysqldump>
-												#1169: Add --exec command to mysqltest




											
										
										
											2003-09-24 13:13:47 +02:00
+								DROP TABLE t1;
-												Added --comments mysqldump option (default value is 1).
Fixed mysqldump test.


client/mysqldump.c:
  Added --comments option (default value is 1).
mysql-test/r/mysqldump.result:
  fixed using --skip-comment option
mysql-test/t/mysqldump.test:
  fixed using --skip-comment option

											
										
										
											2003-12-11 14:37:45 +01:00
+								CREATE TABLE t1 (a decimal(240, 20));
 								INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
 								("0987654321098765432109876543210987654321");
-												After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'


client/client_priv.h:
  Added option 'create_options' for mysqldump
client/mysqldump.c:
  Changed '--all' to '--create-options' as the old name was meaningless
innobase/buf/buf0buf.c:
  After merge fixes
innobase/buf/buf0lru.c:
  After merge fixes
innobase/buf/buf0rea.c:
  After merge fixes
innobase/dict/dict0load.c:
  After merge fixes
innobase/fil/fil0fil.c:
  After merge fixes
innobase/ibuf/ibuf0ibuf.c:
  After merge fixes
innobase/include/fil0fil.h:
  After merge fixes
innobase/include/row0mysql.h:
  After merge fixes
innobase/include/ut0mem.h:
  After merge fixes
innobase/log/log0recv.c:
  After merge fixes
innobase/row/row0mysql.c:
  After merge fixes
innobase/row/row0sel.c:
  After merge fixes
innobase/srv/srv0start.c:
  After merge fixes
innobase/sync/sync0rw.c:
  After merge fixes
innobase/sync/sync0sync.c:
  After merge fixes
myisam/ft_boolean_search.c:
  After merge fixes
myisam/ft_nlq_search.c:
  After merge fixes
mysql-test/r/mysqldump.result:
  After merge fixes
mysql-test/t/mysqldump.test:
  Make result file smaller
  Some new tests
sql/ha_innodb.cc:
  After merge fixes
sql/set_var.cc:
  Removed compiler warning
sql/slave.cc:
  After merge fixes
sql/slave.h:
  After merge fixes
sql/sql_show.cc:
  Type -> Engine

											
										
										
											2004-04-27 14:33:40 +02:00
+								CREATE TABLE `t1` (
 								  `a` decimal(240,20) default NULL
 								) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 								INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('0987654321098765432109876543210987654321.00000000000000000000');
 								DROP TABLE t1;
 								CREATE TABLE t1 (a double);
 								INSERT INTO t1 VALUES (-9e999999);
 								CREATE TABLE `t1` (
 								  `a` double default NULL
 								) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 								INSERT INTO `t1` VALUES (RES);
 								DROP TABLE t1;
 								CREATE TABLE t1 (a DECIMAL(10,5), b FLOAT);
 								INSERT INTO t1 VALUES (1.2345, 2.3456);
 								INSERT INTO t1 VALUES ('1.2345', 2.3456);
 								INSERT INTO t1 VALUES ("1.2345", 2.3456);
 								SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ANSI_QUOTES';
 								INSERT INTO t1 VALUES (1.2345, 2.3456);
 								INSERT INTO t1 VALUES ('1.2345', 2.3456);
 								INSERT INTO t1 VALUES ("1.2345", 2.3456);
 								ERROR 42S22: Unknown column '1.2345' in 'field list'
 								SET SQL_MODE=@OLD_SQL_MODE;
 								CREATE TABLE `t1` (
 								  `a` decimal(10,5) default NULL,
 								  `b` float default NULL
 								) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 								INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
 								CREATE TABLE `t1` (
 								  `a` decimal(10,5) default NULL,
 								  `b` float default NULL
 								);
 								INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
-												Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned



client/client_priv.h:
  cleanup & added OPT_COMPACT
client/mysqldump.c:
  Added option --compact to get a compact readable dump.
  Ensure that SET CHARACTER_SET_CLIENT is not done if we have not remembered the old character set
  Print optimization comments even if --skip-comments are given as these are not true comments. (Before these where only printed at end, which was a bug)
mysql-test/r/cast.result:
  More cast tests
mysql-test/r/derived.result:
  Removed warnings
mysql-test/r/mysqldump.result:
  Update results after fixing mysqlbinlog
mysql-test/r/query_cache.result:
  Make test usable with --extern
  more tests
mysql-test/r/rpl_until.result:
  Make test repeatable under valgrind
mysql-test/r/sql_mode.result:
  Fix test result
mysql-test/r/subselect.result:
  Make test smaller. Update wrong results
mysql-test/t/cast.test:
  More cast tests
mysql-test/t/derived.test:
  Removed warnings
mysql-test/t/query_cache.test:
  Make test usable with --extern
  more tests
mysql-test/t/rpl_until.test:
  fix for valgrind.  Becasue of unknown reason one got 'Slave_SQL_Running=yes' in this setup
mysql-test/t/subselect.test:
  Make test case smaller
sql/field.cc:
  Updated need_conversion() to use new arguments
sql/ha_heap.cc:
  Moved initialization of ref_length to right place. This fixed problem that we had a ref_length of 8 for heap tables, which was not efficent.
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Fixed bug in null_handling for cast to signed/unsigned
sql/item_strfunc.cc:
  Optimized/cleaned up Item_func_conv_charset3
sql/item_sum.cc:
  Cleanup.
  Ensure that some flag variables are cleared in cleanup()
sql/item_sum.h:
  Fixed references to uninitialized memory
sql/opt_range.cc:
  Fixed spelling error
sql/sql_class.cc:
  Fixed wrong return code, which could case protocol problems
sql/sql_class.h:
  After merge fix
sql/sql_prepare.cc:
  Added comments
sql/sql_show.cc:
  Cleanup
sql/sql_string.cc:
  Optimzed usage of need_conversion().
  - Removed not used argument
  - Save diff lenght in 'offset' to not have to recalculate length several times.
  Cleaned up comment
  Optimized copy_aligned() based on the knowledge that it's only called when you have wrong data
sql/sql_string.h:
  Updated need_conversion() and copy_aligned() to use new arguments
sql/sql_update.cc:
  Fixed error handling with non-updateable tables
sql/sql_yacc.yy:
  Ensure that lex->lock_options are set correctly (to get rid of warnings from valgrind)
  Ensure that cast_type sets lex->charset and lex->length. Without these CONVERT() didn't work properly

											
										
										
											2004-02-09 12:31:03 +01:00
-												Sorry, forgot to commit together with the code change yesterday.




											
										
										
											2004-06-08 08:33:16 +02:00
+								/*!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 */;
-												Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned



client/client_priv.h:
  cleanup & added OPT_COMPACT
client/mysqldump.c:
  Added option --compact to get a compact readable dump.
  Ensure that SET CHARACTER_SET_CLIENT is not done if we have not remembered the old character set
  Print optimization comments even if --skip-comments are given as these are not true comments. (Before these where only printed at end, which was a bug)
mysql-test/r/cast.result:
  More cast tests
mysql-test/r/derived.result:
  Removed warnings
mysql-test/r/mysqldump.result:
  Update results after fixing mysqlbinlog
mysql-test/r/query_cache.result:
  Make test usable with --extern
  more tests
mysql-test/r/rpl_until.result:
  Make test repeatable under valgrind
mysql-test/r/sql_mode.result:
  Fix test result
mysql-test/r/subselect.result:
  Make test smaller. Update wrong results
mysql-test/t/cast.test:
  More cast tests
mysql-test/t/derived.test:
  Removed warnings
mysql-test/t/query_cache.test:
  Make test usable with --extern
  more tests
mysql-test/t/rpl_until.test:
  fix for valgrind.  Becasue of unknown reason one got 'Slave_SQL_Running=yes' in this setup
mysql-test/t/subselect.test:
  Make test case smaller
sql/field.cc:
  Updated need_conversion() to use new arguments
sql/ha_heap.cc:
  Moved initialization of ref_length to right place. This fixed problem that we had a ref_length of 8 for heap tables, which was not efficent.
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Fixed bug in null_handling for cast to signed/unsigned
sql/item_strfunc.cc:
  Optimized/cleaned up Item_func_conv_charset3
sql/item_sum.cc:
  Cleanup.
  Ensure that some flag variables are cleared in cleanup()
sql/item_sum.h:
  Fixed references to uninitialized memory
sql/opt_range.cc:
  Fixed spelling error
sql/sql_class.cc:
  Fixed wrong return code, which could case protocol problems
sql/sql_class.h:
  After merge fix
sql/sql_prepare.cc:
  Added comments
sql/sql_show.cc:
  Cleanup
sql/sql_string.cc:
  Optimzed usage of need_conversion().
  - Removed not used argument
  - Save diff lenght in 'offset' to not have to recalculate length several times.
  Cleaned up comment
  Optimized copy_aligned() based on the knowledge that it's only called when you have wrong data
sql/sql_string.h:
  Updated need_conversion() and copy_aligned() to use new arguments
sql/sql_update.cc:
  Fixed error handling with non-updateable tables
sql/sql_yacc.yy:
  Ensure that lex->lock_options are set correctly (to get rid of warnings from valgrind)
  Ensure that cast_type sets lex->charset and lex->length. Without these CONVERT() didn't work properly

											
										
										
											2004-02-09 12:31:03 +01:00
+								/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 								/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												mysqldump results fixed




											
										
										
											2004-01-17 11:03:14 +01:00
+								DROP TABLE IF EXISTS `t1`;
 								CREATE TABLE `t1` (
-												After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'


client/client_priv.h:
  Added option 'create_options' for mysqldump
client/mysqldump.c:
  Changed '--all' to '--create-options' as the old name was meaningless
innobase/buf/buf0buf.c:
  After merge fixes
innobase/buf/buf0lru.c:
  After merge fixes
innobase/buf/buf0rea.c:
  After merge fixes
innobase/dict/dict0load.c:
  After merge fixes
innobase/fil/fil0fil.c:
  After merge fixes
innobase/ibuf/ibuf0ibuf.c:
  After merge fixes
innobase/include/fil0fil.h:
  After merge fixes
innobase/include/row0mysql.h:
  After merge fixes
innobase/include/ut0mem.h:
  After merge fixes
innobase/log/log0recv.c:
  After merge fixes
innobase/row/row0mysql.c:
  After merge fixes
innobase/row/row0sel.c:
  After merge fixes
innobase/srv/srv0start.c:
  After merge fixes
innobase/sync/sync0rw.c:
  After merge fixes
innobase/sync/sync0sync.c:
  After merge fixes
myisam/ft_boolean_search.c:
  After merge fixes
myisam/ft_nlq_search.c:
  After merge fixes
mysql-test/r/mysqldump.result:
  After merge fixes
mysql-test/t/mysqldump.test:
  Make result file smaller
  Some new tests
sql/ha_innodb.cc:
  After merge fixes
sql/set_var.cc:
  Removed compiler warning
sql/slave.cc:
  After merge fixes
sql/slave.h:
  After merge fixes
sql/sql_show.cc:
  Type -> Engine

											
										
										
											2004-04-27 14:33:40 +02:00
+								  `a` decimal(10,5) default NULL,
 								  `b` float default NULL
 								);
-												Added --comments mysqldump option (default value is 1).
Fixed mysqldump test.


client/mysqldump.c:
  Added --comments option (default value is 1).
mysql-test/r/mysqldump.result:
  fixed using --skip-comment option
mysql-test/t/mysqldump.test:
  fixed using --skip-comment option

											
										
										
											2003-12-11 14:37:45 +01:00
-												Fixes after merge with 4.0
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)


client/mysqldump.c:
  Fixed bugs found after merge
include/mysql_embed.h:
  Disable query cache when using embedded version
myisam/mi_check.c:
  Removed not used variable
mysql-test/r/auto_increment.result:
  Fixed bugs found after merge
mysql-test/r/bdb.result:
  Fixed bugs found after merge
mysql-test/r/func_group.result:
  Fixed bugs found after merge
mysql-test/r/func_str.result:
  Fixed bugs found after merge
mysql-test/r/func_time.result:
  Fixed bugs found after merge
mysql-test/r/group_by.result:
  Fixed bugs found after merge
mysql-test/r/innodb.result:
  Fixed bugs found after merge
mysql-test/r/insert.result:
  Fixed bugs found after merge
mysql-test/r/join_outer.result:
  Fixed bugs found after merge
mysql-test/r/loaddata.result:
  Fixed bugs found after merge
mysql-test/r/multi_update.result:
  Fixed bugs found after merge
mysql-test/r/mysqldump.result:
  Update results
mysql-test/r/rpl_EE_error.result:
  Fixed bugs found after merge
mysql-test/r/rpl_multi_update.result:
  Fixed bugs found after merge
mysql-test/r/symlink.result:
  Update results
mysql-test/r/type_blob.result:
  Update results
mysql-test/r/type_datetime.result:
  Update results
mysql-test/r/type_decimal.result:
  Update results
mysql-test/r/type_enum.result:
  Fixed bugs found after merge
mysql-test/r/type_timestamp.result:
  Update results
mysql-test/r/union.result:
  Update results
mysql-test/r/warnings.result:
  Update results
mysql-test/t/bdb.test:
  Fix test for 4.1
mysql-test/t/innodb.test:
  Fix test for 4.1
mysql-test/t/multi_update.test:
  Fix test for 4.1
mysql-test/t/mysqldump.test:
  Fix test for 4.1
mysql-test/t/rpl_EE_error.test:
  Fix test for 4.1
mysql-test/t/rpl_multi_update.test:
  Fix test for 4.1
mysql-test/t/union.test:
  Cleanup
mysys/charset.c:
  Check results from my_once_alloc()
mysys/my_handler.c:
  part of 4.0 merge
sql-common/client.c:
  Part of 4.0 merge
sql/field.cc:
  After merge fixes
sql/field.h:
  After merge fixes
sql/ha_innodb.cc:
  Remove duplicate include files
sql/item.cc:
  Changed automatic int conversion to be of type binary
sql/item.h:
  After merge fixes
sql/item_func.cc:
  Changed automatic int conversion to be of type binary
sql/item_func.h:
  After merge fixes
sql/item_strfunc.cc:
  Added comments
sql/item_subselect.cc:
  Indentation fixes
sql/item_sum.cc:
  Changed automatic int conversion to be of type binary
sql/item_sum.h:
  After merge fixes
sql/mysql_priv.h:
  Cleanup embedded library access checks
sql/mysqld.cc:
  Changed min stack size to 128K (to allow longer MyISAM keys)
sql/set_var.cc:
  Fixed compiler warnings
sql/share/czech/errmsg.txt:
  Better error message
sql/share/danish/errmsg.txt:
  Better error message
sql/share/dutch/errmsg.txt:
  Better error message
sql/share/english/errmsg.txt:
  Better error message
sql/share/estonian/errmsg.txt:
  Better error message
sql/share/french/errmsg.txt:
  Better error message
sql/share/greek/errmsg.txt:
  Better error message
sql/share/hungarian/errmsg.txt:
  Better error message
sql/share/italian/errmsg.txt:
  Better error message
sql/share/japanese/errmsg.txt:
  Better error message
sql/share/korean/errmsg.txt:
  Better error message
sql/share/norwegian-ny/errmsg.txt:
  Better error message
sql/share/norwegian/errmsg.txt:
  Better error message
sql/share/polish/errmsg.txt:
  Better error message
sql/share/romanian/errmsg.txt:
  Better error message
sql/share/russian/errmsg.txt:
  Better error message
sql/share/serbian/errmsg.txt:
  Better error message
sql/share/slovak/errmsg.txt:
  Better error message
sql/share/spanish/errmsg.txt:
  Better error message
sql/share/swedish/errmsg.txt:
  Better error message
sql/share/ukrainian/errmsg.txt:
  Better error message
sql/sql_acl.h:
  Cleaned up embedded library acccess checks
sql/sql_base.cc:
  After merge fixes
sql/sql_client.cc:
  After merge fixes
sql/sql_parse.cc:
  After merge fixes
  Changed access check code for embedded library (needed to make code shorter and ensure that check_table_access() is called)
  Recoded create-table handling for CREATE TABLE ... SELECT to make code shorter and faster
sql/sql_prepare.cc:
  Add missing arguments
sql/sql_select.cc:
  After merge fixes
sql/sql_update.cc:
  After merge fixes
sql/sql_yacc.yy:
  Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
sql/table.cc:
  After merge fixes

											
										
										
											2003-12-19 15:25:50 +01:00
-												mysqldump results fixed




											
										
										
											2004-01-17 11:03:14 +01:00
+								/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 								LOCK TABLES `t1` WRITE;
-												After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'


client/client_priv.h:
  Added option 'create_options' for mysqldump
client/mysqldump.c:
  Changed '--all' to '--create-options' as the old name was meaningless
innobase/buf/buf0buf.c:
  After merge fixes
innobase/buf/buf0lru.c:
  After merge fixes
innobase/buf/buf0rea.c:
  After merge fixes
innobase/dict/dict0load.c:
  After merge fixes
innobase/fil/fil0fil.c:
  After merge fixes
innobase/ibuf/ibuf0ibuf.c:
  After merge fixes
innobase/include/fil0fil.h:
  After merge fixes
innobase/include/row0mysql.h:
  After merge fixes
innobase/include/ut0mem.h:
  After merge fixes
innobase/log/log0recv.c:
  After merge fixes
innobase/row/row0mysql.c:
  After merge fixes
innobase/row/row0sel.c:
  After merge fixes
innobase/srv/srv0start.c:
  After merge fixes
innobase/sync/sync0rw.c:
  After merge fixes
innobase/sync/sync0sync.c:
  After merge fixes
myisam/ft_boolean_search.c:
  After merge fixes
myisam/ft_nlq_search.c:
  After merge fixes
mysql-test/r/mysqldump.result:
  After merge fixes
mysql-test/t/mysqldump.test:
  Make result file smaller
  Some new tests
sql/ha_innodb.cc:
  After merge fixes
sql/set_var.cc:
  Removed compiler warning
sql/slave.cc:
  After merge fixes
sql/slave.h:
  After merge fixes
sql/sql_show.cc:
  Type -> Engine

											
										
										
											2004-04-27 14:33:40 +02:00
+								INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
-												Fixes after merge with 4.0
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)


client/mysqldump.c:
  Fixed bugs found after merge
include/mysql_embed.h:
  Disable query cache when using embedded version
myisam/mi_check.c:
  Removed not used variable
mysql-test/r/auto_increment.result:
  Fixed bugs found after merge
mysql-test/r/bdb.result:
  Fixed bugs found after merge
mysql-test/r/func_group.result:
  Fixed bugs found after merge
mysql-test/r/func_str.result:
  Fixed bugs found after merge
mysql-test/r/func_time.result:
  Fixed bugs found after merge
mysql-test/r/group_by.result:
  Fixed bugs found after merge
mysql-test/r/innodb.result:
  Fixed bugs found after merge
mysql-test/r/insert.result:
  Fixed bugs found after merge
mysql-test/r/join_outer.result:
  Fixed bugs found after merge
mysql-test/r/loaddata.result:
  Fixed bugs found after merge
mysql-test/r/multi_update.result:
  Fixed bugs found after merge
mysql-test/r/mysqldump.result:
  Update results
mysql-test/r/rpl_EE_error.result:
  Fixed bugs found after merge
mysql-test/r/rpl_multi_update.result:
  Fixed bugs found after merge
mysql-test/r/symlink.result:
  Update results
mysql-test/r/type_blob.result:
  Update results
mysql-test/r/type_datetime.result:
  Update results
mysql-test/r/type_decimal.result:
  Update results
mysql-test/r/type_enum.result:
  Fixed bugs found after merge
mysql-test/r/type_timestamp.result:
  Update results
mysql-test/r/union.result:
  Update results
mysql-test/r/warnings.result:
  Update results
mysql-test/t/bdb.test:
  Fix test for 4.1
mysql-test/t/innodb.test:
  Fix test for 4.1
mysql-test/t/multi_update.test:
  Fix test for 4.1
mysql-test/t/mysqldump.test:
  Fix test for 4.1
mysql-test/t/rpl_EE_error.test:
  Fix test for 4.1
mysql-test/t/rpl_multi_update.test:
  Fix test for 4.1
mysql-test/t/union.test:
  Cleanup
mysys/charset.c:
  Check results from my_once_alloc()
mysys/my_handler.c:
  part of 4.0 merge
sql-common/client.c:
  Part of 4.0 merge
sql/field.cc:
  After merge fixes
sql/field.h:
  After merge fixes
sql/ha_innodb.cc:
  Remove duplicate include files
sql/item.cc:
  Changed automatic int conversion to be of type binary
sql/item.h:
  After merge fixes
sql/item_func.cc:
  Changed automatic int conversion to be of type binary
sql/item_func.h:
  After merge fixes
sql/item_strfunc.cc:
  Added comments
sql/item_subselect.cc:
  Indentation fixes
sql/item_sum.cc:
  Changed automatic int conversion to be of type binary
sql/item_sum.h:
  After merge fixes
sql/mysql_priv.h:
  Cleanup embedded library access checks
sql/mysqld.cc:
  Changed min stack size to 128K (to allow longer MyISAM keys)
sql/set_var.cc:
  Fixed compiler warnings
sql/share/czech/errmsg.txt:
  Better error message
sql/share/danish/errmsg.txt:
  Better error message
sql/share/dutch/errmsg.txt:
  Better error message
sql/share/english/errmsg.txt:
  Better error message
sql/share/estonian/errmsg.txt:
  Better error message
sql/share/french/errmsg.txt:
  Better error message
sql/share/greek/errmsg.txt:
  Better error message
sql/share/hungarian/errmsg.txt:
  Better error message
sql/share/italian/errmsg.txt:
  Better error message
sql/share/japanese/errmsg.txt:
  Better error message
sql/share/korean/errmsg.txt:
  Better error message
sql/share/norwegian-ny/errmsg.txt:
  Better error message
sql/share/norwegian/errmsg.txt:
  Better error message
sql/share/polish/errmsg.txt:
  Better error message
sql/share/romanian/errmsg.txt:
  Better error message
sql/share/russian/errmsg.txt:
  Better error message
sql/share/serbian/errmsg.txt:
  Better error message
sql/share/slovak/errmsg.txt:
  Better error message
sql/share/spanish/errmsg.txt:
  Better error message
sql/share/swedish/errmsg.txt:
  Better error message
sql/share/ukrainian/errmsg.txt:
  Better error message
sql/sql_acl.h:
  Cleaned up embedded library acccess checks
sql/sql_base.cc:
  After merge fixes
sql/sql_client.cc:
  After merge fixes
sql/sql_parse.cc:
  After merge fixes
  Changed access check code for embedded library (needed to make code shorter and ensure that check_table_access() is called)
  Recoded create-table handling for CREATE TABLE ... SELECT to make code shorter and faster
sql/sql_prepare.cc:
  Add missing arguments
sql/sql_select.cc:
  After merge fixes
sql/sql_update.cc:
  After merge fixes
sql/sql_yacc.yy:
  Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
sql/table.cc:
  After merge fixes

											
										
										
											2003-12-19 15:25:50 +01:00
+								UNLOCK TABLES;
-												mysqldump results fixed




											
										
										
											2004-01-17 11:03:14 +01:00
+								/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
-												Fixes after merge with 4.0
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)


client/mysqldump.c:
  Fixed bugs found after merge
include/mysql_embed.h:
  Disable query cache when using embedded version
myisam/mi_check.c:
  Removed not used variable
mysql-test/r/auto_increment.result:
  Fixed bugs found after merge
mysql-test/r/bdb.result:
  Fixed bugs found after merge
mysql-test/r/func_group.result:
  Fixed bugs found after merge
mysql-test/r/func_str.result:
  Fixed bugs found after merge
mysql-test/r/func_time.result:
  Fixed bugs found after merge
mysql-test/r/group_by.result:
  Fixed bugs found after merge
mysql-test/r/innodb.result:
  Fixed bugs found after merge
mysql-test/r/insert.result:
  Fixed bugs found after merge
mysql-test/r/join_outer.result:
  Fixed bugs found after merge
mysql-test/r/loaddata.result:
  Fixed bugs found after merge
mysql-test/r/multi_update.result:
  Fixed bugs found after merge
mysql-test/r/mysqldump.result:
  Update results
mysql-test/r/rpl_EE_error.result:
  Fixed bugs found after merge
mysql-test/r/rpl_multi_update.result:
  Fixed bugs found after merge
mysql-test/r/symlink.result:
  Update results
mysql-test/r/type_blob.result:
  Update results
mysql-test/r/type_datetime.result:
  Update results
mysql-test/r/type_decimal.result:
  Update results
mysql-test/r/type_enum.result:
  Fixed bugs found after merge
mysql-test/r/type_timestamp.result:
  Update results
mysql-test/r/union.result:
  Update results
mysql-test/r/warnings.result:
  Update results
mysql-test/t/bdb.test:
  Fix test for 4.1
mysql-test/t/innodb.test:
  Fix test for 4.1
mysql-test/t/multi_update.test:
  Fix test for 4.1
mysql-test/t/mysqldump.test:
  Fix test for 4.1
mysql-test/t/rpl_EE_error.test:
  Fix test for 4.1
mysql-test/t/rpl_multi_update.test:
  Fix test for 4.1
mysql-test/t/union.test:
  Cleanup
mysys/charset.c:
  Check results from my_once_alloc()
mysys/my_handler.c:
  part of 4.0 merge
sql-common/client.c:
  Part of 4.0 merge
sql/field.cc:
  After merge fixes
sql/field.h:
  After merge fixes
sql/ha_innodb.cc:
  Remove duplicate include files
sql/item.cc:
  Changed automatic int conversion to be of type binary
sql/item.h:
  After merge fixes
sql/item_func.cc:
  Changed automatic int conversion to be of type binary
sql/item_func.h:
  After merge fixes
sql/item_strfunc.cc:
  Added comments
sql/item_subselect.cc:
  Indentation fixes
sql/item_sum.cc:
  Changed automatic int conversion to be of type binary
sql/item_sum.h:
  After merge fixes
sql/mysql_priv.h:
  Cleanup embedded library access checks
sql/mysqld.cc:
  Changed min stack size to 128K (to allow longer MyISAM keys)
sql/set_var.cc:
  Fixed compiler warnings
sql/share/czech/errmsg.txt:
  Better error message
sql/share/danish/errmsg.txt:
  Better error message
sql/share/dutch/errmsg.txt:
  Better error message
sql/share/english/errmsg.txt:
  Better error message
sql/share/estonian/errmsg.txt:
  Better error message
sql/share/french/errmsg.txt:
  Better error message
sql/share/greek/errmsg.txt:
  Better error message
sql/share/hungarian/errmsg.txt:
  Better error message
sql/share/italian/errmsg.txt:
  Better error message
sql/share/japanese/errmsg.txt:
  Better error message
sql/share/korean/errmsg.txt:
  Better error message
sql/share/norwegian-ny/errmsg.txt:
  Better error message
sql/share/norwegian/errmsg.txt:
  Better error message
sql/share/polish/errmsg.txt:
  Better error message
sql/share/romanian/errmsg.txt:
  Better error message
sql/share/russian/errmsg.txt:
  Better error message
sql/share/serbian/errmsg.txt:
  Better error message
sql/share/slovak/errmsg.txt:
  Better error message
sql/share/spanish/errmsg.txt:
  Better error message
sql/share/swedish/errmsg.txt:
  Better error message
sql/share/ukrainian/errmsg.txt:
  Better error message
sql/sql_acl.h:
  Cleaned up embedded library acccess checks
sql/sql_base.cc:
  After merge fixes
sql/sql_client.cc:
  After merge fixes
sql/sql_parse.cc:
  After merge fixes
  Changed access check code for embedded library (needed to make code shorter and ensure that check_table_access() is called)
  Recoded create-table handling for CREATE TABLE ... SELECT to make code shorter and faster
sql/sql_prepare.cc:
  Add missing arguments
sql/sql_select.cc:
  After merge fixes
sql/sql_update.cc:
  After merge fixes
sql/sql_yacc.yy:
  Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
sql/table.cc:
  After merge fixes

											
										
										
											2003-12-19 15:25:50 +01:00
 								/*!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 */;
-												Sorry, forgot to commit together with the code change yesterday.




											
										
										
											2004-06-08 08:33:16 +02:00
+								/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 								/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned



client/client_priv.h:
  cleanup & added OPT_COMPACT
client/mysqldump.c:
  Added option --compact to get a compact readable dump.
  Ensure that SET CHARACTER_SET_CLIENT is not done if we have not remembered the old character set
  Print optimization comments even if --skip-comments are given as these are not true comments. (Before these where only printed at end, which was a bug)
mysql-test/r/cast.result:
  More cast tests
mysql-test/r/derived.result:
  Removed warnings
mysql-test/r/mysqldump.result:
  Update results after fixing mysqlbinlog
mysql-test/r/query_cache.result:
  Make test usable with --extern
  more tests
mysql-test/r/rpl_until.result:
  Make test repeatable under valgrind
mysql-test/r/sql_mode.result:
  Fix test result
mysql-test/r/subselect.result:
  Make test smaller. Update wrong results
mysql-test/t/cast.test:
  More cast tests
mysql-test/t/derived.test:
  Removed warnings
mysql-test/t/query_cache.test:
  Make test usable with --extern
  more tests
mysql-test/t/rpl_until.test:
  fix for valgrind.  Becasue of unknown reason one got 'Slave_SQL_Running=yes' in this setup
mysql-test/t/subselect.test:
  Make test case smaller
sql/field.cc:
  Updated need_conversion() to use new arguments
sql/ha_heap.cc:
  Moved initialization of ref_length to right place. This fixed problem that we had a ref_length of 8 for heap tables, which was not efficent.
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Fixed bug in null_handling for cast to signed/unsigned
sql/item_strfunc.cc:
  Optimized/cleaned up Item_func_conv_charset3
sql/item_sum.cc:
  Cleanup.
  Ensure that some flag variables are cleared in cleanup()
sql/item_sum.h:
  Fixed references to uninitialized memory
sql/opt_range.cc:
  Fixed spelling error
sql/sql_class.cc:
  Fixed wrong return code, which could case protocol problems
sql/sql_class.h:
  After merge fix
sql/sql_prepare.cc:
  Added comments
sql/sql_show.cc:
  Cleanup
sql/sql_string.cc:
  Optimzed usage of need_conversion().
  - Removed not used argument
  - Save diff lenght in 'offset' to not have to recalculate length several times.
  Cleaned up comment
  Optimized copy_aligned() based on the knowledge that it's only called when you have wrong data
sql/sql_string.h:
  Updated need_conversion() and copy_aligned() to use new arguments
sql/sql_update.cc:
  Fixed error handling with non-updateable tables
sql/sql_yacc.yy:
  Ensure that lex->lock_options are set correctly (to get rid of warnings from valgrind)
  Ensure that cast_type sets lex->charset and lex->length. Without these CONVERT() didn't work properly

											
										
										
											2004-02-09 12:31:03 +01:00
+								/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 								/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												mysqldump results fixed




											
										
										
											2004-01-17 11:03:14 +01:00
+								CREATE TABLE `t1` (
-												After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'


client/client_priv.h:
  Added option 'create_options' for mysqldump
client/mysqldump.c:
  Changed '--all' to '--create-options' as the old name was meaningless
innobase/buf/buf0buf.c:
  After merge fixes
innobase/buf/buf0lru.c:
  After merge fixes
innobase/buf/buf0rea.c:
  After merge fixes
innobase/dict/dict0load.c:
  After merge fixes
innobase/fil/fil0fil.c:
  After merge fixes
innobase/ibuf/ibuf0ibuf.c:
  After merge fixes
innobase/include/fil0fil.h:
  After merge fixes
innobase/include/row0mysql.h:
  After merge fixes
innobase/include/ut0mem.h:
  After merge fixes
innobase/log/log0recv.c:
  After merge fixes
innobase/row/row0mysql.c:
  After merge fixes
innobase/row/row0sel.c:
  After merge fixes
innobase/srv/srv0start.c:
  After merge fixes
innobase/sync/sync0rw.c:
  After merge fixes
innobase/sync/sync0sync.c:
  After merge fixes
myisam/ft_boolean_search.c:
  After merge fixes
myisam/ft_nlq_search.c:
  After merge fixes
mysql-test/r/mysqldump.result:
  After merge fixes
mysql-test/t/mysqldump.test:
  Make result file smaller
  Some new tests
sql/ha_innodb.cc:
  After merge fixes
sql/set_var.cc:
  Removed compiler warning
sql/slave.cc:
  After merge fixes
sql/slave.h:
  After merge fixes
sql/sql_show.cc:
  Type -> Engine

											
										
										
											2004-04-27 14:33:40 +02:00
+								  `a` decimal(10,5) default NULL,
 								  `b` float default NULL
 								);
-												Fixes after merge with 4.0
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)


client/mysqldump.c:
  Fixed bugs found after merge
include/mysql_embed.h:
  Disable query cache when using embedded version
myisam/mi_check.c:
  Removed not used variable
mysql-test/r/auto_increment.result:
  Fixed bugs found after merge
mysql-test/r/bdb.result:
  Fixed bugs found after merge
mysql-test/r/func_group.result:
  Fixed bugs found after merge
mysql-test/r/func_str.result:
  Fixed bugs found after merge
mysql-test/r/func_time.result:
  Fixed bugs found after merge
mysql-test/r/group_by.result:
  Fixed bugs found after merge
mysql-test/r/innodb.result:
  Fixed bugs found after merge
mysql-test/r/insert.result:
  Fixed bugs found after merge
mysql-test/r/join_outer.result:
  Fixed bugs found after merge
mysql-test/r/loaddata.result:
  Fixed bugs found after merge
mysql-test/r/multi_update.result:
  Fixed bugs found after merge
mysql-test/r/mysqldump.result:
  Update results
mysql-test/r/rpl_EE_error.result:
  Fixed bugs found after merge
mysql-test/r/rpl_multi_update.result:
  Fixed bugs found after merge
mysql-test/r/symlink.result:
  Update results
mysql-test/r/type_blob.result:
  Update results
mysql-test/r/type_datetime.result:
  Update results
mysql-test/r/type_decimal.result:
  Update results
mysql-test/r/type_enum.result:
  Fixed bugs found after merge
mysql-test/r/type_timestamp.result:
  Update results
mysql-test/r/union.result:
  Update results
mysql-test/r/warnings.result:
  Update results
mysql-test/t/bdb.test:
  Fix test for 4.1
mysql-test/t/innodb.test:
  Fix test for 4.1
mysql-test/t/multi_update.test:
  Fix test for 4.1
mysql-test/t/mysqldump.test:
  Fix test for 4.1
mysql-test/t/rpl_EE_error.test:
  Fix test for 4.1
mysql-test/t/rpl_multi_update.test:
  Fix test for 4.1
mysql-test/t/union.test:
  Cleanup
mysys/charset.c:
  Check results from my_once_alloc()
mysys/my_handler.c:
  part of 4.0 merge
sql-common/client.c:
  Part of 4.0 merge
sql/field.cc:
  After merge fixes
sql/field.h:
  After merge fixes
sql/ha_innodb.cc:
  Remove duplicate include files
sql/item.cc:
  Changed automatic int conversion to be of type binary
sql/item.h:
  After merge fixes
sql/item_func.cc:
  Changed automatic int conversion to be of type binary
sql/item_func.h:
  After merge fixes
sql/item_strfunc.cc:
  Added comments
sql/item_subselect.cc:
  Indentation fixes
sql/item_sum.cc:
  Changed automatic int conversion to be of type binary
sql/item_sum.h:
  After merge fixes
sql/mysql_priv.h:
  Cleanup embedded library access checks
sql/mysqld.cc:
  Changed min stack size to 128K (to allow longer MyISAM keys)
sql/set_var.cc:
  Fixed compiler warnings
sql/share/czech/errmsg.txt:
  Better error message
sql/share/danish/errmsg.txt:
  Better error message
sql/share/dutch/errmsg.txt:
  Better error message
sql/share/english/errmsg.txt:
  Better error message
sql/share/estonian/errmsg.txt:
  Better error message
sql/share/french/errmsg.txt:
  Better error message
sql/share/greek/errmsg.txt:
  Better error message
sql/share/hungarian/errmsg.txt:
  Better error message
sql/share/italian/errmsg.txt:
  Better error message
sql/share/japanese/errmsg.txt:
  Better error message
sql/share/korean/errmsg.txt:
  Better error message
sql/share/norwegian-ny/errmsg.txt:
  Better error message
sql/share/norwegian/errmsg.txt:
  Better error message
sql/share/polish/errmsg.txt:
  Better error message
sql/share/romanian/errmsg.txt:
  Better error message
sql/share/russian/errmsg.txt:
  Better error message
sql/share/serbian/errmsg.txt:
  Better error message
sql/share/slovak/errmsg.txt:
  Better error message
sql/share/spanish/errmsg.txt:
  Better error message
sql/share/swedish/errmsg.txt:
  Better error message
sql/share/ukrainian/errmsg.txt:
  Better error message
sql/sql_acl.h:
  Cleaned up embedded library acccess checks
sql/sql_base.cc:
  After merge fixes
sql/sql_client.cc:
  After merge fixes
sql/sql_parse.cc:
  After merge fixes
  Changed access check code for embedded library (needed to make code shorter and ensure that check_table_access() is called)
  Recoded create-table handling for CREATE TABLE ... SELECT to make code shorter and faster
sql/sql_prepare.cc:
  Add missing arguments
sql/sql_select.cc:
  After merge fixes
sql/sql_update.cc:
  After merge fixes
sql/sql_yacc.yy:
  Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
sql/table.cc:
  After merge fixes

											
										
										
											2003-12-19 15:25:50 +01:00
-												After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'


client/client_priv.h:
  Added option 'create_options' for mysqldump
client/mysqldump.c:
  Changed '--all' to '--create-options' as the old name was meaningless
innobase/buf/buf0buf.c:
  After merge fixes
innobase/buf/buf0lru.c:
  After merge fixes
innobase/buf/buf0rea.c:
  After merge fixes
innobase/dict/dict0load.c:
  After merge fixes
innobase/fil/fil0fil.c:
  After merge fixes
innobase/ibuf/ibuf0ibuf.c:
  After merge fixes
innobase/include/fil0fil.h:
  After merge fixes
innobase/include/row0mysql.h:
  After merge fixes
innobase/include/ut0mem.h:
  After merge fixes
innobase/log/log0recv.c:
  After merge fixes
innobase/row/row0mysql.c:
  After merge fixes
innobase/row/row0sel.c:
  After merge fixes
innobase/srv/srv0start.c:
  After merge fixes
innobase/sync/sync0rw.c:
  After merge fixes
innobase/sync/sync0sync.c:
  After merge fixes
myisam/ft_boolean_search.c:
  After merge fixes
myisam/ft_nlq_search.c:
  After merge fixes
mysql-test/r/mysqldump.result:
  After merge fixes
mysql-test/t/mysqldump.test:
  Make result file smaller
  Some new tests
sql/ha_innodb.cc:
  After merge fixes
sql/set_var.cc:
  Removed compiler warning
sql/slave.cc:
  After merge fixes
sql/slave.h:
  After merge fixes
sql/sql_show.cc:
  Type -> Engine

											
										
										
											2004-04-27 14:33:40 +02:00
+								INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);
-												Fixes after merge with 4.0
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)


client/mysqldump.c:
  Fixed bugs found after merge
include/mysql_embed.h:
  Disable query cache when using embedded version
myisam/mi_check.c:
  Removed not used variable
mysql-test/r/auto_increment.result:
  Fixed bugs found after merge
mysql-test/r/bdb.result:
  Fixed bugs found after merge
mysql-test/r/func_group.result:
  Fixed bugs found after merge
mysql-test/r/func_str.result:
  Fixed bugs found after merge
mysql-test/r/func_time.result:
  Fixed bugs found after merge
mysql-test/r/group_by.result:
  Fixed bugs found after merge
mysql-test/r/innodb.result:
  Fixed bugs found after merge
mysql-test/r/insert.result:
  Fixed bugs found after merge
mysql-test/r/join_outer.result:
  Fixed bugs found after merge
mysql-test/r/loaddata.result:
  Fixed bugs found after merge
mysql-test/r/multi_update.result:
  Fixed bugs found after merge
mysql-test/r/mysqldump.result:
  Update results
mysql-test/r/rpl_EE_error.result:
  Fixed bugs found after merge
mysql-test/r/rpl_multi_update.result:
  Fixed bugs found after merge
mysql-test/r/symlink.result:
  Update results
mysql-test/r/type_blob.result:
  Update results
mysql-test/r/type_datetime.result:
  Update results
mysql-test/r/type_decimal.result:
  Update results
mysql-test/r/type_enum.result:
  Fixed bugs found after merge
mysql-test/r/type_timestamp.result:
  Update results
mysql-test/r/union.result:
  Update results
mysql-test/r/warnings.result:
  Update results
mysql-test/t/bdb.test:
  Fix test for 4.1
mysql-test/t/innodb.test:
  Fix test for 4.1
mysql-test/t/multi_update.test:
  Fix test for 4.1
mysql-test/t/mysqldump.test:
  Fix test for 4.1
mysql-test/t/rpl_EE_error.test:
  Fix test for 4.1
mysql-test/t/rpl_multi_update.test:
  Fix test for 4.1
mysql-test/t/union.test:
  Cleanup
mysys/charset.c:
  Check results from my_once_alloc()
mysys/my_handler.c:
  part of 4.0 merge
sql-common/client.c:
  Part of 4.0 merge
sql/field.cc:
  After merge fixes
sql/field.h:
  After merge fixes
sql/ha_innodb.cc:
  Remove duplicate include files
sql/item.cc:
  Changed automatic int conversion to be of type binary
sql/item.h:
  After merge fixes
sql/item_func.cc:
  Changed automatic int conversion to be of type binary
sql/item_func.h:
  After merge fixes
sql/item_strfunc.cc:
  Added comments
sql/item_subselect.cc:
  Indentation fixes
sql/item_sum.cc:
  Changed automatic int conversion to be of type binary
sql/item_sum.h:
  After merge fixes
sql/mysql_priv.h:
  Cleanup embedded library access checks
sql/mysqld.cc:
  Changed min stack size to 128K (to allow longer MyISAM keys)
sql/set_var.cc:
  Fixed compiler warnings
sql/share/czech/errmsg.txt:
  Better error message
sql/share/danish/errmsg.txt:
  Better error message
sql/share/dutch/errmsg.txt:
  Better error message
sql/share/english/errmsg.txt:
  Better error message
sql/share/estonian/errmsg.txt:
  Better error message
sql/share/french/errmsg.txt:
  Better error message
sql/share/greek/errmsg.txt:
  Better error message
sql/share/hungarian/errmsg.txt:
  Better error message
sql/share/italian/errmsg.txt:
  Better error message
sql/share/japanese/errmsg.txt:
  Better error message
sql/share/korean/errmsg.txt:
  Better error message
sql/share/norwegian-ny/errmsg.txt:
  Better error message
sql/share/norwegian/errmsg.txt:
  Better error message
sql/share/polish/errmsg.txt:
  Better error message
sql/share/romanian/errmsg.txt:
  Better error message
sql/share/russian/errmsg.txt:
  Better error message
sql/share/serbian/errmsg.txt:
  Better error message
sql/share/slovak/errmsg.txt:
  Better error message
sql/share/spanish/errmsg.txt:
  Better error message
sql/share/swedish/errmsg.txt:
  Better error message
sql/share/ukrainian/errmsg.txt:
  Better error message
sql/sql_acl.h:
  Cleaned up embedded library acccess checks
sql/sql_base.cc:
  After merge fixes
sql/sql_client.cc:
  After merge fixes
sql/sql_parse.cc:
  After merge fixes
  Changed access check code for embedded library (needed to make code shorter and ensure that check_table_access() is called)
  Recoded create-table handling for CREATE TABLE ... SELECT to make code shorter and faster
sql/sql_prepare.cc:
  Add missing arguments
sql/sql_select.cc:
  After merge fixes
sql/sql_update.cc:
  After merge fixes
sql/sql_yacc.yy:
  Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
sql/table.cc:
  After merge fixes

											
										
										
											2003-12-19 15:25:50 +01:00
 								/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 								/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 								/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												Test for mysqldump




											
										
										
											2003-09-19 11:02:49 +02:00
+								DROP TABLE t1;
-												WL  #1279: Add table description to xml dump
changes after montys review




											
										
										
											2003-11-03 13:49:39 +01:00
+								CREATE TABLE t1(a int, b text, c varchar(3));
 								INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES");
 								<?xml version="1.0"?>
 								<mysqldump>
 								<database name="test">
 									<table_structure name="t1">
 										<field Field="a" Type="int(11)" Null="YES" Key="" Extra="" />
 										<field Field="b" Type="text" Null="YES" Key="" Extra="" />
 										<field Field="c" Type="char(3)" Null="YES" Key="" Extra="" />
 									</table_structure>
 									<table_data name="t1">
 									<row>
 										<field name="a">1</field>
 										<field name="b">test</field>
 										<field name="c">tes</field>
 									</row>
 									<row>
 										<field name="a">2</field>
 										<field name="b">TEST</field>
 										<field name="c">TES</field>
 									</row>
 									</table_data>
 								</database>
 								</mysqldump>
 								DROP TABLE t1;
-												Portability fix (for example NetWare doesn't support table name like t"1").




											
										
										
											2003-11-05 09:06:03 +01:00
+								CREATE TABLE t1 (`a"b"` char(2));
 								INSERT INTO t1 VALUES ("1\""), ("\"2");
-												new mysqldump -X test (bug #1707)




											
										
										
											2003-10-31 08:29:57 +01:00
+								<?xml version="1.0"?>
 								<mysqldump>
 								<database name="test">
-												Portability fix (for example NetWare doesn't support table name like t"1").




											
										
										
											2003-11-05 09:06:03 +01:00
+									<table_structure name="t1">
-												WL  #1279: Add table description to xml dump
changes after montys review




											
										
										
											2003-11-03 13:49:39 +01:00
+										<field Field="a&quot;b&quot;" Type="char(2)" Null="YES" Key="" Extra="" />
-												new mysqldump -X test (bug #1707)




											
										
										
											2003-10-31 08:29:57 +01:00
+									</table_structure>
-												Portability fix (for example NetWare doesn't support table name like t"1").




											
										
										
											2003-11-05 09:06:03 +01:00
+									<table_data name="t1">
-												new mysqldump -X test (bug #1707)




											
										
										
											2003-10-31 08:29:57 +01:00
+									<row>
-												Fixes for mysql tests.


mysql-test/r/mysqlbinlog.result:
  fixes for mysql tests.
mysql-test/r/mysqldump.result:
  fixes for mysql tests.
mysql-test/r/negation_elimination.result:
  fixes for mysql tests.
mysql-test/t/mysqlbinlog.test:
  fixes for mysql tests.
mysql-test/t/mysqldump.test:
  fixes for mysql tests.

											
										
										
											2003-10-31 13:37:36 +01:00
+										<field name="a&quot;b&quot;">1&quot;</field>
-												new mysqldump -X test (bug #1707)




											
										
										
											2003-10-31 08:29:57 +01:00
+									</row>
 									<row>
-												Fixes for mysql tests.


mysql-test/r/mysqlbinlog.result:
  fixes for mysql tests.
mysql-test/r/mysqldump.result:
  fixes for mysql tests.
mysql-test/r/negation_elimination.result:
  fixes for mysql tests.
mysql-test/t/mysqlbinlog.test:
  fixes for mysql tests.
mysql-test/t/mysqldump.test:
  fixes for mysql tests.

											
										
										
											2003-10-31 13:37:36 +01:00
+										<field name="a&quot;b&quot;">&quot;2</field>
-												new mysqldump -X test (bug #1707)




											
										
										
											2003-10-31 08:29:57 +01:00
+									</row>
 									</table_data>
 								</database>
 								</mysqldump>
-												Portability fix (for example NetWare doesn't support table name like t"1").




											
										
										
											2003-11-05 09:06:03 +01:00
+								DROP TABLE t1;
-												changed usc2 -> koi8r to don't depend on extra-charset option.




											
										
										
											2003-12-10 12:27:33 +01:00
+								CREATE TABLE t1 (a  VARCHAR(255)) DEFAULT CHARSET koi8r;
-												Bug#4261 - mysqldump omits NULLs with --skip-extended-insert




											
										
										
											2004-06-23 21:46:17 +02:00
+								INSERT INTO t1  VALUES (_koi8r x'C1C2C3C4C5'), (NULL);
-												Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned



client/client_priv.h:
  cleanup & added OPT_COMPACT
client/mysqldump.c:
  Added option --compact to get a compact readable dump.
  Ensure that SET CHARACTER_SET_CLIENT is not done if we have not remembered the old character set
  Print optimization comments even if --skip-comments are given as these are not true comments. (Before these where only printed at end, which was a bug)
mysql-test/r/cast.result:
  More cast tests
mysql-test/r/derived.result:
  Removed warnings
mysql-test/r/mysqldump.result:
  Update results after fixing mysqlbinlog
mysql-test/r/query_cache.result:
  Make test usable with --extern
  more tests
mysql-test/r/rpl_until.result:
  Make test repeatable under valgrind
mysql-test/r/sql_mode.result:
  Fix test result
mysql-test/r/subselect.result:
  Make test smaller. Update wrong results
mysql-test/t/cast.test:
  More cast tests
mysql-test/t/derived.test:
  Removed warnings
mysql-test/t/query_cache.test:
  Make test usable with --extern
  more tests
mysql-test/t/rpl_until.test:
  fix for valgrind.  Becasue of unknown reason one got 'Slave_SQL_Running=yes' in this setup
mysql-test/t/subselect.test:
  Make test case smaller
sql/field.cc:
  Updated need_conversion() to use new arguments
sql/ha_heap.cc:
  Moved initialization of ref_length to right place. This fixed problem that we had a ref_length of 8 for heap tables, which was not efficent.
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Fixed bug in null_handling for cast to signed/unsigned
sql/item_strfunc.cc:
  Optimized/cleaned up Item_func_conv_charset3
sql/item_sum.cc:
  Cleanup.
  Ensure that some flag variables are cleared in cleanup()
sql/item_sum.h:
  Fixed references to uninitialized memory
sql/opt_range.cc:
  Fixed spelling error
sql/sql_class.cc:
  Fixed wrong return code, which could case protocol problems
sql/sql_class.h:
  After merge fix
sql/sql_prepare.cc:
  Added comments
sql/sql_show.cc:
  Cleanup
sql/sql_string.cc:
  Optimzed usage of need_conversion().
  - Removed not used argument
  - Save diff lenght in 'offset' to not have to recalculate length several times.
  Cleaned up comment
  Optimized copy_aligned() based on the knowledge that it's only called when you have wrong data
sql/sql_string.h:
  Updated need_conversion() and copy_aligned() to use new arguments
sql/sql_update.cc:
  Fixed error handling with non-updateable tables
sql/sql_yacc.yy:
  Ensure that lex->lock_options are set correctly (to get rid of warnings from valgrind)
  Ensure that cast_type sets lex->charset and lex->length. Without these CONVERT() didn't work properly

											
										
										
											2004-02-09 12:31:03 +01:00
-												Sorry, forgot to commit together with the code change yesterday.




											
										
										
											2004-06-08 08:33:16 +02:00
+								/*!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 */;
-												Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned



client/client_priv.h:
  cleanup & added OPT_COMPACT
client/mysqldump.c:
  Added option --compact to get a compact readable dump.
  Ensure that SET CHARACTER_SET_CLIENT is not done if we have not remembered the old character set
  Print optimization comments even if --skip-comments are given as these are not true comments. (Before these where only printed at end, which was a bug)
mysql-test/r/cast.result:
  More cast tests
mysql-test/r/derived.result:
  Removed warnings
mysql-test/r/mysqldump.result:
  Update results after fixing mysqlbinlog
mysql-test/r/query_cache.result:
  Make test usable with --extern
  more tests
mysql-test/r/rpl_until.result:
  Make test repeatable under valgrind
mysql-test/r/sql_mode.result:
  Fix test result
mysql-test/r/subselect.result:
  Make test smaller. Update wrong results
mysql-test/t/cast.test:
  More cast tests
mysql-test/t/derived.test:
  Removed warnings
mysql-test/t/query_cache.test:
  Make test usable with --extern
  more tests
mysql-test/t/rpl_until.test:
  fix for valgrind.  Becasue of unknown reason one got 'Slave_SQL_Running=yes' in this setup
mysql-test/t/subselect.test:
  Make test case smaller
sql/field.cc:
  Updated need_conversion() to use new arguments
sql/ha_heap.cc:
  Moved initialization of ref_length to right place. This fixed problem that we had a ref_length of 8 for heap tables, which was not efficent.
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Fixed bug in null_handling for cast to signed/unsigned
sql/item_strfunc.cc:
  Optimized/cleaned up Item_func_conv_charset3
sql/item_sum.cc:
  Cleanup.
  Ensure that some flag variables are cleared in cleanup()
sql/item_sum.h:
  Fixed references to uninitialized memory
sql/opt_range.cc:
  Fixed spelling error
sql/sql_class.cc:
  Fixed wrong return code, which could case protocol problems
sql/sql_class.h:
  After merge fix
sql/sql_prepare.cc:
  Added comments
sql/sql_show.cc:
  Cleanup
sql/sql_string.cc:
  Optimzed usage of need_conversion().
  - Removed not used argument
  - Save diff lenght in 'offset' to not have to recalculate length several times.
  Cleaned up comment
  Optimized copy_aligned() based on the knowledge that it's only called when you have wrong data
sql/sql_string.h:
  Updated need_conversion() and copy_aligned() to use new arguments
sql/sql_update.cc:
  Fixed error handling with non-updateable tables
sql/sql_yacc.yy:
  Ensure that lex->lock_options are set correctly (to get rid of warnings from valgrind)
  Ensure that cast_type sets lex->charset and lex->length. Without these CONVERT() didn't work properly

											
										
										
											2004-02-09 12:31:03 +01:00
+								/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 								/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												mysqldump results fixed




											
										
										
											2004-01-17 11:03:14 +01:00
+								DROP TABLE IF EXISTS `t1`;
 								CREATE TABLE `t1` (
 								  `a` varchar(255) default NULL
-												changed usc2 -> koi8r to don't depend on extra-charset option.




											
										
										
											2003-12-10 12:27:33 +01:00
+								) ENGINE=MyISAM DEFAULT CHARSET=koi8r;
-												Fix for the bug #1994: mysqldump does not correctly dump UCS2 data.




											
										
										
											2003-12-09 12:28:58 +01:00
-												mysqldump results fixed




											
										
										
											2004-01-17 11:03:14 +01:00
+								/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 								LOCK TABLES `t1` WRITE;
 								INSERT INTO `t1` VALUES ('абцде');
-												Bug#4261 - mysqldump omits NULLs with --skip-extended-insert




											
										
										
											2004-06-23 21:46:17 +02:00
+								INSERT INTO `t1` VALUES (NULL);
-												Fix for the bug #1994: mysqldump does not correctly dump UCS2 data.




											
										
										
											2003-12-09 12:28:58 +01:00
+								UNLOCK TABLES;
-												mysqldump results fixed




											
										
										
											2004-01-17 11:03:14 +01:00
+								/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
-												Fix for the bug #1994: mysqldump does not correctly dump UCS2 data.




											
										
										
											2003-12-09 12:28:58 +01:00
 								/*!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 */;
-												Sorry, forgot to commit together with the code change yesterday.




											
										
										
											2004-06-08 08:33:16 +02:00
+								/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 								/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												Fix for the bug #1994: mysqldump does not correctly dump UCS2 data.




											
										
										
											2003-12-09 12:28:58 +01:00
+								DROP TABLE t1;
-												Bug#2634
  Emit "TYPE=" for 4.0 and 3.23 compatible modes


mysql-test/r/mysqldump.result:
  Bug#2634
    New test case
mysql-test/t/mysqldump.test:
  Bug#2634
    New test case

											
										
										
											2004-02-05 03:30:28 +01:00
+								CREATE TABLE t1 (a int) ENGINE=MYISAM;
 								INSERT INTO t1 VALUES (1), (2);
-												Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned



client/client_priv.h:
  cleanup & added OPT_COMPACT
client/mysqldump.c:
  Added option --compact to get a compact readable dump.
  Ensure that SET CHARACTER_SET_CLIENT is not done if we have not remembered the old character set
  Print optimization comments even if --skip-comments are given as these are not true comments. (Before these where only printed at end, which was a bug)
mysql-test/r/cast.result:
  More cast tests
mysql-test/r/derived.result:
  Removed warnings
mysql-test/r/mysqldump.result:
  Update results after fixing mysqlbinlog
mysql-test/r/query_cache.result:
  Make test usable with --extern
  more tests
mysql-test/r/rpl_until.result:
  Make test repeatable under valgrind
mysql-test/r/sql_mode.result:
  Fix test result
mysql-test/r/subselect.result:
  Make test smaller. Update wrong results
mysql-test/t/cast.test:
  More cast tests
mysql-test/t/derived.test:
  Removed warnings
mysql-test/t/query_cache.test:
  Make test usable with --extern
  more tests
mysql-test/t/rpl_until.test:
  fix for valgrind.  Becasue of unknown reason one got 'Slave_SQL_Running=yes' in this setup
mysql-test/t/subselect.test:
  Make test case smaller
sql/field.cc:
  Updated need_conversion() to use new arguments
sql/ha_heap.cc:
  Moved initialization of ref_length to right place. This fixed problem that we had a ref_length of 8 for heap tables, which was not efficent.
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Fixed bug in null_handling for cast to signed/unsigned
sql/item_strfunc.cc:
  Optimized/cleaned up Item_func_conv_charset3
sql/item_sum.cc:
  Cleanup.
  Ensure that some flag variables are cleared in cleanup()
sql/item_sum.h:
  Fixed references to uninitialized memory
sql/opt_range.cc:
  Fixed spelling error
sql/sql_class.cc:
  Fixed wrong return code, which could case protocol problems
sql/sql_class.h:
  After merge fix
sql/sql_prepare.cc:
  Added comments
sql/sql_show.cc:
  Cleanup
sql/sql_string.cc:
  Optimzed usage of need_conversion().
  - Removed not used argument
  - Save diff lenght in 'offset' to not have to recalculate length several times.
  Cleaned up comment
  Optimized copy_aligned() based on the knowledge that it's only called when you have wrong data
sql/sql_string.h:
  Updated need_conversion() and copy_aligned() to use new arguments
sql/sql_update.cc:
  Fixed error handling with non-updateable tables
sql/sql_yacc.yy:
  Ensure that lex->lock_options are set correctly (to get rid of warnings from valgrind)
  Ensure that cast_type sets lex->charset and lex->length. Without these CONVERT() didn't work properly

											
										
										
											2004-02-09 12:31:03 +01:00
+								/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 								/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL40' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												Bug#2634
  Emit "TYPE=" for 4.0 and 3.23 compatible modes


mysql-test/r/mysqldump.result:
  Bug#2634
    New test case
mysql-test/t/mysqldump.test:
  Bug#2634
    New test case

											
										
										
											2004-02-05 03:30:28 +01:00
+								DROP TABLE IF EXISTS `t1`;
 								CREATE TABLE `t1` (
 								  `a` int(11) default NULL
 								) TYPE=MyISAM;
 								/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 								LOCK TABLES `t1` WRITE;
 								INSERT INTO `t1` VALUES (1),(2);
 								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 */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned



client/client_priv.h:
  cleanup & added OPT_COMPACT
client/mysqldump.c:
  Added option --compact to get a compact readable dump.
  Ensure that SET CHARACTER_SET_CLIENT is not done if we have not remembered the old character set
  Print optimization comments even if --skip-comments are given as these are not true comments. (Before these where only printed at end, which was a bug)
mysql-test/r/cast.result:
  More cast tests
mysql-test/r/derived.result:
  Removed warnings
mysql-test/r/mysqldump.result:
  Update results after fixing mysqlbinlog
mysql-test/r/query_cache.result:
  Make test usable with --extern
  more tests
mysql-test/r/rpl_until.result:
  Make test repeatable under valgrind
mysql-test/r/sql_mode.result:
  Fix test result
mysql-test/r/subselect.result:
  Make test smaller. Update wrong results
mysql-test/t/cast.test:
  More cast tests
mysql-test/t/derived.test:
  Removed warnings
mysql-test/t/query_cache.test:
  Make test usable with --extern
  more tests
mysql-test/t/rpl_until.test:
  fix for valgrind.  Becasue of unknown reason one got 'Slave_SQL_Running=yes' in this setup
mysql-test/t/subselect.test:
  Make test case smaller
sql/field.cc:
  Updated need_conversion() to use new arguments
sql/ha_heap.cc:
  Moved initialization of ref_length to right place. This fixed problem that we had a ref_length of 8 for heap tables, which was not efficent.
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Fixed bug in null_handling for cast to signed/unsigned
sql/item_strfunc.cc:
  Optimized/cleaned up Item_func_conv_charset3
sql/item_sum.cc:
  Cleanup.
  Ensure that some flag variables are cleared in cleanup()
sql/item_sum.h:
  Fixed references to uninitialized memory
sql/opt_range.cc:
  Fixed spelling error
sql/sql_class.cc:
  Fixed wrong return code, which could case protocol problems
sql/sql_class.h:
  After merge fix
sql/sql_prepare.cc:
  Added comments
sql/sql_show.cc:
  Cleanup
sql/sql_string.cc:
  Optimzed usage of need_conversion().
  - Removed not used argument
  - Save diff lenght in 'offset' to not have to recalculate length several times.
  Cleaned up comment
  Optimized copy_aligned() based on the knowledge that it's only called when you have wrong data
sql/sql_string.h:
  Updated need_conversion() and copy_aligned() to use new arguments
sql/sql_update.cc:
  Fixed error handling with non-updateable tables
sql/sql_yacc.yy:
  Ensure that lex->lock_options are set correctly (to get rid of warnings from valgrind)
  Ensure that cast_type sets lex->charset and lex->length. Without these CONVERT() didn't work properly

											
										
										
											2004-02-09 12:31:03 +01:00
+								/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 								/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												Bug#2634
  Emit "TYPE=" for 4.0 and 3.23 compatible modes


mysql-test/r/mysqldump.result:
  Bug#2634
    New test case
mysql-test/t/mysqldump.test:
  Bug#2634
    New test case

											
										
										
											2004-02-05 03:30:28 +01:00
+								DROP TABLE IF EXISTS `t1`;
 								CREATE TABLE `t1` (
 								  `a` int(11) default NULL
 								) TYPE=MyISAM;
 								/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 								LOCK TABLES `t1` WRITE;
 								INSERT INTO `t1` VALUES (1),(2);
 								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 */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												Bug#2634
  Emit "TYPE=" for 4.0 and 3.23 compatible modes


mysql-test/r/mysqldump.result:
  Bug#2634
    New test case
mysql-test/t/mysqldump.test:
  Bug#2634
    New test case

											
										
										
											2004-02-05 03:30:28 +01:00
+								DROP TABLE t1;
-												fixed bug #2592 mysqldump doesn't quote "tricky" names correctly


mysql-test/r/mysqldump.result:
  added test for 
  bug #2592 mysqldump doesn't quote "tricky" names correctly
  please note, output's still looking wrong because of bug #2593
  it will be fixed when fix for bug #2593 will be pushed
mysql-test/t/mysqldump.test:
  added test for bug 
  #2592 mysqldump doesn't quote "tricky" names correctly
sql/sql_lex.cc:
  fixed processing of multibyte quoted variables

											
										
										
											2004-02-06 23:22:12 +01:00
+								create table ```a` (i int);
-												fixed mistake after merge in mysql-test/r/mysqldump.result


mysql-test/r/mysqldump.result:
  fixed mistake after merge

											
										
										
											2004-02-12 22:50:02 +01:00
+								CREATE TABLE ```a` (
-												fixed bug #2592 mysqldump doesn't quote "tricky" names correctly


mysql-test/r/mysqldump.result:
  added test for 
  bug #2592 mysqldump doesn't quote "tricky" names correctly
  please note, output's still looking wrong because of bug #2593
  it will be fixed when fix for bug #2593 will be pushed
mysql-test/t/mysqldump.test:
  added test for bug 
  #2592 mysqldump doesn't quote "tricky" names correctly
sql/sql_lex.cc:
  fixed processing of multibyte quoted variables

											
										
										
											2004-02-06 23:22:12 +01:00
+								  `i` int(11) default NULL
 								) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 								drop table ```a`;
-												fixed bug #2705 "mysqldump --tab extra output"


client/mysqldump.c:
  fixed bug #2705 "mysqldump --tab extra output"
  and splited setting of sql_mode to separate line to merge with 4.0

											
										
										
											2004-02-13 22:21:46 +01:00
+								create table t1(a int);
-												fixed bug #2591 "mysqldump quotas names inconsistently"


mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"

											
										
										
											2004-03-11 15:46:27 +01:00
-												Sorry, forgot to commit together with the code change yesterday.




											
										
										
											2004-06-08 08:33:16 +02:00
+								/*!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 */;
-												fixed bug #2591 "mysqldump quotas names inconsistently"


mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"

											
										
										
											2004-03-11 15:46:27 +01:00
+								/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 								/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												fixed bug #2591 "mysqldump quotas names inconsistently"


mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"

											
										
										
											2004-03-11 15:46:27 +01:00
+								DROP TABLE IF EXISTS `t1`;
 								CREATE TABLE `t1` (
 								  `a` int(11) default NULL
 								) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 								/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 								LOCK TABLES `t1` WRITE;
 								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 */;
-												Sorry, forgot to commit together with the code change yesterday.




											
										
										
											2004-06-08 08:33:16 +02:00
+								/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 								/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												fixed bug #2591 "mysqldump quotas names inconsistently"


mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"

											
										
										
											2004-03-11 15:46:27 +01:00
+								/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 								/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												fixed bug #2591 "mysqldump quotas names inconsistently"


mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"

											
										
										
											2004-03-11 15:46:27 +01:00
+								DROP TABLE IF EXISTS "t1";
 								CREATE TABLE "t1" (
 								  "a" int(11) default NULL
 								);
 								/*!40000 ALTER TABLE "t1" DISABLE KEYS */;
 								LOCK TABLES "t1" WRITE;
 								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 */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												fixed bug #2591 "mysqldump quotas names inconsistently"


mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"

											
										
										
											2004-03-11 15:46:27 +01:00
+								set global sql_mode='ANSI_QUOTES';
-												Sorry, forgot to commit together with the code change yesterday.




											
										
										
											2004-06-08 08:33:16 +02:00
+								/*!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 */;
-												fixed bug #2591 "mysqldump quotas names inconsistently"


mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"

											
										
										
											2004-03-11 15:46:27 +01:00
+								/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 								/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												fixed bug #2591 "mysqldump quotas names inconsistently"


mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"

											
										
										
											2004-03-11 15:46:27 +01:00
+								DROP TABLE IF EXISTS `t1`;
 								CREATE TABLE `t1` (
 								  `a` int(11) default NULL
 								) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 								/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 								LOCK TABLES `t1` WRITE;
 								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 */;
-												Sorry, forgot to commit together with the code change yesterday.




											
										
										
											2004-06-08 08:33:16 +02:00
+								/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 								/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												fixed bug #2591 "mysqldump quotas names inconsistently"


mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"

											
										
										
											2004-03-11 15:46:27 +01:00
+								/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 								/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												fixed bug #2591 "mysqldump quotas names inconsistently"


mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"

											
										
										
											2004-03-11 15:46:27 +01:00
+								DROP TABLE IF EXISTS "t1";
 								CREATE TABLE "t1" (
 								  "a" int(11) default NULL
 								);
 								/*!40000 ALTER TABLE "t1" DISABLE KEYS */;
 								LOCK TABLES "t1" WRITE;
 								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 */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												fixed bug #2591 "mysqldump quotas names inconsistently"


mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"

											
										
										
											2004-03-11 15:46:27 +01:00
+								set global sql_mode='';
-												merge correcttion in mysql-test/r/mysqldump.result


mysql-test/r/mysqldump.result:
  merge correction

											
										
										
											2004-03-11 19:43:10 +01:00
+								drop table t1;
 								create table t1(a int);
-												fixed bug #2705 "mysqldump --tab extra output"


client/mysqldump.c:
  fixed bug #2705 "mysqldump --tab extra output"
  and splited setting of sql_mode to separate line to merge with 4.0

											
										
										
											2004-02-13 22:21:46 +01:00
+								insert into t1 values (1),(2),(3);
-												Sorry, forgot to commit together with the code change yesterday.




											
										
										
											2004-06-08 08:33:16 +02:00
+								/*!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 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												fixed bug #2705 "mysqldump --tab extra output"


client/mysqldump.c:
  fixed bug #2705 "mysqldump --tab extra output"
  and splited setting of sql_mode to separate line to merge with 4.0

											
										
										
											2004-02-13 22:21:46 +01:00
+								DROP TABLE IF EXISTS `t1`;
 								CREATE TABLE `t1` (
 								  `a` int(11) default NULL
 								) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 								/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 								/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-												Sorry, forgot to commit together with the code change yesterday.




											
										
										
											2004-06-08 08:33:16 +02:00
+								/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 								/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												fixed bug #2705 "mysqldump --tab extra output"


client/mysqldump.c:
  fixed bug #2705 "mysqldump --tab extra output"
  and splited setting of sql_mode to separate line to merge with 4.0

											
										
										
											2004-02-13 22:21:46 +01:00
 
 
 								drop table t1;
-												A fix (bug #6101: mysqldump writes invalid SQL).


client/mysqldump.c:
  A fix (bug #6101: mysqldump writes invalid SQL).
  Syntax corrected.

											
										
										
											2004-10-19 08:00:44 +02:00
 								/*!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 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												A fix (bug #6101: mysqldump writes invalid SQL).


client/mysqldump.c:
  A fix (bug #6101: mysqldump writes invalid SQL).
  Syntax corrected.

											
										
										
											2004-10-19 08:00:44 +02:00
 								CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
 								USE `test`;
 								/*!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 */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												An additional test for 'CREATE DATABASE' with non-default character set.




											
										
										
											2004-11-30 10:19:35 +01:00
+								create database mysqldump_test_db character set latin2 collate latin2_bin;
 								/*!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 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												An additional test for 'CREATE DATABASE' with non-default character set.




											
										
										
											2004-11-30 10:19:35 +01:00
 								CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CHARACTER SET latin2 COLLATE latin2_bin */;
 								USE `mysqldump_test_db`;
 								/*!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 */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												An additional test for 'CREATE DATABASE' with non-default character set.




											
										
										
											2004-11-30 10:19:35 +01:00
+								drop database mysqldump_test_db;
-												Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details




											
										
										
											2004-12-22 13:02:27 +01:00
+								CREATE TABLE t1 (a  CHAR(10));
 								INSERT INTO t1  VALUES (_latin1 '<27><><EFBFBD><EFBFBD>');
 								/*!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 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details




											
										
										
											2004-12-22 13:02:27 +01:00
+								DROP TABLE IF EXISTS `t1`;
 								CREATE TABLE `t1` (
 								  `a` char(10) default NULL
 								) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 								/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 								LOCK TABLES `t1` WRITE;
 								INSERT INTO `t1` VALUES ('ÄÖÜß');
 								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 */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details




											
										
										
											2004-12-22 13:02:27 +01:00
+								/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 								/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details




											
										
										
											2004-12-22 13:02:27 +01:00
+								DROP TABLE IF EXISTS `t1`;
 								CREATE TABLE `t1` (
 								  `a` char(10) default NULL
 								) TYPE=MyISAM;
 								/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 								LOCK TABLES `t1` WRITE;
 								INSERT INTO `t1` VALUES ('<27><><EFBFBD><EFBFBD>');
 								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 */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details




											
										
										
											2004-12-22 13:02:27 +01:00
+								/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 								/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details




											
										
										
											2004-12-22 13:02:27 +01:00
+								DROP TABLE IF EXISTS `t1`;
 								CREATE TABLE `t1` (
 								  `a` char(10) default NULL
 								) TYPE=MyISAM;
 								/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 								LOCK TABLES `t1` WRITE;
 								INSERT INTO `t1` VALUES ('<27><><EFBFBD><EFBFBD>');
 								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 */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details




											
										
										
											2004-12-22 13:02:27 +01:00
+								/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 								/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details




											
										
										
											2004-12-22 13:02:27 +01:00
+								DROP TABLE IF EXISTS `t1`;
 								CREATE TABLE `t1` (
 								  `a` char(10) default NULL
 								) TYPE=MyISAM;
 								/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 								LOCK TABLES `t1` WRITE;
 								INSERT INTO `t1` VALUES ('ÄÖÜß');
 								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 */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details




											
										
										
											2004-12-22 13:02:27 +01:00
+								DROP TABLE t1;
-												WL#2319 V2: Exclude tables from dump
- Added a hash to keep track of database-table pairs.
- Specified database-table tables do not get dumped


client/client_priv.h:
  WL#2319 V2: Exclude tables from dump
client/mysqldump.c:
  WL#2319 V2: Exclude tables from dump
mysql-test/r/mysqldump.result:
  WL#2319 V2: Exclude tables from dump
mysql-test/t/mysqldump.test:
  WL#2319 V2: Exclude tables from dump

											
										
										
											2004-12-27 19:10:30 +01:00
+								CREATE TABLE t1 (a int);
 								CREATE TABLE t2 (a int);
 								INSERT INTO t1 VALUES (1),(2),(3);
 								INSERT INTO t2 VALUES (4),(5),(6);
 								/*!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 */;
-												Fix test results for mysqldump test. Part of Bug #8148.


mysql-test/r/mysqldump.result:
  Update results

											
										
										
											2005-01-28 21:13:01 +01:00
+								/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-												WL#2319 V2: Exclude tables from dump
- Added a hash to keep track of database-table pairs.
- Specified database-table tables do not get dumped


client/client_priv.h:
  WL#2319 V2: Exclude tables from dump
client/mysqldump.c:
  WL#2319 V2: Exclude tables from dump
mysql-test/r/mysqldump.result:
  WL#2319 V2: Exclude tables from dump
mysql-test/t/mysqldump.test:
  WL#2319 V2: Exclude tables from dump

											
										
										
											2004-12-27 19:10:30 +01:00
+								DROP TABLE IF EXISTS `t2`;
 								CREATE TABLE `t2` (
 								  `a` int(11) default NULL
 								) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 								/*!40000 ALTER TABLE `t2` DISABLE KEYS */;
 								LOCK TABLES `t2` WRITE;
 								INSERT INTO `t2` VALUES (4),(5),(6);
 								UNLOCK TABLES;
 								/*!40000 ALTER TABLE `t2` 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 */;
-												BUG#6662: Importing mysqldumps should not show any warnings of level "notes".




											
										
										
											2005-02-21 18:40:28 +01:00
+								/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-												BUG#6662: Changes after Guilhems and Sergs review




											
										
										
											2005-02-22 12:40:31 +01:00
-												WL#2319 V2: Exclude tables from dump
- Added a hash to keep track of database-table pairs.
- Specified database-table tables do not get dumped


client/client_priv.h:
  WL#2319 V2: Exclude tables from dump
client/mysqldump.c:
  WL#2319 V2: Exclude tables from dump
mysql-test/r/mysqldump.result:
  WL#2319 V2: Exclude tables from dump
mysql-test/t/mysqldump.test:
  WL#2319 V2: Exclude tables from dump

											
										
										
											2004-12-27 19:10:30 +01:00
+								DROP TABLE t1;
 								DROP TABLE t2;
-												A fix for a bug #8830, which  occured  when binary data from  blob was
dumped with --hex-blob and --skip-extended-insert options.


BitKeeper/etc/ignore:
  Added support-files/ndb-config-2-node.ini to the ignore list
client/mysqldump.c:
  A fix for a bug #8830. All that was necessary was to use unsigned  char
  instead of signed  char.
mysql-test/r/mysqldump.result:
  A result for   test case for bug #8830.
mysql-test/t/mysqldump.test:
  Test case for bug #8830.

											
										
										
											2005-03-05 21:06:07 +01:00
+								CREATE TABLE t1 (`b` blob);
 								INSERT INTO `t1` VALUES (0x602010000280100005E71A);
 								/*!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 */;
 								DROP TABLE IF EXISTS `t1`;
 								CREATE TABLE `t1` (
 								  `b` blob
 								) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 								/*!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;