bzr commit into mysql-5.5-next-mr-runtime branch (davi:2914) Bug#47304

[Davi Arnaut]

# At a local mysql-5.5-next-mr-runtime repository of davi

 2914 Davi Arnaut	2009-11-10
      Backport of Bug#47304 to mysql-next-mr
      ------------------------------------------------------------
      revno: 3624
      revision-id: jon.hauglid@stripped
      parent: alik@stripped
      committer: Jon Olav Hauglid <jon.hauglid@stripped>
      branch nick: mysql-6.0-codebase-bugfixing-bug47304
      timestamp: Mon 2009-09-28 18:34:26 +0200
      message:
        Bug #47304 Test main.mdl_sync fails on embedded server
        
        The problem was that SHOW PROCESSLIST was trying to access
        a thread that was not properly running and therefore had an 
        uninitialized mutex.
        
        This patch explicitly resets thd->mysys_var after each embedded
        server command to prevent the mutex from being accessed in an
        illegal state.
        
        The patch also re-enables lock_multi.test and mdl_sync.test for 
        embedded server as they had been disabled because of this bug.

    modified:
      libmysqld/lib_sql.cc
      mysql-test/t/lock_multi.test
=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2009-10-23 11:22:21 +0000
+++ b/libmysqld/lib_sql.cc	2009-11-10 14:00:02 +0000
@@ -138,6 +138,7 @@ emb_advanced_command(MYSQL *mysql, enum 
 
   result= dispatch_command(command, thd, (char *) arg, arg_length);
   thd->cur_data= 0;
+  thd->mysys_var= NULL;
 
   if (!skip_check)
     result= thd->is_error() ? -1 : 0;

=== modified file 'mysql-test/t/lock_multi.test'
--- a/mysql-test/t/lock_multi.test	2009-07-10 23:12:13 +0000
+++ b/mysql-test/t/lock_multi.test	2009-11-10 14:00:02 +0000
@@ -1,5 +1,3 @@
--- source include/not_embedded.inc
-
 # Save the initial number of concurrent sessions
 --source include/count_sessions.inc
 


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