bk commit into 5.0 tree (ramil:1.1967)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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
  1.1967 05/09/12 12:09:44 ramil@stripped +2 -0
  merging

  mysql-test/t/mysqldump.test
    1.59 05/09/12 12:09:39 ramil@stripped +3 -0
    merging

  mysql-test/r/mysqldump.result
    1.66 05/09/12 12:09:39 ramil@stripped +0 -0
    merging

# 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:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/5.0.b12917/RESYNC

--- 1.65/mysql-test/r/mysqldump.result	2005-09-10 03:47:58 +05:00
+++ 1.66/mysql-test/r/mysqldump.result	2005-09-12 12:09:39 +05:00
@@ -1875,6 +1875,8 @@
 end if;
 end	BEFORE	#	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
 DROP TABLE t1, t2;
+--port=1234
+--port=1234
 DROP TABLE IF EXISTS `test1`;
 Warnings:
 Note	1051	Unknown table 'test1'

--- 1.58/mysql-test/t/mysqldump.test	2005-09-10 03:29:45 +05:00
+++ 1.59/mysql-test/t/mysqldump.test	2005-09-12 12:09:39 +05:00
@@ -763,7 +763,20 @@
 show triggers;
 DROP TABLE t1, t2;
 
+#
+# Bugs #9136, #12917: problems with --defaults-extra-file option
+#
+
+--exec echo "[client]" > $MYSQL_TEST_DIR/var/tmp/tmp.cnf
+--exec echo "port=1234" >> $MYSQL_TEST_DIR/var/tmp/tmp.cnf
+--exec $MYSQL_MY_PRINT_DEFAULTS -c $MYSQL_TEST_DIR/var/tmp/tmp.cnf client
+--exec $MYSQL_MY_PRINT_DEFAULTS -e $MYSQL_TEST_DIR/var/tmp/tmp.cnf client
+--exec rm $MYSQL_TEST_DIR/var/tmp/tmp.cnf
+
+#
 # Test of fix to BUG 12597
+#
+
 DROP TABLE IF EXISTS `test1`;
 CREATE TABLE `test1` (
   `a1` int(11) default NULL