bk commit into 5.0 tree (msvensson:1.2234)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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-07-24 16:29:28+02:00, msvensson@neptunus.(none) +2 -0
  mysqldump - send stderr to result file for two testcases that generate error output 

  mysql-test/r/mysqldump.result@stripped, 2006-07-24 16:29:26+02:00, msvensson@neptunus.(none) +4 -0
    Send stderr to result file

  mysql-test/t/mysqldump.test@stripped, 2006-07-24 16:29:26+02:00, msvensson@neptunus.(none) +3 -2
    Send stderr to result file

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/my50-m-bug17089

--- 1.103/mysql-test/r/mysqldump.result	2006-07-24 16:29:32 +02:00
+++ 1.104/mysql-test/r/mysqldump.result	2006-07-24 16:29:32 +02:00
@@ -2635,6 +2635,8 @@ create table t3(a int);
 /*!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' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+mysqldump: Couldn't find table: "non_existing"
+
 DROP TABLE IF EXISTS `t3`;
 CREATE TABLE `t3` (
   `a` int(11) default NULL
@@ -2744,6 +2746,8 @@ create table t1 ( id serial );
 create view v1 as select * from t1;
 drop table t1;
 mysqldump {
+mysqldump: Got error: 1356: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them when using LOCK TABLES
+mysqldump: mysqldump: Couldn't execute 'SHOW FIELDS FROM `v1`': View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them (1356)
 
 -- failed on view `v1`: CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `test`.`t1`.`id` AS `id` from `t1`
 

--- 1.96/mysql-test/t/mysqldump.test	2006-07-24 16:29:32 +02:00
+++ 1.97/mysql-test/t/mysqldump.test	2006-07-24 16:29:32 +02:00
@@ -1080,7 +1080,7 @@ create table t1(a int);
 create table t2(a int);
 create table t3(a int);
 --error 6
---exec $MYSQL_DUMP --skip-comments --force --no-data test t3 t1 non_existing t2
+--exec $MYSQL_DUMP --skip-comments --force --no-data test t3 t1 non_existing t2 2>&1
 drop table t1, t2, t3;
 
 --echo End of 4.1 tests
@@ -1191,7 +1191,7 @@ drop table t1;
 # mysqldump gets 1356 from server, but gives us 2
 --echo mysqldump {
 --error 2
---exec $MYSQL_DUMP --force -N --compact --skip-comments test
+--exec $MYSQL_DUMP --force -N --compact --skip-comments test 2>&1
 --echo } mysqldump
 drop view v1;
 
@@ -1228,3 +1228,4 @@ drop view nasishnasifu;
 drop database mysqldump_views;
 drop table mysqldump_tables.basetable;
 drop database mysqldump_tables;
+