bk commit into 5.1 tree (mats:1.2323)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-18 10:08:10+02:00, mats@romeo.(none) +1 -0
  Adding tests lost in the merge.

  mysql-test/t/mysqldump.test@stripped, 2006-09-18 10:08:05+02:00, mats@romeo.(none) +25 -0
    Adding tests lost in the merge.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	romeo.(none)
# Root:	/home/bk/fix-mysql-5.1-new-rpl

--- 1.121/mysql-test/t/mysqldump.test	2006-09-18 10:08:17 +02:00
+++ 1.122/mysql-test/t/mysqldump.test	2006-09-18 10:08:17 +02:00
@@ -719,6 +719,12 @@
 drop table t1;
 
 --echo #
+--echo # BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
+--echo #
+
+--exec $MYSQL_MY_PRINT_DEFAULTS --config-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump
+
+--echo #
 --echo # Bug #19025 mysqldump doesn't correctly dump "auto_increment = [int]"
 --echo #
 create table `t1` (
@@ -1539,6 +1545,25 @@
 # revert back to normal settings
 set time_zone = 'SYSTEM';
 use test;
+
+#####
+#
+# BUG#17201 Spurious 'DROP DATABASE' in output,
+# also confusion between tables and views.
+# Example code from Markus Popp
+
+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 mysqldump_test_db
+drop view v1;
+drop table t1;
+drop database mysqldump_test_db;
 
 --echo #
 --echo # End of 5.1 tests