List:Commits« Previous MessageNext Message »
From:marko.makela Date:October 27 2011 12:41pm
Subject:bzr push into mysql-trunk branch (marko.makela:3531 to 3532)
View as plain text  
 3532 Marko Mäkelä	2011-10-27 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/row/row0mysql.c
 3531 Jon Olav Hauglid	2011-10-27
      Bug#13251277 CHECK_GRANT SHOULDN'T LOCK/UNLOCK LOCK_GRANT
                   WITHOUT NEEDING TO
      
      The problem was that check_table_access() was called for each
      stored routine instruction even if the instruction did not use
      any tables. This is a performance problem since
      check_table_access() causes the LOCK_grant rw lock to be taken
      (by calling check_grant()). For example, it caused up to 20 %
      slowdown in a simple stored routine calculating Fibonacci's
      numbers.
      
      This patch fixes the problem by changing the code so that
      check_table_access() is only called for stored routine
      instructions that actually use tables.
      
      The patch doesn't contain a test case since it is hard to test
      for performance improvements in our test framework.

    modified:
      sql/sp_head.cc
=== modified file 'storage/innobase/row/row0mysql.c'
--- a/storage/innobase/row/row0mysql.c	revid:jon.hauglid@oracle.com-20111027121346-er1ze1yx4yh1ijqo
+++ b/storage/innobase/row/row0mysql.c	revid:marko.makela@stripped0111027123916-ga25h0dk0ed1p1aa
@@ -4073,6 +4073,7 @@ end:
 			trx->error_state = DB_SUCCESS;
 			trx_rollback_to_savepoint(trx, NULL);
 			trx->error_state = DB_SUCCESS;
+			err = DB_ERROR;
 			goto funct_exit;
 		}
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marko.makela:3531 to 3532) marko.makela28 Oct