From d0c58cd83c6dbf1444d018209517559a81bb9341 Mon Sep 17 00:00:00 2001
From: unknown <lars@mysql.com>
Date: Mon, 19 Jun 2006 13:23:13 +0200
Subject: [PATCH] BUG#17201 Changed to other database (BUG#20531 hinders usage
 of 'test' database)

mysql-test/r/mysqldump.result:
  Changed to other database (BUG#20531 hinders usage of 'test' database)
mysql-test/t/mysqldump.test:
  Changed to other database (BUG#20531 hinders usage of 'test' database)
---
 mysql-test/r/mysqldump.result | 13 +++++++------
 mysql-test/t/mysqldump.test   |  9 +++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index ad31b8e2a65..048a60d70e8 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -2718,9 +2718,8 @@ 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 database mysqldump_test_db;
+use mysqldump_test_db;
 create table t1 (id int);
 create view v1 as select * from t1;
 insert into t1 values (1232131);
@@ -2739,11 +2738,11 @@ 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 */;
 
-/*!40000 DROP DATABASE IF EXISTS `test`*/;
+/*!40000 DROP DATABASE IF EXISTS `mysqldump_test_db`*/;
 
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CHARACTER SET latin1 */;
 
-USE `test`;
+USE `mysqldump_test_db`;
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
   `id` int(11) default NULL
@@ -2776,3 +2775,5 @@ DROP TABLE IF EXISTS `v1`;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 drop view v1;
+drop table t1;
+drop database mysqldump_test_db;
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 4113c136e17..f1baa04ad99 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1148,14 +1148,15 @@ drop procedure p;
 # also confusion between tables and views.
 # Example code from Markus Popp
 
-drop database if exists test;
-create database test;
-use test;
+create database mysqldump_test_db;
+use mysqldump_test_db;
 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 --skip-comments --add-drop-database --databases test
+--exec $MYSQL_DUMP --skip-comments --add-drop-database --databases mysqldump_test_db
 drop view v1;
+drop table t1;
+drop database mysqldump_test_db;