bzr push into mysql-5.0-bugteam branch (bernt.johnsen:2763 to 2764)

[Bernt M. Johnsen]

 2764 Bernt M. Johnsen	2009-02-25 [merge]
      Merged from gca-branch (bug 43111)

    modified:
      mysql-test/r/ps.result
      mysql-test/t/ps.test
 2763 Sergey Glukhov	2009-02-25
      Bug#40345 MySQLDump prefixes view name with database name when view references other db
      print compact view name if the view belongs to the current database
     @ mysql-test/r/information_schema_db.result
        result fix
     @ mysql-test/r/mysqldump.result
        result fix
     @ mysql-test/r/view_grant.result
        result fix
     @ sql/sql_show.cc
        print compact view name if the view belongs to the current database

    modified:
      mysql-test/r/information_schema_db.result
      mysql-test/r/mysqldump.result
      mysql-test/r/view_grant.result
      sql/sql_show.cc
=== modified file 'mysql-test/r/ps.result'
--- a/mysql-test/r/ps.result	2008-07-07 16:00:08 +0000
+++ b/mysql-test/r/ps.result	2009-02-25 10:37:30 +0000
@@ -235,7 +235,7 @@ execute stmt1;
 prepare stmt1 from "insert into t1 select i from t1";
 execute stmt1;
 execute stmt1;
-prepare stmt1 from "select * from t1 into outfile 'f1.txt'";
+prepare stmt1 from "select * from t1 into outfile '<MYSQLTEST_VARDIR>/tmp/f1.txt'";
 execute stmt1;
 deallocate prepare stmt1;
 drop table t1;

=== modified file 'mysql-test/t/ps.test'
--- a/mysql-test/t/ps.test	2008-02-28 14:34:08 +0000
+++ b/mysql-test/t/ps.test	2009-02-25 10:37:30 +0000
@@ -228,6 +228,10 @@ drop table t1;
 # statements or are correctly created and deleted on each execute
 #
 
+--let $outfile=$MYSQLTEST_VARDIR/tmp/f1.txt
+--error 0,1
+--remove_file $outfile
+
 prepare stmt1 from "select 1 into @var";
 execute stmt1;
 execute stmt1;
@@ -238,11 +242,14 @@ execute stmt1;
 prepare stmt1 from "insert into t1 select i from t1";
 execute stmt1;
 execute stmt1;
-prepare stmt1 from "select * from t1 into outfile 'f1.txt'";
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
+eval prepare stmt1 from "select * from t1 into outfile '$outfile'";
 execute stmt1;
 deallocate prepare stmt1;
 drop table t1;
 
+--remove_file $outfile
+
 # 
 # BUG#5242 "Prepared statement names are case sensitive"
 #


Attachment: [text/bzr-bundle] bzr/[e-mail]