Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

mysql-test/r/mysqldump.result

@@ -2757,9 +2757,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);
@@ -2778,11 +2777,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
@@ -2815,3 +2814,5 @@ DROP TABLE IF EXISTS `v1`;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 drop view v1;
+drop table t1;
+drop database mysqldump_test_db;

mysql-test/t/mysqldump.test

@@ -1166,14 +1166,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;