bk commit into 5.0 tree (ramil:1.1945)

[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.1945 05/09/13 16:11:21 ramil@stripped +2 -0
  Grep known strings in order to ignore others and make the test repeatable
  (my_print_defaults prints /etc/my.cnf and ~/.my.cnf content as well).

  mysql-test/t/mysqldump.test
    1.60 05/09/13 16:11:04 ramil@stripped +3 -3
    Grep known strings in order to ignore others and make the test repeatable
    (my_print_defaults prints /etc/my.cnf and ~/.my.cnf content as well).

  mysql-test/r/mysqldump.result
    1.67 05/09/13 16:11:04 ramil@stripped +2 -2
    Grep known strings in order to ignore others and make the test repeatable
    (my_print_defaults prints /etc/my.cnf and ~/.my.cnf content as well).

# 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/mysql-5.0

--- 1.66/mysql-test/r/mysqldump.result	2005-09-12 12:09:39 +05:00
+++ 1.67/mysql-test/r/mysqldump.result	2005-09-13 16:11:04 +05:00
@@ -1875,8 +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
+--port=my_dummy_port
+--port=my_dummy_port
 DROP TABLE IF EXISTS `test1`;
 Warnings:
 Note	1051	Unknown table 'test1'

--- 1.59/mysql-test/t/mysqldump.test	2005-09-12 12:09:39 +05:00
+++ 1.60/mysql-test/t/mysqldump.test	2005-09-13 16:11:04 +05:00
@@ -768,9 +768,9 @@
 #
 
 --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 echo "port=my_dummy_port" >> $MYSQL_TEST_DIR/var/tmp/tmp.cnf
+--exec $MYSQL_MY_PRINT_DEFAULTS -c $MYSQL_TEST_DIR/var/tmp/tmp.cnf client | grep my_dummy_port
+--exec $MYSQL_MY_PRINT_DEFAULTS -e $MYSQL_TEST_DIR/var/tmp/tmp.cnf client | grep my_dummy_port
 --exec rm $MYSQL_TEST_DIR/var/tmp/tmp.cnf
 
 #