From: Jorgen Loland
Date: November 11 2010 3:32pm
Subject: bzr commit into mysql-5.5-bugteam branch (jorgen.loland:3120) Bug#54812
List-Archive: http://lists.mysql.com/commits/123639
X-Bug: 54812
Message-Id: <20101111153221.53E42169D@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5551532144992515521=="

--===============5551532144992515521==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/jl208045/mysql/mysql-5.5-bugteam-54812/ based on revid:svoj@stripped

 3120 Jorgen Loland	2010-11-11
      Bug#54812: assert in Diagnostics_area::set_ok_status 
                 during EXPLAIN
      
      Before the patch, send_eof() of some subclasses of 
      select_result (e.g., select_send::send_eof()) could 
      handle being called after an error had occured while others 
      could not. The methods that were not well-behaved would trigger
      an ASSERT on debug builds. Release builds were not affected.
      
      Consider the following query as an example for how the ASSERT
      could be triggered:
      
      A user without execute privilege on f() does
         SELECT MAX(key1) INTO @dummy FROM t1 WHERE f() < 1;
      resulting in "ERROR 42000: execute command denied to user..." 
      
      The server would end the query by calling send_eof(). The 
      fact that the error had occured would make the ASSERT trigger. 
      
      select_dumpvar::send_eof() was the offending method in the
      bug report, but the problem also applied to other 
      subclasses of select_result. This patch uniforms send_eof() 
      of all subclasses of select_result to handle being called 
      after an error has occured. 
     @ mysql-test/r/not_embedded_server.result
        Added test for BUG#54812
     @ mysql-test/t/not_embedded_server.test
        Added test for BUG#54812
     @ sql/sql_class.cc
        Make send_eof() of all subclasses of select_result handle being
        called after an error has occured.
     @ sql/sql_insert.cc
        Make send_eof() of all subclasses of select_result handle being
        called after an error has occured.
     @ sql/sql_prepare.cc
        Make send_eof() of all subclasses of select_result handle being
        called after an error has occured.
     @ sql/sql_update.cc
        Make send_eof() of all subclasses of select_result handle being
        called after an error has occured.

    modified:
      mysql-test/r/not_embedded_server.result
      mysql-test/t/not_embedded_server.test
      sql/sql_class.cc
      sql/sql_insert.cc
      sql/sql_prepare.cc
      sql/sql_update.cc
=== modified file 'mysql-test/r/not_embedded_server.result'
--- a/mysql-test/r/not_embedded_server.result	2009-12-04 23:02:48 +0000
+++ b/mysql-test/r/not_embedded_server.result	2010-11-11 15:32:17 +0000
@@ -14,3 +14,32 @@ flush privileges;
 ERROR HY000: Table 'host' was not locked with LOCK TABLES
 unlock tables;
 drop table t1;
+#
+# Bug#54812: assert in Diagnostics_area::set_ok_status during EXPLAIN
+#
+CREATE USER nopriv_user@localhost;
+connection: default
+DROP TABLE IF EXISTS t1,t2,t3;
+DROP FUNCTION IF EXISTS f;
+CREATE TABLE t1 (key1 INT PRIMARY KEY);
+CREATE TABLE t2 (key2 INT);
+INSERT INTO t1 VALUES (1),(2);
+CREATE FUNCTION f() RETURNS INT RETURN 1;
+GRANT FILE ON *.* TO 'nopriv_user'@'localhost';
+FLUSH PRIVILEGES;
+connection: con1
+SELECT MAX(key1) FROM t1 WHERE f() < 1 INTO OUTFILE 'mytest';
+ERROR 42000: execute command denied to user 'nopriv_user'@'localhost' for routine 'test.f'
+INSERT INTO t2 SELECT MAX(key1) FROM t1 WHERE f() < 1;
+ERROR 42000: execute command denied to user 'nopriv_user'@'localhost' for routine 'test.f'
+SELECT MAX(key1) INTO @dummy FROM t1 WHERE f() < 1;
+ERROR 42000: execute command denied to user 'nopriv_user'@'localhost' for routine 'test.f'
+CREATE TABLE t3 (i INT) AS SELECT MAX(key1) FROM t1 WHERE f() < 1;
+ERROR 42000: execute command denied to user 'nopriv_user'@'localhost' for routine 'test.f'
+connection: default
+DROP TABLE t1,t2;
+DROP FUNCTION f;
+DROP USER nopriv_user@localhost;
+#
+# End Bug#54812
+#

=== modified file 'mysql-test/t/not_embedded_server.test'
--- a/mysql-test/t/not_embedded_server.test	2009-12-04 23:02:48 +0000
+++ b/mysql-test/t/not_embedded_server.test	2010-11-11 15:32:17 +0000
@@ -54,3 +54,57 @@ lock tables t1 read;
 flush privileges;
 unlock tables;
 drop table t1;
+
+--echo #
+--echo # Bug#54812: assert in Diagnostics_area::set_ok_status during EXPLAIN
+--echo #
+
+CREATE USER nopriv_user@localhost;
+
+connection default;
+--echo connection: default
+
+--disable_warnings
+DROP TABLE IF EXISTS t1,t2,t3;
+DROP FUNCTION IF EXISTS f;
+--enable_warnings
+
+CREATE TABLE t1 (key1 INT PRIMARY KEY);
+CREATE TABLE t2 (key2 INT);
+INSERT INTO t1 VALUES (1),(2);
+
+CREATE FUNCTION f() RETURNS INT RETURN 1;
+
+GRANT FILE ON *.* TO 'nopriv_user'@'localhost';
+
+FLUSH PRIVILEGES;
+
+connect (con1,localhost,nopriv_user,,);
+connection con1;
+--echo connection: con1
+
+--error ER_PROCACCESS_DENIED_ERROR
+SELECT MAX(key1) FROM t1 WHERE f() < 1 INTO OUTFILE 'mytest';
+
+--error ER_PROCACCESS_DENIED_ERROR
+INSERT INTO t2 SELECT MAX(key1) FROM t1 WHERE f() < 1;
+
+--error ER_PROCACCESS_DENIED_ERROR
+SELECT MAX(key1) INTO @dummy FROM t1 WHERE f() < 1;
+
+--error ER_PROCACCESS_DENIED_ERROR
+CREATE TABLE t3 (i INT) AS SELECT MAX(key1) FROM t1 WHERE f() < 1;
+
+disconnect con1;
+--source include/wait_until_disconnected.inc
+
+connection default;
+--echo connection: default
+
+DROP TABLE t1,t2;
+DROP FUNCTION f;
+DROP USER nopriv_user@localhost;
+
+--echo #
+--echo # End Bug#54812
+--echo #

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2010-10-23 13:09:27 +0000
+++ b/sql/sql_class.cc	2010-11-11 15:32:17 +0000
@@ -1841,6 +1841,13 @@ void select_to_file::send_error(uint err
 
 bool select_to_file::send_eof()
 {
+  /* 
+    Don't send EOF if we're in error condition (which implies we've already
+    sent or are sending an error)
+  */
+  if (thd->is_error())
+    return TRUE;
+
   int error= test(end_io_cache(&cache));
   if (mysql_file_close(file, MYF(MY_WME)))
     error= 1;
@@ -2881,6 +2888,13 @@ bool select_dumpvar::send_data(List<Item
 
 bool select_dumpvar::send_eof()
 {
+  /* 
+    Don't send EOF if we're in error condition (which implies we've already
+    sent or are sending an error)
+  */
+  if (thd->is_error())
+    return TRUE;
+
   if (! row_count)
     push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                  ER_SP_FETCH_NO_DATA, ER(ER_SP_FETCH_NO_DATA));

=== modified file 'sql/sql_insert.cc'
--- a/sql/sql_insert.cc	2010-10-07 10:01:51 +0000
+++ b/sql/sql_insert.cc	2010-11-11 15:32:17 +0000
@@ -3504,6 +3504,13 @@ bool select_insert::send_eof()
   DBUG_PRINT("enter", ("trans_table=%d, table_type='%s'",
                        trans_table, table->file->table_type()));
 
+  /* 
+    Don't send EOF if we're in error condition (which implies we've already
+    sent or are sending an error)
+  */
+  if (thd->is_error())
+    DBUG_RETURN(TRUE);
+
   error= (thd->locked_tables_mode <= LTM_LOCK_TABLES ?
           table->file->ha_end_bulk_insert() : 0);
   table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
@@ -4047,6 +4054,13 @@ void select_create::send_error(uint errc
 
 bool select_create::send_eof()
 {
+  /* 
+    Don't send EOF if we're in error condition (which implies we've already
+    sent or are sending an error)
+  */
+  if (thd->is_error())
+    return TRUE;
+
   bool tmp=select_insert::send_eof();
   if (tmp)
     abort();

=== modified file 'sql/sql_prepare.cc'
--- a/sql/sql_prepare.cc	2010-11-03 14:15:18 +0000
+++ b/sql/sql_prepare.cc	2010-11-11 15:32:17 +0000
@@ -2898,6 +2898,13 @@ bool Select_fetch_protocol_binary::send_
 
 bool Select_fetch_protocol_binary::send_eof()
 {
+  /* 
+    Don't send EOF if we're in error condition (which implies we've already
+    sent or are sending an error)
+  */
+  if (thd->is_error())
+    return TRUE;
+
   ::my_eof(thd);
   return FALSE;
 }

=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc	2010-10-07 10:01:51 +0000
+++ b/sql/sql_update.cc	2010-11-11 15:32:17 +0000
@@ -2061,6 +2061,13 @@ bool multi_update::send_eof()
   thd_proc_info(thd, "updating reference tables");
 
   /* 
+    Don't send EOF if we're in error condition (which implies we've already
+    sent or are sending an error)
+  */
+  if (thd->is_error())
+    return TRUE;
+
+  /* 
      Does updates for the last n - 1 tables, returns 0 if ok;
      error takes into account killed status gained in do_updates()
   */


--===============5551532144992515521==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jorgen.loland@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jorgen.loland@stripped\
#   6yta8ab5c8ny0jm1
# target_branch: file:///export/home/jl208045/mysql/mysql-5.5-bugteam-\
#   54812/
# testament_sha1: 811355cec62595396bc0e2c32d79cacc86f727c6
# timestamp: 2010-11-11 16:32:21 +0100
# base_revision_id: svoj@stripped
# 
# Begin bundle
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
b3GHR8jW68ni//F3JFOFCQ8cdylw


--===============5551532144992515521==--