bk commit into 5.0 tree (SergeyV:1.2042) BUG#15943

[sergeyv]

Below is the list of changes that have just been committed into a local
5.0 repository of sergeyv. When sergeyv 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.2042 06/02/13 19:53:34 SergeyV@selena. +3 -0
  Fixes bug #15943. resets error flag for show create view command, to allow 
  proper processing of multiple sql statements sent as a single command.

  sql/sql_show.cc
    1.308 06/02/13 19:53:24 SergeyV@selena. +7 -0
    Fixes bug #15943. resets error flag for show create view command, to allow 
    proper processing of multiple sql statements sent as a single command.

  mysql-test/t/view.test
    1.135 06/02/13 19:53:23 SergeyV@selena. +15 -0
    test case added for bug #15943

  mysql-test/r/view.result
    1.146 06/02/13 19:53:22 SergeyV@selena. +10 -0
    result file update for #15943 test case

# 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:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/#15943-mysql-5.0

--- 1.307/sql/sql_show.cc	2006-01-29 04:43:08 +03:00
+++ 1.308/sql/sql_show.cc	2006-02-13 19:53:24 +03:00
@@ -365,6 +365,13 @@
   {
     if (!table_list->view || thd->net.last_errno != ER_VIEW_INVALID)
       DBUG_RETURN(TRUE);
+
+    /* 
+       Need this for proper processing of multiple sql statements        
+       sent as single command     
+    */    
+    thd->net.report_error= 0;
+
     /*
       Clear all messages with 'error' level status and
       issue a warning with 'warning' level status in 

--- 1.145/mysql-test/r/view.result	2006-02-02 07:43:37 +03:00
+++ 1.146/mysql-test/r/view.result	2006-02-13 19:53:22 +03:00
@@ -2538,3 +2538,13 @@
 Warning	1052	Column 'x' in group statement is ambiguous
 DROP VIEW v1;
 DROP TABLE t1;
+drop table if exists t1; 
+drop view if exists v1; 
+create table t1 (id int); 
+create view v1 as select * from t1; 
+drop table t1; 
+show create view v1; 
+drop view v1;
+//
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1`
AS select sql_no_cache `test`.`t1`.`id` AS `id` from `t1`

--- 1.134/mysql-test/t/view.test	2006-02-02 07:43:37 +03:00
+++ 1.135/mysql-test/t/view.test	2006-02-13 19:53:23 +03:00
@@ -2380,3 +2380,18 @@
 
 DROP VIEW v1;
 DROP TABLE t1;
+
+#
+# BUG#15943: mysql_next_result hangs on invalid SHOW CREATE VIEW
+#
+
+delimiter //;
+drop table if exists t1; 
+drop view if exists v1; 
+create table t1 (id int); 
+create view v1 as select * from t1; 
+drop table t1; 
+show create view v1; 
+drop view v1;
+//
+delimiter ;//