bzr commit into mysql-5.1-bugteam branch (holyfoot:2925) Bug#43733

[Alexey Botchkov]

#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)
       {


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