From: Tor Didriksen
Date: July 20 2011 7:20am
Subject: bzr push into mysql-trunk branch (tor.didriksen:3279 to 3280)
List-Archive: http://lists.mysql.com/commits/140381
Message-Id: <201107200720.p6K7Ks2f009754@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3280 Tor Didriksen	2011-07-20 [merge]
      merge 5.5 => trunk

    modified:
      mysql-test/t/implicit_commit.test
      sql/sql_class.cc
      sql/sql_profile.cc
 3279 Sunny Bains	2011-07-20
      Change type of srv_undo_tablespaces to ulong from ulint. This is because on
      Windows64 they are not the same size.
      
      This coniguration variable was introduced as part of WL#5535.

    modified:
      storage/innobase/include/srv0srv.h
      storage/innobase/srv/srv0srv.c
=== modified file 'mysql-test/t/implicit_commit.test'
--- a/mysql-test/t/implicit_commit.test	2010-02-26 09:58:33 +0000
+++ b/mysql-test/t/implicit_commit.test	2011-07-20 06:50:47 +0000
@@ -1,5 +1,6 @@
 source include/have_innodb.inc;
 source include/not_embedded.inc;
+source include/have_profiling.inc;
 
 SET GLOBAL EVENT_SCHEDULER = OFF;
 SET BINLOG_FORMAT = STATEMENT;

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2011-07-07 09:45:10 +0000
+++ b/sql/sql_class.cc	2011-07-20 07:19:42 +0000
@@ -501,11 +501,11 @@ const char *set_thd_proc_info(void *thd_
     thd= current_thd;
 
   const char *old_info= thd->proc_info;
-  const char *basename= calling_file ? base_name(calling_file) : NULL;
-  DBUG_PRINT("proc_info", ("%s:%d  %s", basename, calling_line, info));
+  DBUG_PRINT("proc_info", ("%s:%d  %s", calling_file, calling_line, info));
 
 #if defined(ENABLED_PROFILING)
-  thd->profiling.status_change(info, calling_function, basename, calling_line);
+  thd->profiling.status_change(info,
+                               calling_function, calling_file, calling_line);
 #endif
   thd->proc_info= info;
 #ifdef HAVE_PSI_THREAD_INTERFACE

=== modified file 'sql/sql_profile.cc'
--- a/sql/sql_profile.cc	2011-06-30 15:50:45 +0000
+++ b/sql/sql_profile.cc	2011-07-20 07:19:42 +0000
@@ -294,7 +294,7 @@ void QUERY_PROFILE::new_status(const cha
   DBUG_ASSERT(status_arg != NULL);
 
   if ((function_arg != NULL) && (file_arg != NULL))
-    prof= new PROF_MEASUREMENT(this, status_arg, function_arg, file_arg, line_arg);
+    prof= new PROF_MEASUREMENT(this, status_arg, function_arg, base_name(file_arg), line_arg);
   else
     prof= new PROF_MEASUREMENT(this, status_arg);
 

No bundle (reason: useless for push emails).