From: Alexey Botchkov
Date: June 4 2009 6:27pm
Subject: bzr commit into mysql-5.1-bugteam branch (holyfoot:2925) Bug#43733
List-Archive: http://lists.mysql.com/commits/75649
X-Bug: 43733
Message-Id: <20090604182729.A0F8F2C380D9@hfmain.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_isOyJZG/Emh+O/JQgyZkWQ)"

--Boundary_(ID_isOyJZG/Emh+O/JQgyZkWQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/hf/work/mysql_common/43733/ based on revid:alik@stripped

 2925 Alexey Botchkov	2009-06-04
      Bug#43733      Select on processlist let the embedded server crash (concurrent_innodb_safelog)
          the thread->mysys_var parameter should be empty for the idle
          embedded-server threads so that working threads can safely free
          this memory.
      
      per-file comments:
        libmysqld/lib_sql.cc
      Bug#43733      Select on processlist let the embedded server crash (concurrent_innodb_safelog)
          set thread->mysys_var= 0 after the query is handled
      
        mysql-test/include/concurrent.inc
      Bug#43733      Select on processlist let the embedded server crash (concurrent_innodb_safelog)
          enable these for the embedded-server mode
      
        sql/sql_show.cc
      Bug#43733      Select on processlist let the embedded server crash (concurrent_innodb_safelog)
          show thread lock status in the query result

    modified:
      libmysqld/lib_sql.cc
      mysql-test/include/concurrent.inc
      sql/sql_show.cc
=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2009-02-24 11:29:49 +0000
+++ b/libmysqld/lib_sql.cc	2009-06-04 18:27:00 +0000
@@ -142,6 +142,8 @@ emb_advanced_command(MYSQL *mysql, enum 
   if (!skip_check)
     result= thd->is_error() ? -1 : 0;
 
+  thd->mysys_var= 0;
+
 #if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
   thd->profiling.finish_current_query();
 #endif
@@ -634,6 +636,7 @@ void *create_embedded_thd(int client_fla
 
   thread_count++;
   threads.append(thd);
+  thd->mysys_var= 0;
   return thd;
 err:
   delete(thd);

=== modified file 'mysql-test/include/concurrent.inc'
--- a/mysql-test/include/concurrent.inc	2009-05-15 10:15:56 +0000
+++ b/mysql-test/include/concurrent.inc	2009-06-04 18:27:00 +0000
@@ -25,8 +25,6 @@
 #               new wrapper t/concurrent_innodb_safelog.test
 #
 
---source include/not_embedded.inc
-
 connection default;
 #
 # Show prerequisites for this test.

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2009-05-15 12:57:51 +0000
+++ b/sql/sql_show.cc	2009-06-04 18:27:00 +0000
@@ -1888,7 +1888,7 @@ int fill_schema_processlist(THD* thd, TA
                     tmp->mysys_var->current_cond ?
                     "Waiting on cond" : NullS);
 #else
-      val= (char *) "Writing to net";
+      val= (char *) (tmp->proc_info ? tmp->proc_info : NullS);
 #endif
       if (val)
       {


--Boundary_(ID_isOyJZG/Emh+O/JQgyZkWQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/holyfoot@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/holyfoot@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: holyfoot@stripped
# target_branch: file:///home/hf/work/mysql_common/43733/
# testament_sha1: b531def7ce673c3c1c2b4b5274f99d974fb2ecc1
# timestamp: 2009-06-04 23:27:29 +0500
# base_revision_id: alik@stripped
# 
# Begin bundle
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
VAaeIIknL/i7kinChIYYazRw


--Boundary_(ID_isOyJZG/Emh+O/JQgyZkWQ)--