bk commit into 5.0 tree (tnurnberg:1.2198)

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.0 repository of tnurnberg. When tnurnberg 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.2198 06/06/26 16:15:41 tnurnberg@stripped +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
  into  mysql.com:/home/tnurnberg/mysql-5.0-maint-18462

  client/mysqldump.c
    1.232 06/06/26 16:15:36 tnurnberg@stripped +0 -0
    SCCS merged

  mysql-test/t/mysqldump.test
    1.92 06/06/26 16:07:25 tnurnberg@stripped +0 -0
    Auto merged

  mysql-test/r/mysqldump.result
    1.100 06/06/26 16:07:25 tnurnberg@stripped +0 -0
    Auto merged

# 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:	tnurnberg
# Host:	salvation.intern.azundris.com
# Root:	/home/tnurnberg/mysql-5.0-maint-18462/RESYNC

--- 1.231/client/mysqldump.c	2006-06-20 13:56:34 +02:00
+++ 1.232/client/mysqldump.c	2006-06-26 16:15:36 +02:00
@@ -1585,6 +1585,9 @@
         }
         mysql_free_result(result);
 
+        if (path)
+          my_fclose(sql_file, MYF(MY_WME));
+
         seen_views= 1;
         DBUG_RETURN(0);
       }

--- 1.99/mysql-test/r/mysqldump.result	2006-06-20 23:17:01 +02:00
+++ 1.100/mysql-test/r/mysqldump.result	2006-06-26 16:07:25 +02:00
@@ -2743,6 +2743,25 @@
 drop trigger tr1;
 drop trigger tr2;
 drop table t1, t2;
+create table t (qty int, price int);
+insert into t values(3, 50);
+insert into t values(5, 51);
+create view v1 as select qty, price, qty*price as value from t;
+create view v2 as select qty from v1;
+mysqldump {
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `v1` AS select `t`.`qty` AS `qty`,`t`.`price` AS `price`,(`t`.`qty` * `t`.`price`) AS `value` from `t` */;
+
+} mysqldump {
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
+/*!50001 VIEW `v2` AS select `v1`.`qty` AS `qty` from `v1` */;
+
+} mysqldump
+drop view v1;
+drop view v2;
+drop table t;
 /*!50003 CREATE FUNCTION `f`() RETURNS bigint(20)
 return 42 */|
 /*!50003 CREATE PROCEDURE `p`()

--- 1.91/mysql-test/t/mysqldump.test	2006-06-20 23:17:01 +02:00
+++ 1.92/mysql-test/t/mysqldump.test	2006-06-26 16:07:25 +02:00
@@ -1146,6 +1146,27 @@
 
 
 #
+# Bug#18462 mysqldump does not dump view structures correctly
+#
+#
+create table t (qty int, price int);
+insert into t values(3, 50);
+insert into t values(5, 51);
+create view v1 as select qty, price, qty*price as value from t;
+create view v2 as select qty from v1;
+--echo mysqldump {
+--exec $MYSQL_DUMP --compact -F --tab . test
+--exec cat v1.sql
+--echo } mysqldump {
+--exec cat v2.sql
+--echo } mysqldump
+--rm v.sql t.sql t.txt
+drop view v1;
+drop view v2;
+drop table t;
+
+
+#
 # Bug#14857 Reading dump files with single statement stored routines fails.
 # fixed by patch for bug#16878
 #