From 545f05020b060a5699a78d551fa693a7d05ed65d Mon Sep 17 00:00:00 2001
From: "grog@mysql.com" <>
Date: Thu, 27 Apr 2006 21:59:04 +0930
Subject: sql_mode.test:   BUG#14765: Modified test file. sql_mode.result:  
 BUG#14765: Modified result file.

---
 mysql-test/r/sql_mode.result | 4 ++++
 mysql-test/t/sql_mode.test   | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result
index b05680f9c54..474659f7dfc 100644
--- a/mysql-test/r/sql_mode.result
+++ b/mysql-test/r/sql_mode.result
@@ -485,6 +485,10 @@ set sql_mode=2097152;
 select @@sql_mode;
 @@sql_mode
 STRICT_TRANS_TABLES
+set sql_mode=4194304;
+select @@sql_mode;
+@@sql_mode
+STRICT_ALL_TABLES
 set sql_mode=16384+(65536*4);
 select @@sql_mode;
 @@sql_mode
diff --git a/mysql-test/t/sql_mode.test b/mysql-test/t/sql_mode.test
index b67f1a73db6..2699cb66471 100644
--- a/mysql-test/t/sql_mode.test
+++ b/mysql-test/t/sql_mode.test
@@ -258,6 +258,9 @@ drop table t1, t2;
 select @@sql_mode;
 set sql_mode=2097152;
 select @@sql_mode;
+# BUG#14675
+set sql_mode=4194304;
+select @@sql_mode;
 set sql_mode=16384+(65536*4);
 select @@sql_mode;
 --error 1231
-- 
cgit v1.2.1


From 59fac3eab62a4e54b9b04a93a5b1f2d3d9f07a5c Mon Sep 17 00:00:00 2001
From: "grog@mysql.com" <>
Date: Wed, 3 May 2006 16:28:11 +0930
Subject: rpl_auto_increment_11932.result, rpl_auto_increment_11932.test:  
 Test case for BUG#11932

---
 mysql-test/r/rpl_auto_increment_11932.result | 46 ++++++++++++++++++++++
 mysql-test/t/rpl_auto_increment_11932.test   | 59 ++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 mysql-test/r/rpl_auto_increment_11932.result
 create mode 100644 mysql-test/t/rpl_auto_increment_11932.test

(limited to 'mysql-test')

diff --git a/mysql-test/r/rpl_auto_increment_11932.result b/mysql-test/r/rpl_auto_increment_11932.result
new file mode 100644
index 00000000000..753e9e9f223
--- /dev/null
+++ b/mysql-test/r/rpl_auto_increment_11932.result
@@ -0,0 +1,46 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+drop database if exists t1;
+create database t1;
+use t1;
+CREATE TABLE `t` (
+`id` int(10) unsigned NOT NULL auto_increment,
+`fname` varchar(100) default NULL,
+PRIMARY KEY  (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+INSERT INTO `t` VALUES (1, 'blablabla');
+CREATE TABLE `test3` (
+`id` int(10) NOT NULL auto_increment,
+`comment` varchar(255) NOT NULL default '',
+PRIMARY KEY  (`id`)
+) ENGINE=MyISAM  AUTO_INCREMENT=3 ;
+INSERT INTO `test3` VALUES (1, 'testtest 1');
+INSERT INTO `test3` VALUES (2, 'test 2');
+CREATE PROCEDURE simpleproc3 ()
+NOT DETERMINISTIC
+BEGIN
+INSERT INTO t (fname) (SELECT test3.comment FROM test3 WHERE test3.id = '1');
+INSERT INTO t (fname) VALUES('test');
+END
+$
+CALL simpleproc3();
+select * from test3;
+id	comment
+1	testtest 1
+2	test 2
+TRUNCATE TABLE `t`;
+CALL simpleproc3();
+select * from t;
+id	fname
+1	testtest 1
+2	test
+use t1;
+select * from t;
+id	fname
+1	testtest 1
+2	test
+drop database t1;
diff --git a/mysql-test/t/rpl_auto_increment_11932.test b/mysql-test/t/rpl_auto_increment_11932.test
new file mode 100644
index 00000000000..db9a11277ac
--- /dev/null
+++ b/mysql-test/t/rpl_auto_increment_11932.test
@@ -0,0 +1,59 @@
+#
+# Test of auto_increment
+# BUG#11932
+#
+# Test supplied by Are Casilla
+#
+
+source include/master-slave.inc;
+--disable_warnings
+connection master;
+drop database if exists t1;
+--enable_warnings
+create database t1;
+use t1;
+
+CREATE TABLE `t` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `fname` varchar(100) default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+INSERT INTO `t` VALUES (1, 'blablabla');
+
+CREATE TABLE `test3` (
+  `id` int(10) NOT NULL auto_increment,
+  `comment` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM  AUTO_INCREMENT=3 ;
+
+INSERT INTO `test3` VALUES (1, 'testtest 1');
+INSERT INTO `test3` VALUES (2, 'test 2');
+  
+DELIMITER $;
+CREATE PROCEDURE simpleproc3 ()
+    NOT DETERMINISTIC
+    BEGIN
+    INSERT INTO t (fname) (SELECT test3.comment FROM test3 WHERE test3.id = '1');
+    INSERT INTO t (fname) VALUES('test');
+    END
+    $
+DELIMITER ;$
+
+CALL simpleproc3();
+
+select * from test3;
+
+TRUNCATE TABLE `t`;
+CALL simpleproc3();
+
+select * from t;
+
+save_master_pos;
+connection slave;
+sync_with_master;
+
+use t1;
+select * from t;
+
+drop database t1;
-- 
cgit v1.2.1


From 832089c49efd50d425ff03480eb86292b17ba702 Mon Sep 17 00:00:00 2001
From: "grog@mysql.com" <>
Date: Mon, 22 May 2006 10:08:13 +0930
Subject: rpl_auto_increment_11932.result, rpl_auto_increment_11932.test:  
 Update with correct table and database names.

---
 mysql-test/r/rpl_auto_increment_11932.result | 32 ++++++++++++-------------
 mysql-test/t/rpl_auto_increment_11932.test   | 36 +++++++++++++++-------------
 2 files changed, 35 insertions(+), 33 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/r/rpl_auto_increment_11932.result b/mysql-test/r/rpl_auto_increment_11932.result
index 753e9e9f223..d3bf052f0c9 100644
--- a/mysql-test/r/rpl_auto_increment_11932.result
+++ b/mysql-test/r/rpl_auto_increment_11932.result
@@ -4,43 +4,43 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-drop database if exists t1;
-create database t1;
-use t1;
-CREATE TABLE `t` (
+drop database if exists test1;
+create database test1;
+use test1;
+CREATE TABLE `t1` (
 `id` int(10) unsigned NOT NULL auto_increment,
 `fname` varchar(100) default NULL,
 PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
-INSERT INTO `t` VALUES (1, 'blablabla');
-CREATE TABLE `test3` (
+INSERT INTO `t1` VALUES (1, 'blablabla');
+CREATE TABLE `t2` (
 `id` int(10) NOT NULL auto_increment,
 `comment` varchar(255) NOT NULL default '',
 PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM  AUTO_INCREMENT=3 ;
-INSERT INTO `test3` VALUES (1, 'testtest 1');
-INSERT INTO `test3` VALUES (2, 'test 2');
+INSERT INTO `t2` VALUES (1, 'testtest 1');
+INSERT INTO `t2` VALUES (2, 'test 2');
 CREATE PROCEDURE simpleproc3 ()
 NOT DETERMINISTIC
 BEGIN
-INSERT INTO t (fname) (SELECT test3.comment FROM test3 WHERE test3.id = '1');
-INSERT INTO t (fname) VALUES('test');
+INSERT INTO t1 (fname) (SELECT t2.comment FROM t2 WHERE t2.id = '1');
+INSERT INTO t1 (fname) VALUES('test');
 END
 $
 CALL simpleproc3();
-select * from test3;
+select * from t2;
 id	comment
 1	testtest 1
 2	test 2
-TRUNCATE TABLE `t`;
+TRUNCATE TABLE `t1`;
 CALL simpleproc3();
-select * from t;
+select * from t1;
 id	fname
 1	testtest 1
 2	test
-use t1;
-select * from t;
+use test1;
+select * from t1;
 id	fname
 1	testtest 1
 2	test
-drop database t1;
+drop database test1;
diff --git a/mysql-test/t/rpl_auto_increment_11932.test b/mysql-test/t/rpl_auto_increment_11932.test
index db9a11277ac..057b0c0911b 100644
--- a/mysql-test/t/rpl_auto_increment_11932.test
+++ b/mysql-test/t/rpl_auto_increment_11932.test
@@ -2,58 +2,60 @@
 # Test of auto_increment
 # BUG#11932
 #
-# Test supplied by Are Casilla
+# Bug reported that master and slave get out of sync after TRUNCATE
+# TABLE.
 #
+# Test supplied by Are Casilla
 
 source include/master-slave.inc;
 --disable_warnings
 connection master;
-drop database if exists t1;
+drop database if exists test1;
 --enable_warnings
-create database t1;
-use t1;
+create database test1;
+use test1;
 
-CREATE TABLE `t` (
+CREATE TABLE `t1` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `fname` varchar(100) default NULL,
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
 
-INSERT INTO `t` VALUES (1, 'blablabla');
+INSERT INTO `t1` VALUES (1, 'blablabla');
 
-CREATE TABLE `test3` (
+CREATE TABLE `t2` (
   `id` int(10) NOT NULL auto_increment,
   `comment` varchar(255) NOT NULL default '',
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM  AUTO_INCREMENT=3 ;
 
-INSERT INTO `test3` VALUES (1, 'testtest 1');
-INSERT INTO `test3` VALUES (2, 'test 2');
+INSERT INTO `t2` VALUES (1, 'testtest 1');
+INSERT INTO `t2` VALUES (2, 'test 2');
   
 DELIMITER $;
 CREATE PROCEDURE simpleproc3 ()
     NOT DETERMINISTIC
     BEGIN
-    INSERT INTO t (fname) (SELECT test3.comment FROM test3 WHERE test3.id = '1');
-    INSERT INTO t (fname) VALUES('test');
+    INSERT INTO t1 (fname) (SELECT t2.comment FROM t2 WHERE t2.id = '1');
+    INSERT INTO t1 (fname) VALUES('test');
     END
     $
 DELIMITER ;$
 
 CALL simpleproc3();
 
-select * from test3;
+select * from t2;
 
-TRUNCATE TABLE `t`;
+TRUNCATE TABLE `t1`;
 CALL simpleproc3();
 
-select * from t;
+select * from t1;
 
 save_master_pos;
 connection slave;
 sync_with_master;
 
-use t1;
-select * from t;
+use test1;
+select * from t1;
 
-drop database t1;
+drop database test1;
-- 
cgit v1.2.1


From c21e6498b14204c5ad945ae26aaaf97b6b2778b2 Mon Sep 17 00:00:00 2001
From: "grog@mysql.com" <>
Date: Mon, 22 May 2006 12:18:18 +0930
Subject: rpl_auto_increment_11932.test, rpl_auto_increment_11932.result:  
 Drop test1 table in master as well.

---
 mysql-test/r/rpl_auto_increment_11932.result | 1 +
 mysql-test/t/rpl_auto_increment_11932.test   | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/r/rpl_auto_increment_11932.result b/mysql-test/r/rpl_auto_increment_11932.result
index d3bf052f0c9..25eda6ee454 100644
--- a/mysql-test/r/rpl_auto_increment_11932.result
+++ b/mysql-test/r/rpl_auto_increment_11932.result
@@ -44,3 +44,4 @@ id	fname
 1	testtest 1
 2	test
 drop database test1;
+drop database test1;
diff --git a/mysql-test/t/rpl_auto_increment_11932.test b/mysql-test/t/rpl_auto_increment_11932.test
index 057b0c0911b..d4b7872fb2b 100644
--- a/mysql-test/t/rpl_auto_increment_11932.test
+++ b/mysql-test/t/rpl_auto_increment_11932.test
@@ -59,3 +59,5 @@ use test1;
 select * from t1;
 
 drop database test1;
+connection master;
+drop database test1;
-- 
cgit v1.2.1


From 1f86b3f1003e797e428bd3c07cf40ecc82613e23 Mon Sep 17 00:00:00 2001
From: "grog@mysql.com" <>
Date: Thu, 25 May 2006 17:30:28 +0930
Subject: BUG#17201: Improve handling of views.

---
 mysql-test/r/mysqldump.result | 98 +++++++++++++++++++++++++++++++++++++------
 mysql-test/t/mysqldump.test   | 15 +++++++
 2 files changed, 100 insertions(+), 13 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 467e0818646..135c2f7abd4 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -1458,7 +1458,6 @@ UNLOCK TABLES;
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 DROP TABLE IF EXISTS `v2`;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
-/*!50001 DROP TABLE IF EXISTS `v2`*/;
 /*!50001 CREATE TABLE `v2` (
   `a` varchar(30)
 ) */;
@@ -1763,7 +1762,6 @@ UNLOCK TABLES;
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 DROP TABLE IF EXISTS `v1`;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
-/*!50001 DROP TABLE IF EXISTS `v1`*/;
 /*!50001 CREATE TABLE `v1` (
   `a` int(11)
 ) */;
@@ -1821,7 +1819,6 @@ UNLOCK TABLES;
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 DROP TABLE IF EXISTS `v2`;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
-/*!50001 DROP TABLE IF EXISTS `v2`*/;
 /*!50001 CREATE TABLE `v2` (
   `a` varchar(30)
 ) */;
@@ -1914,7 +1911,6 @@ UNLOCK TABLES;
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 DROP TABLE IF EXISTS `v1`;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
-/*!50001 DROP TABLE IF EXISTS `v1`*/;
 /*!50001 CREATE TABLE `v1` (
   `a` int(11),
   `b` int(11),
@@ -1922,13 +1918,11 @@ DROP TABLE IF EXISTS `v1`;
 ) */;
 DROP TABLE IF EXISTS `v2`;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
-/*!50001 DROP TABLE IF EXISTS `v2`*/;
 /*!50001 CREATE TABLE `v2` (
   `a` int(11)
 ) */;
 DROP TABLE IF EXISTS `v3`;
 /*!50001 DROP VIEW IF EXISTS `v3`*/;
-/*!50001 DROP TABLE IF EXISTS `v3`*/;
 /*!50001 CREATE TABLE `v3` (
   `a` int(11),
   `b` int(11),
@@ -2489,7 +2483,6 @@ UNLOCK TABLES;
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 DROP TABLE IF EXISTS `v0`;
 /*!50001 DROP VIEW IF EXISTS `v0`*/;
-/*!50001 DROP TABLE IF EXISTS `v0`*/;
 /*!50001 CREATE TABLE `v0` (
   `a` int(11),
   `b` varchar(32),
@@ -2497,7 +2490,6 @@ DROP TABLE IF EXISTS `v0`;
 ) */;
 DROP TABLE IF EXISTS `v1`;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
-/*!50001 DROP TABLE IF EXISTS `v1`*/;
 /*!50001 CREATE TABLE `v1` (
   `a` int(11),
   `b` varchar(32),
@@ -2505,16 +2497,11 @@ DROP TABLE IF EXISTS `v1`;
 ) */;
 DROP TABLE IF EXISTS `v2`;
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
-/*!50001 DROP TABLE IF EXISTS `v2`*/;
 /*!50001 CREATE TABLE `v2` (
   `a` int(11),
   `b` varchar(32),
   `c` varchar(32)
 ) */;
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
-
-USE `test`;
 /*!50001 DROP TABLE IF EXISTS `v0`*/;
 /*!50001 DROP VIEW IF EXISTS `v0`*/;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
@@ -2731,3 +2718,88 @@ p		CREATE DEFINER=`root`@`localhost` PROCEDURE `p`()
 select 42
 drop function f;
 drop procedure p;
+drop database if exists test;
+create database test;
+use test;
+create table t1 (id int);
+create view v1 as select * from t1;
+insert into t1 values (1232131);
+insert into t1 values (4711);
+insert into t1 values (3231);
+insert into t1 values (0815);
+-- MySQL dump 10.10
+--
+-- Host: localhost    Database: test
+-- ------------------------------------------------------
+-- Server version	5.0.22-debug-log
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!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 */;
+
+--
+-- Current Database: `test`
+--
+
+/*!40000 DROP DATABASE IF EXISTS `test`*/;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `test`;
+
+--
+-- Table structure for table `t1`
+--
+
+DROP TABLE IF EXISTS `t1`;
+CREATE TABLE `t1` (
+  `id` int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `t1`
+--
+
+
+/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
+LOCK TABLES `t1` WRITE;
+INSERT INTO `t1` VALUES (1232131),(4711),(3231),(815);
+UNLOCK TABLES;
+/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
+
+--
+-- Temporary table structure for view `v1`
+--
+
+DROP TABLE IF EXISTS `v1`;
+/*!50001 DROP VIEW IF EXISTS `v1`*/;
+/*!50001 CREATE TABLE `v1` (
+  `id` int(11)
+) */;
+
+--
+-- Final view structure for view `v1`
+--
+
+/*!50001 DROP TABLE IF EXISTS `v1`*/;
+/*!50001 DROP VIEW IF EXISTS `v1`*/;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `v1` AS select `t1`.`id` AS `id` from `t1` */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!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 */;
+
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 4076fd258e9..01eb826881e 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1143,3 +1143,18 @@ show create procedure p;
 drop function f;
 drop procedure p;
 
+#
+# BUG#17201 Spurious 'DROP DATABASE' in output,
+# also confusion between tables and views.
+# Example code from Markus Popp
+
+drop database if exists test;
+create database test;
+use test;
+create table t1 (id int);
+create view v1 as select * from t1;
+insert into t1 values (1232131);
+insert into t1 values (4711);
+insert into t1 values (3231);
+insert into t1 values (0815);
+--exec $MYSQL_DUMP --add-drop-database --databases test
-- 
cgit v1.2.1


From 01c1eaa26e429139a55d5fd5c83380550980e2e6 Mon Sep 17 00:00:00 2001
From: "grog@mysql.com" <>
Date: Fri, 26 May 2006 11:00:35 +0930
Subject: mysqldump.result:   Get output from modified test (dropping t1).
 mysqldump.test:   Drop t1 at end so that the next test doesn't trip over it.

---
 mysql-test/r/mysqldump.result | 1 +
 mysql-test/t/mysqldump.test   | 1 +
 2 files changed, 2 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 135c2f7abd4..099304fe6e7 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -2803,3 +2803,4 @@ DROP TABLE IF EXISTS `v1`;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+drop view v1;
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 01eb826881e..b7a714815b7 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1158,3 +1158,4 @@ insert into t1 values (4711);
 insert into t1 values (3231);
 insert into t1 values (0815);
 --exec $MYSQL_DUMP --add-drop-database --databases test
+drop view v1;
-- 
cgit v1.2.1


From c46b17a7310da72ff2f36702831c0b261ef44f2a Mon Sep 17 00:00:00 2001
From: "aivanov@mysql.com" <>
Date: Tue, 6 Jun 2006 23:37:42 +0400
Subject: Applied innodb-5.0-ss609 snapshot.  Fixed BUG#19727 "InnoDB crashed
 server and crashed tables  are not recoverable".

---
 mysql-test/t/innodb.test | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index e4c8bf89cca..71b178d0e57 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -2196,3 +2196,16 @@ drop table t2, t1;
 #
 --error ER_TABLE_CANT_HANDLE_SPKEYS
 create table t1 (g geometry not null, spatial gk(g)) engine=innodb;
+
+#######################################################################
+#                                                                     #
+# Please, DO NOT TOUCH this file as well as the innodb.result file.   #
+# These files are to be modified ONLY BY INNOBASE guys.               #
+#                                                                     #
+# Use innodb_mysql.[test|result] files instead.                       #
+#                                                                     #
+# If nevertheless you need to make some changes here, please, forward #
+# your commit message To: dev@innodb.com Cc: dev-innodb@mysql.com     #
+# (otherwise your changes may be erased).                             #
+#                                                                     #
+#######################################################################
-- 
cgit v1.2.1


From 2fcf737febd19caaec09910068331eb612782ed8 Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.ndb.mysql.com" <>
Date: Wed, 14 Jun 2006 20:16:32 +0200
Subject: Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA
 LOCAL - make sure to disable bulk insert when check for duplicate key is
 needed

---
 mysql-test/r/ndb_loaddatalocal.result | 46 +++++++++++++++++++++++
 mysql-test/t/ndb_loaddatalocal.test   | 70 +++++++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 mysql-test/r/ndb_loaddatalocal.result
 create mode 100644 mysql-test/t/ndb_loaddatalocal.test

(limited to 'mysql-test')

diff --git a/mysql-test/r/ndb_loaddatalocal.result b/mysql-test/r/ndb_loaddatalocal.result
new file mode 100644
index 00000000000..1d15c608f03
--- /dev/null
+++ b/mysql-test/r/ndb_loaddatalocal.result
@@ -0,0 +1,46 @@
+DROP TABLE IF EXISTS t1;
+create table t1(a int) engine=myisam;
+select * into outfile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;
+drop table t1;
+create table t1(a int) engine=ndb;
+load data local infile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
+select count(*) from t1;
+count(*)
+10000
+drop table t1;
+create table t1(a int) engine=myisam;
+insert into t1 values (1), (2), (2), (3);
+select * into outfile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;
+drop table t1;
+create table t1(a int primary key) engine=ndb;
+load data local infile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
+select * from t1 order by a;
+a
+1
+2
+3
+drop table t1;
+create table t1(a int) engine=myisam;
+insert into t1 values (1), (1), (2), (3);
+select * into outfile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;
+drop table t1;
+create table t1(a int primary key) engine=ndb;
+load data local infile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
+select * from t1 order by a;
+a
+1
+2
+3
+drop table t1;
+create table t1(a int) engine=myisam;
+insert into t1 values (1), (2), (3), (3);
+select * into outfile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;
+drop table t1;
+create table t1(a int primary key) engine=ndb;
+load data local infile 'MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
+select * from t1 order by a;
+a
+1
+2
+3
+drop table t1;
diff --git a/mysql-test/t/ndb_loaddatalocal.test b/mysql-test/t/ndb_loaddatalocal.test
new file mode 100644
index 00000000000..47054ecfbf5
--- /dev/null
+++ b/mysql-test/t/ndb_loaddatalocal.test
@@ -0,0 +1,70 @@
+-- source include/have_ndb.inc
+-- source include/not_embedded.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+create table t1(a int) engine=myisam;
+let $1=10000;
+disable_query_log;
+set SQL_LOG_BIN=0;
+while ($1)
+{
+ insert into t1 values(1);
+ dec $1;
+}
+set SQL_LOG_BIN=1;
+enable_query_log;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval select * into outfile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;
+#This will generate a 20KB file, now test LOAD DATA LOCAL
+drop table t1;
+
+create table t1(a int) engine=ndb;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
+select count(*) from t1;
+system rm $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile ;
+drop table t1;
+
+create table t1(a int) engine=myisam;
+insert into t1 values (1), (2), (2), (3);
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval select * into outfile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;
+drop table t1;
+
+create table t1(a int primary key) engine=ndb;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
+system rm $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile;
+select * from t1 order by a;
+drop table t1;
+
+create table t1(a int) engine=myisam;
+insert into t1 values (1), (1), (2), (3);
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval select * into outfile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;
+drop table t1;
+
+create table t1(a int primary key) engine=ndb;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
+system rm $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile;
+select * from t1 order by a;
+drop table t1;
+
+create table t1(a int) engine=myisam;
+insert into t1 values (1), (2), (3), (3);
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval select * into outfile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' from t1;
+drop table t1;
+
+create table t1(a int primary key) engine=ndb;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+eval load data local infile '$MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile' into table t1;
+system rm $MYSQLTEST_VARDIR/master-data/ndb_loaddatalocal.select_outfile;
+select * from t1 order by a;
+drop table t1;
+
+# End of 4.1 tests
-- 
cgit v1.2.1


From 1d1c42e0a77a62cfb919f2ee4805f73774a5dfc6 Mon Sep 17 00:00:00 2001
From: "lars@mysql.com" <>
Date: Thu, 15 Jun 2006 11:55:53 +0200
Subject: BUG#17201: Removed version number from test case output

---
 mysql-test/r/mysqldump.result | 28 ----------------------------
 mysql-test/t/mysqldump.test   |  2 +-
 2 files changed, 1 insertion(+), 29 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 099304fe6e7..ad31b8e2a65 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -2727,11 +2727,6 @@ insert into t1 values (1232131);
 insert into t1 values (4711);
 insert into t1 values (3231);
 insert into t1 values (0815);
--- MySQL dump 10.10
---
--- Host: localhost    Database: test
--- ------------------------------------------------------
--- Server version	5.0.22-debug-log
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2744,50 +2739,27 @@ insert into t1 values (0815);
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
---
--- Current Database: `test`
---
-
 /*!40000 DROP DATABASE IF EXISTS `test`*/;
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
 
 USE `test`;
-
---
--- Table structure for table `t1`
---
-
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `id` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
---
--- Dumping data for table `t1`
---
-
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 LOCK TABLES `t1` WRITE;
 INSERT INTO `t1` VALUES (1232131),(4711),(3231),(815);
 UNLOCK TABLES;
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
-
---
--- Temporary table structure for view `v1`
---
-
 DROP TABLE IF EXISTS `v1`;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 CREATE TABLE `v1` (
   `id` int(11)
 ) */;
-
---
--- Final view structure for view `v1`
---
-
 /*!50001 DROP TABLE IF EXISTS `v1`*/;
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index b7a714815b7..4113c136e17 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1157,5 +1157,5 @@ insert into t1 values (1232131);
 insert into t1 values (4711);
 insert into t1 values (3231);
 insert into t1 values (0815);
---exec $MYSQL_DUMP --add-drop-database --databases test
+--exec $MYSQL_DUMP --skip-comments --add-drop-database --databases test
 drop view v1;
-- 
cgit v1.2.1