bk commit into 4.1 tree (bar:1.2065)

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar 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.2065 05/03/03 15:43:00 bar@stripped +2 -0
  Bugs: #8063: make test mysqldump [ fail ]
  See mysqldump.test diff for more details

  mysql-test/t/mysqldump.test
    1.25 05/03/03 15:42:55 bar@stripped +8 -1
    Bugs: #8063: make test mysqldump [ fail ]
    See mysqldump.test diff for more details

  mysql-test/r/mysqldump.result
    1.38 05/03/03 15:42:55 bar@stripped +0 -21
    Bugs: #8063: make test mysqldump [ fail ]
    See mysqldump.test diff for more details

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1

--- 1.37/mysql-test/r/mysqldump.result	2005-02-22 15:40:26 +04:00
+++ 1.38/mysql-test/r/mysqldump.result	2005-03-03 15:42:55 +04:00
@@ -441,27 +441,6 @@
 
 /*!40000 ALTER TABLE `t1` DISABLE KEYS */;
 LOCK TABLES `t1` WRITE;
-INSERT INTO `t1` VALUES ('ÄÖÜß');
-UNLOCK TABLES;
-/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL323' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-DROP TABLE IF EXISTS `t1`;
-CREATE TABLE `t1` (
-  `a` char(10) default NULL
-) TYPE=MyISAM;
-
-
-/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
-LOCK TABLES `t1` WRITE;
 INSERT INTO `t1` VALUES ('Ž™šá');
 UNLOCK TABLES;
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;

--- 1.24/mysql-test/t/mysqldump.test	2004-12-27 22:10:26 +04:00
+++ 1.25/mysql-test/t/mysqldump.test	2005-03-03 15:42:55 +04:00
@@ -148,7 +148,14 @@
 CREATE TABLE t1 (a  CHAR(10));
 INSERT INTO t1  VALUES (_latin1 'ÄÖÜß');
 --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments test t1
---exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments
--compatible=mysql323 test t1
+#
+# Bug#8063: make test mysqldump [ fail ]
+# We cannot tes this command because its output depends
+# on --default-character-set incompiled into "mysqldump" program.
+# If the future we can move this command into a separate test with
+# checking that "mysqldump" is compiled with "latin1"
+#
+#--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments
--compatible=mysql323 test t1
 --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments
--compatible=mysql323 --default-character-set=cp850 test t1
 --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments
--default-character-set=cp850 --compatible=mysql323 test t1
 --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments
--default-character-set=utf8 --compatible=mysql323 test t1