bzr commit into mysql-6.0-backup branch (cbell:2686) Bug#38374

[Chuck Bell]

#At file:///D:/source/bzr/mysql-6.0-rpl/

 2686 Chuck Bell	2008-07-25
      BUG#38374 Service interface throwing assertions in mysql-6.0-rpl tree after patch 
      
      Code throws assertion because the mysys_var settings were changed in the 
      ViewBaseObjectsIterator::create() method. The mysys_var must be set to
      NULL so that store_globals() can correctly reset it.
modified:
  sql/si_objects.cc

per-file messages:
  sql/si_objects.cc
    Added set mysys_var to NULL for reset in store_globals().
=== modified file 'sql/si_objects.cc'
--- a/sql/si_objects.cc	2008-07-09 07:12:43 +0000
+++ b/sql/si_objects.cc	2008-07-25 12:39:39 +0000
@@ -1400,6 +1400,13 @@ ViewBaseObjectsIterator::create(THD *thd
   close_thread_tables(my_thd);
   delete my_thd;
 
+  /*
+    The mysys_var context is no longer valid and must be reset.
+  */
+  pthread_mutex_lock(&thd->LOCK_delete);
+  thd->mysys_var= NULL;
+  pthread_mutex_unlock(&thd->LOCK_delete);
+
   thd->store_globals();
 
   return new ViewBaseObjectsIterator(table_names);