Merge lp:~percona-dev/percona-server/release-5.1.50-12-bug_fix_658274 into lp:percona-server/release-5.1.50-12

[Oleg Tsarev]

[Vadim Tkachenko (vadim-tk)]

ok

review: Approve

=== modified file 'response-time-distribution.patch'
--- response-time-distribution.patch	2010-10-19 00:14:36 +0000
+++ response-time-distribution.patch	2010-10-19 01:28:40 +0000
@@ -6,8 +6,8 @@
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
 diff -ruN a/include/mysql_com.h b/include/mysql_com.h
---- a/include/mysql_com.h	2010-09-14 20:27:52.000000000 +0000
-+++ b/include/mysql_com.h	2010-09-14 20:31:41.000000000 +0000
+--- a/include/mysql_com.h	2010-10-16 07:28:32.000000000 +0400
++++ b/include/mysql_com.h	2010-10-16 07:29:04.000000000 +0400
 @@ -128,10 +128,11 @@
  #define REFRESH_FAST		32768	/* Intern flag */
  
@@ -25,8 +25,8 @@
  #define CLIENT_LONG_PASSWORD	1	/* new more secure passwords */
  #define CLIENT_FOUND_ROWS	2	/* Found instead of affected rows */
 diff -ruN a/patch_info/response-time-distribution.info b/patch_info/response-time-distribution.info
---- a/patch_info/response-time-distribution.info	1970-01-01 00:00:00.000000000 +0000
-+++ b/patch_info/response-time-distribution.info	2010-09-14 20:31:41.000000000 +0000
+--- a/patch_info/response-time-distribution.info	1970-01-01 03:00:00.000000000 +0300
++++ b/patch_info/response-time-distribution.info	2010-10-16 07:29:04.000000000 +0400
 @@ -0,0 +1,9 @@
 +File=response-time-distribution.patch
 +Name=Response time distribution
@@ -38,8 +38,8 @@
 [phone] first version avaliable
 [phone] add column 'total'
 diff -ruN a/sql/lex.h b/sql/lex.h
---- a/sql/lex.h	2010-09-14 20:27:52.000000000 +0000
-+++ b/sql/lex.h	2010-09-14 20:31:41.000000000 +0000
+--- a/sql/lex.h	2010-10-16 07:28:35.000000000 +0400
++++ b/sql/lex.h	2010-10-16 07:29:04.000000000 +0400
 @@ -415,6 +415,7 @@
    { "PURGE",		SYM(PURGE)},
    { "QUARTER",          SYM(QUARTER_SYM)},
@@ -49,8 +49,8 @@
    { "RANGE",            SYM(RANGE_SYM)},
    { "READ",		SYM(READ_SYM)},
 diff -ruN a/sql/Makefile.am b/sql/Makefile.am
---- a/sql/Makefile.am	2010-09-14 20:27:51.000000000 +0000
-+++ b/sql/Makefile.am	2010-09-14 20:31:41.000000000 +0000
+--- a/sql/Makefile.am	2010-10-16 07:28:31.000000000 +0400
++++ b/sql/Makefile.am	2010-10-16 07:29:04.000000000 +0400
 @@ -67,7 +67,7 @@
  			sql_repl.h slave.h rpl_filter.h rpl_injector.h \
  			log_event.h rpl_record.h \
@@ -70,8 +70,8 @@
  			sql_profile.cc \
  			sql_prepare.cc sql_error.cc sql_locale.cc \
 diff -ruN a/sql/Makefile.in b/sql/Makefile.in
---- a/sql/Makefile.in	2010-09-14 20:27:51.000000000 +0000
-+++ b/sql/Makefile.in	2010-09-14 20:31:41.000000000 +0000
+--- a/sql/Makefile.in	2010-10-16 07:28:31.000000000 +0400
++++ b/sql/Makefile.in	2010-10-16 07:29:04.000000000 +0400
 @@ -122,7 +122,7 @@
  	sql_string.$(OBJEXT) sql_manager.$(OBJEXT) sql_map.$(OBJEXT) \
  	mysqld.$(OBJEXT) password.$(OBJEXT) hash_filo.$(OBJEXT) \
@@ -108,8 +108,8 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/repl_failsafe.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpl_filter.Po@am__quote@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
---- a/sql/mysqld.cc	2010-09-14 20:27:52.000000000 +0000
-+++ b/sql/mysqld.cc	2010-09-14 20:32:15.000000000 +0000
+--- a/sql/mysqld.cc	2010-10-16 07:28:35.000000000 +0400
++++ b/sql/mysqld.cc	2010-10-16 07:29:04.000000000 +0400
 @@ -32,6 +32,8 @@
  
  #include "rpl_injector.h"
@@ -119,7 +119,7 @@
  #ifdef HAVE_SYS_PRCTL_H
  #include <sys/prctl.h>
  #endif
-@@ -527,6 +533,8 @@
+@@ -527,6 +529,8 @@
  my_bool opt_query_cache_strip_comments = 0;
  my_bool opt_use_global_long_query_time= 0;
  my_bool opt_slow_query_log_microseconds_timestamp= 0;
@@ -128,7 +128,7 @@
  my_bool lower_case_file_system= 0;
  my_bool opt_large_pages= 0;
  my_bool opt_myisam_use_mmap= 0;
-@@ -1382,6 +1395,7 @@
+@@ -1382,6 +1386,7 @@
    free_global_thread_stats();
    free_global_table_stats();
    free_global_index_stats();
@@ -136,7 +136,7 @@
  #ifdef HAVE_REPLICATION
    end_slave_list();
  #endif
-@@ -4082,6 +4096,7 @@
+@@ -4082,6 +4087,7 @@
  
    init_global_table_stats();
    init_global_index_stats();
@@ -144,7 +144,7 @@
  
    /* We have to initialize the storage engines before CSV logging */
    if (ha_init())
-@@ -5895,6 +6003,8 @@
+@@ -5895,6 +5901,8 @@
    OPT_USE_GLOBAL_LONG_QUERY_TIME,
    OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
    OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
@@ -153,7 +153,7 @@
    OPT_IGNORE_BUILTIN_INNODB,
    OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,
    OPT_DEFAULT_CHARACTER_SET_OLD
-@@ -6964,6 +7074,21 @@
+@@ -6964,6 +6972,21 @@
     "Use microsecond time's precision in slow query log",
     (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,
     0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
@@ -176,8 +176,8 @@
     "If set to 1, table names are stored in lowercase on disk and table names "
     "will be case-insensitive.  Should be set to 2 if you are using a case-"
 diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
---- a/sql/mysql_priv.h	2010-09-14 20:27:52.000000000 +0000
-+++ b/sql/mysql_priv.h	2010-09-14 20:31:41.000000000 +0000
+--- a/sql/mysql_priv.h	2010-10-16 07:28:35.000000000 +0400
++++ b/sql/mysql_priv.h	2010-10-16 07:29:04.000000000 +0400
 @@ -2090,6 +2090,8 @@
  extern my_bool opt_query_cache_strip_comments;
  extern my_bool opt_use_global_long_query_time;
@@ -188,9 +188,9 @@
  extern my_bool opt_old_style_user_limits, trust_function_creators;
  extern uint opt_crash_binlog_innodb;
 diff -ruN a/sql/query_response_time.cc b/sql/query_response_time.cc
---- a/sql/query_response_time.cc	1970-01-01 00:00:00.000000000 +0000
-+++ b/sql/query_response_time.cc	2010-09-14 20:32:15.000000000 +0000
-@@ -0,0 +1,279 @@
+--- a/sql/query_response_time.cc	1970-01-01 03:00:00.000000000 +0300
++++ b/sql/query_response_time.cc	2010-10-18 15:23:12.000000000 +0400
+@@ -0,0 +1,347 @@
 +#include "my_global.h"
 +#include "mysql_priv.h"
 +#include "mysql_com.h"
@@ -341,6 +341,74 @@
 +  }
 +  buffer[result_length]= 0;
 +}
++#ifdef __x86_64__
++typedef uint64 TimeCounter;
++void add_time_atomic(TimeCounter* counter, uint64 time)
++{
++  __sync_fetch_and_add(counter,time);  
++}
++#endif // __x86_64__
++#ifdef __i386__
++inline uint32 get_high(uint64 value)
++{
++  return ((value >> 32) << 32);
++}
++inline uint32 get_low(uint64 value)
++{
++  return ((value << 32) >> 32);
++}
++class TimeCounter
++{
++public:
++  TimeCounter& operator=(uint64 time)
++  {
++    this->m_high= get_high(time);
++    this->m_low=  get_low(time);
++    return *this;
++  }
++  operator uint64() const
++  {
++    return ((static_cast<uint64>(m_high) << 32) + static_cast<uint64>(m_low));
++  }
++  void add(uint64 time)
++  {
++    uint32 time_high = get_high(time);
++    uint32 time_low  = get_low(time);
++    uint64 time_low64= time_low;
++    while(true)
++    {
++      uint32 old_low= this->m_low;
++      uint64 old_low64= old_low;
++
++      uint64 new_low64= old_low64 + time_low64;
++      uint32 new_low= (get_low(new_low64));
++      bool add_high= (get_high(new_low64) != 0);
++
++      if(!__sync_bool_compare_and_swap(&m_low,old_low,new_low))
++      {
++	continue;
++      }
++      if(add_high)
++      {
++	++time_high;
++      }
++      if(time_high > 0)
++      {
++        __sync_fetch_and_add(&m_high,time_high);
++      }
++      break;
++    }
++  }
++private:
++  uint32 m_low;
++  uint32 m_high;
++};
++void add_time_atomic(TimeCounter* counter, uint64 time)
++{
++  counter->add(time);
++}
++#endif // __i386__
++
 +class time_collector
 +{
 +public:
@@ -363,15 +431,15 @@
 +      if(m_utility->bound(i) > time)
 +      {
 +        __sync_fetch_and_add(&(m_count[i]),(uint32)1);
-+        __sync_fetch_and_add(&(m_total[i]),time);
-+	break;
++	 add_time_atomic(&(m_total[i]),time);
++        break;
 +      }
 +    }
 +  }
 +private:
 +  utility* m_utility;
 +  uint32   m_count[OVERALL_POWER_COUNT + 1];
-+  uint64   m_total[OVERALL_POWER_COUNT + 1];
++  TimeCounter m_total[OVERALL_POWER_COUNT + 1];
 +};
 +
 +class collector
@@ -471,8 +539,8 @@
 +  return query_response_time::g_collector.fill(thd,tables,cond);
 +}
 diff -ruN a/sql/query_response_time.h b/sql/query_response_time.h
---- a/sql/query_response_time.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/sql/query_response_time.h	2010-09-14 20:32:15.000000000 +0000
+--- a/sql/query_response_time.h	1970-01-01 03:00:00.000000000 +0300
++++ b/sql/query_response_time.h	2010-10-16 07:29:04.000000000 +0400
 @@ -0,0 +1,69 @@
 +#ifndef QUERY_RESPONSE_TIME_H
 +#define QUERY_RESPONSE_TIME_H
@@ -544,8 +612,8 @@
 +
 +#endif // QUERY_RESPONSE_TIME_H
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
---- a/sql/set_var.cc	2010-09-14 20:27:52.000000000 +0000
-+++ b/sql/set_var.cc	2010-09-14 20:31:41.000000000 +0000
+--- a/sql/set_var.cc	2010-10-16 07:28:35.000000000 +0400
++++ b/sql/set_var.cc	2010-10-16 07:29:04.000000000 +0400
 @@ -1004,6 +1004,10 @@
  static sys_var_use_global_long_query_time sys_use_global_long_query_time;
  static sys_var_bool_ptr       sys_slow_query_log_microseconds_timestamp(&vars, "slow_query_log_microseconds_timestamp",
@@ -558,8 +626,8 @@
  static sys_var_log_state sys_var_log_slow(&vars, "log_slow_queries",
                                            &opt_slow_log, QUERY_LOG_SLOW);
 diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
---- a/sql/sql_parse.cc	2010-09-14 20:27:52.000000000 +0000
-+++ b/sql/sql_parse.cc	2010-09-14 20:31:41.000000000 +0000
+--- a/sql/sql_parse.cc	2010-10-16 07:28:35.000000000 +0400
++++ b/sql/sql_parse.cc	2010-10-16 07:29:04.000000000 +0400
 @@ -27,6 +27,7 @@
  #include "sp_cache.h"
  #include "events.h"
@@ -634,8 +702,8 @@
    {
      pthread_mutex_lock(&LOCK_global_user_client_stats);
 diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
---- a/sql/sql_show.cc	2010-09-14 20:27:52.000000000 +0000
-+++ b/sql/sql_show.cc	2010-09-14 20:32:15.000000000 +0000
+--- a/sql/sql_show.cc	2010-10-16 07:28:32.000000000 +0400
++++ b/sql/sql_show.cc	2010-10-16 07:29:04.000000000 +0400
 @@ -31,6 +31,7 @@
  #include "event_data_objects.h"
  #endif
@@ -669,8 +737,8 @@
     fill_schema_schemata, make_schemata_old_format, 0, 1, -1, 0, 0},
    {"SCHEMA_PRIVILEGES", schema_privileges_fields_info, create_schema_table,
 diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
---- a/sql/sql_yacc.yy	2010-09-14 20:27:52.000000000 +0000
-+++ b/sql/sql_yacc.yy	2010-09-14 20:31:41.000000000 +0000
+--- a/sql/sql_yacc.yy	2010-10-16 07:28:35.000000000 +0400
++++ b/sql/sql_yacc.yy	2010-10-16 07:29:04.000000000 +0400
 @@ -1079,6 +1079,7 @@
  %token  PURGE
  %token  QUARTER_SYM
@@ -711,8 +779,8 @@
          | READ_ONLY_SYM            {}
          | REBUILD_SYM              {}
 diff -ruN a/sql/table.h b/sql/table.h
---- a/sql/table.h	2010-09-14 20:27:52.000000000 +0000
-+++ b/sql/table.h	2010-09-14 20:31:41.000000000 +0000
+--- a/sql/table.h	2010-10-16 07:28:32.000000000 +0400
++++ b/sql/table.h	2010-10-16 07:29:04.000000000 +0400
 @@ -963,6 +963,7 @@
    SCH_PROFILES,
    SCH_REFERENTIAL_CONSTRAINTS,