bk commit into 5.1 tree (davi:1.2614)

Below is the list of changes that have just been committed into a local 5.1 repository of davi. When davi does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository.
For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@1.2614, 2007-09-29 16:04:31-03:00, davi@moksha.local +1 -0   The fix for BUG 21136 (ChangeSet@1.2611.1.1) introduced a regression that   caused a few tests to fail because the thd->extra_lock wasn't being set to   NULL after the table was unlocked. This poses a serious problem because later   attempts to access thd->extra_lock (now a dangling pointer) will probably   result in a crash (undefined behavior) -- and that's what actually happens   in some test cases.   

  The solution is to set the select_create::m_plock pointee to NULL, which   means that thd->extra_lock is set to NULL when the lock data is not for a   temporary table.

  sql/sql_insert.cc@1.298, 2007-09-29 16:04:24-03:00, davi@moksha.local +4 -2     Set the m_plock pointee to NULL, thus avoiding a dangling thd->extra_lock pointer     in some cases.

diff -Nrup a/sql/sql_insert.cc b/sql/sql_insert.cc

--- a/sql/sql_insert.cc	2007-09-28 18:25:42 -03:00
+++ b/sql/sql_insert.cc	2007-09-29 16:04:24 -03:00

@@ -3653,7 +3653,8 @@ bool select_create::send_eof()

     if (m_plock)
     {
       mysql_unlock_tables(thd, *m_plock);
-      m_plock= 0;
+      *m_plock= NULL;
+      m_plock= NULL;
     }

   if (m_plock)
   {
     mysql_unlock_tables(thd, *m_plock); - m_plock= 0;
+ *m_plock= NULL;
+ m_plock= NULL;

   }  

   if (table)

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Do you need help?

In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software: Learn more about Pantek's Technical Support offerings Place an order for 24/7/365 Technical Support here Learn more about Pantek, who we are, and what we do Chat with a Live Operator Related lists.mysql.com Links announce benchmarks bugs certification cluster commits dotnet gui-tools internals java maxdb myodbc mysql mysqldoc packagers perl plusplus replication win32 Request more information about Pantek